Fix build after dhcp library interface change

The underlying insomniacslk/dhcp library changed interface recently.
This PR to fix the build after that change.

cmds/client/main.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/coredhcp/coredhcp/logger"
 	"github.com/insomniacslk/dhcp/dhcpv6"
+	"github.com/insomniacslk/dhcp/dhcpv6/client6"
 	"github.com/insomniacslk/dhcp/iana"
 )
 
@@ -25,7 +26,7 @@ func main() {
 		macString = "00:11:22:33:44:55"
 	}
 
-	c := dhcpv6.NewClient()
+	c := client6.NewClient()
 	c.LocalAddr = &net.UDPAddr{
 		IP:   net.ParseIP("::1"),
 		Port: 546,

cmds/coredhcp/config.yml.example

@@ -5,8 +5,8 @@ server6:
         - file: "leases.txt"
         # - dns: 8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844
 
-server4:
-    listen: '0.0.0.0:67'
-    plugins:
-        - server_id: 192.168.1.12
-#        - file: "leases.txt"
+#server4:
+#    listen: '0.0.0.0:67'
+#    plugins:
+#        - server_id: 192.168.1.12
+##        - file: "leases.txt"

coredhcp.go

@@ -10,7 +10,9 @@ import (
 	"github.com/coredhcp/coredhcp/logger"
 	"github.com/coredhcp/coredhcp/plugins"
 	"github.com/insomniacslk/dhcp/dhcpv4"
+	"github.com/insomniacslk/dhcp/dhcpv4/server4"
 	"github.com/insomniacslk/dhcp/dhcpv6"
+	"github.com/insomniacslk/dhcp/dhcpv6/server6"
 )
 
 var log = logger.GetLogger()
@@ -21,8 +23,8 @@ type Server struct {
 	Handlers6 []handler.Handler6
 	Handlers4 []handler.Handler4
 	Config    *config.Config
-	Server6   *dhcpv6.Server
-	Server4   *dhcpv4.Server
+	Server6   *server6.Server
+	Server4   *server4.Server
 	errors    chan error
 }
 
@@ -185,7 +187,7 @@ func (s *Server) Start() error {
 	if s.Config.Server6 != nil {
 		log.Printf("Starting DHCPv6 listener on %v", s.Config.Server6.Listener)
 		go func() {
-			s.Server6 = dhcpv6.NewServer(*s.Config.Server6.Listener, s.MainHandler6)
+			s.Server6 = server6.NewServer(*s.Config.Server6.Listener, s.MainHandler6)
 			s.errors <- s.Server6.ActivateAndServe()
 		}()
 	}
@@ -193,7 +195,7 @@ func (s *Server) Start() error {
 	if s.Config.Server4 != nil {
 		log.Printf("Starting DHCPv4 listener on %v", s.Config.Server4.Listener)
 		go func() {
-			s.Server4 = dhcpv4.NewServer(*s.Config.Server4.Listener, s.MainHandler4)
+			s.Server4 = server4.NewServer(*s.Config.Server4.Listener, s.MainHandler4)
 			s.errors <- s.Server4.ActivateAndServe()
 		}()
 	}