Sfoglia il codice sorgente

dhcp6: use changed package interface (#22)

Chris K 6 anni fa
parent
commit
55ceba0e9f
2 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 2 2
      coredhcp.go
  2. 2 1
      plugins/server_id/plugin.go

+ 2 - 2
coredhcp.go

@@ -112,10 +112,10 @@ func (s *Server) MainHandler6(conn net.PacketConn, peer net.Addr, req dhcpv6.DHC
 	// Create a suitable basic response packet
 	switch req.Type() {
 	case dhcpv6.MessageTypeSolicit:
-		tmp, err = dhcpv6.NewAdvertiseFromSolicit(req)
+		tmp, err = dhcpv6.NewAdvertiseFromSolicit(req.(*dhcpv6.Message))
 	case dhcpv6.MessageTypeRequest, dhcpv6.MessageTypeConfirm, dhcpv6.MessageTypeRenew,
 		dhcpv6.MessageTypeRebind, dhcpv6.MessageTypeRelease, dhcpv6.MessageTypeInformationRequest:
-		tmp, err = dhcpv6.NewReplyFromDHCPv6Message(req)
+		tmp, err = dhcpv6.NewReplyFromMessage(req.(*dhcpv6.Message))
 	default:
 		err = fmt.Errorf("MainHandler6: message type %d not supported", req.Type())
 	}

+ 2 - 1
plugins/server_id/plugin.go

@@ -36,7 +36,8 @@ func Handler6(req, resp dhcpv6.DHCPv6) (dhcpv6.DHCPv6, bool) {
 			log.Infof("plugins/server_id: requested server ID does not match this server's ID. Got %v, want %v", sid.Sid, V6ServerID)
 		}
 	}
-	return dhcpv6.WithServerID(*V6ServerID)(resp), false
+	dhcpv6.WithServerID(*V6ServerID)(resp)
+	return resp, false
 }
 
 // Handler4 handles DHCPv4 packets for the server_id plugin.