+ dhcpv6 server; rewrite dhcpv4 server; changed API

dnsforward/dnsforward.go

@@ -44,10 +44,10 @@ var webRegistered bool
 //
 // The zero Server is empty and ready for use.
 type Server struct {
-	dnsProxy   *proxy.Proxy         // DNS proxy instance
-	dnsFilter  *dnsfilter.Dnsfilter // DNS filter instance
-	dhcpServer *dhcpd.Server        // DHCP server instance (optional)
-	queryLog   querylog.QueryLog    // Query log instance
+	dnsProxy   *proxy.Proxy          // DNS proxy instance
+	dnsFilter  *dnsfilter.Dnsfilter  // DNS filter instance
+	dhcpServer dhcpd.ServerInterface // DHCP server instance (optional)
+	queryLog   querylog.QueryLog     // Query log instance
 	stats      stats.Stats
 	access     *accessCtx
 
@@ -72,7 +72,7 @@ type DNSCreateParams struct {
 	DNSFilter  *dnsfilter.Dnsfilter
 	Stats      stats.Stats
 	QueryLog   querylog.QueryLog
-	DHCPServer *dhcpd.Server
+	DHCPServer dhcpd.ServerInterface
 }
 
 // NewServer creates a new instance of the dnsforward.Server

dnsforward/dnsforward_test.go

@@ -1018,9 +1018,22 @@ func TestMatchDNSName(t *testing.T) {
 	assert.True(t, !matchDNSName(dnsNames, "*.host2"))
 }
 
+type testDHCP struct {
+}
+
+func (d *testDHCP) Leases(flags int) []dhcpd.Lease {
+	l := dhcpd.Lease{}
+	l.IP = net.ParseIP("127.0.0.1").To4()
+	l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
+	l.Hostname = "localhost"
+	return []dhcpd.Lease{l}
+}
+func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {
+	return
+}
+
 func TestPTRResponse(t *testing.T) {
-	dhcp := &dhcpd.Server{}
-	dhcp.IPpool = make(map[[4]byte]net.HardwareAddr)
+	dhcp := &testDHCP{}
 
 	c := dnsfilter.Config{}
 	f := dnsfilter.New(&c, nil)
@@ -1033,12 +1046,6 @@ func TestPTRResponse(t *testing.T) {
 	assert.True(t, err == nil)
 	assert.Nil(t, s.Start())
 
-	l := dhcpd.Lease{}
-	l.IP = net.ParseIP("127.0.0.1").To4()
-	l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
-	l.Hostname = "localhost"
-	dhcp.AddStaticLease(l)
-
 	addr := s.dnsProxy.Addr(proxy.ProtoUDP)
 	req := createTestMessage("1.0.0.127.in-addr.arpa.")
 	req.Question[0].Qtype = dns.TypePTR