dhcpd: rename files, imp tags

AdguardTeam · Sep 13, 2022 · 600d63d · 600d63d
1 parent 44f5507
commit 600d63d
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 43 deletions.
diff --git a/internal/dhcpd/broadcast_bsd.go b/internal/dhcpd/broadcast_bsd.go
@@ -1,5 +1,4 @@
 //go:build freebsd || openbsd
-// +build freebsd openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/broadcast_bsd_test.go b/internal/dhcpd/broadcast_bsd_test.go
@@ -1,5 +1,4 @@
 //go:build freebsd || openbsd
-// +build freebsd openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/broadcast_others.go b/internal/dhcpd/broadcast_others.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || linux || netbsd || solaris
-// +build aix darwin dragonfly linux netbsd solaris
+//go:build darwin || linux || netbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/broadcast_others_test.go b/internal/dhcpd/broadcast_others_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || linux || netbsd || solaris
-// +build aix darwin dragonfly linux netbsd solaris
+//go:build darwin || linux || netbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/conn_unix.go b/internal/dhcpd/conn_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/conn_unix_test.go b/internal/dhcpd/conn_unix_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/dhcpd.go b/internal/dhcpd/dhcpd.go
@@ -152,12 +152,12 @@ const (
 	LeasesAll = LeasesDynamic | LeasesStatic
 )
 
-// Interface is an interface for servers.
+// Interface is the DHCP server that deals with both IP address families.
 type Interface interface {
 	Start() (err error)
 	Stop() (err error)
-
 	Enabled() (ok bool)
+
 	Leases(flags GetLeasesFlags) (leases []*Lease)
 	SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
 	FindMACbyIP(ip net.IP) (mac net.HardwareAddr)
@@ -201,7 +201,7 @@ func (s *MockInterface) FindMACbyIP(ip net.IP) (mac net.HardwareAddr) { return s
 // WriteDiskConfig implements the Interface for *MockInterface.
 func (s *MockInterface) WriteDiskConfig(c *ServerConfig) { s.OnWriteDiskConfig(c) }
 
-// server - the current state of the DHCP server
+// server is the DHCP service that handles DHCPv4, DHCPv6, and HTTP API.
 type server struct {
 	srv4 DHCPServer
 	srv6 DHCPServer
@@ -217,7 +217,10 @@ type server struct {
 // type check
 var _ Interface = (*server)(nil)
 
-// Create - create object
+// Create initializes and returns the DHCP server handling both address
+// families.  It also registers the corresponding HTTP API endpoints.
+//
+// TODO(e.burkov):  Don't register handlers, see TODO on [aghhttp.RegisterFunc].
 func Create(conf *ServerConfig) (s *server, err error) {
 	s = &server{
 		conf: &ServerConfig{

diff --git a/internal/dhcpd/dhcpd_test.go → internal/dhcpd/dhcpd_unix_test.go b/internal/dhcpd/dhcpd_test.go → internal/dhcpd/dhcpd_unix_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/http_others.go → internal/dhcpd/http_unix.go b/internal/dhcpd/http_others.go → internal/dhcpd/http_unix.go
@@ -1,4 +1,4 @@
-//go:build aix || darwin || dragonfly || linux || netbsd || solaris || freebsd || openbsd
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/options_unix.go b/internal/dhcpd/options_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/options_unix_test.go b/internal/dhcpd/options_unix_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/os_windows.go b/internal/dhcpd/os_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dhcpd
 

diff --git a/internal/dhcpd/v46_windows.go b/internal/dhcpd/v46_windows.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package dhcpd
 
@@ -9,15 +8,19 @@ import "net"
 
 type winServer struct{}
 
-func (*winServer) ResetLeases(_ []*Lease) (err error)           { return nil }
-func (*winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
-func (*winServer) getLeasesRef() []*Lease                       { return nil }
-func (*winServer) AddStaticLease(_ *Lease) (err error)          { return nil }
-func (*winServer) RemoveStaticLease(_ *Lease) (err error)       { return nil }
-func (*winServer) FindMACbyIP(_ net.IP) (mac net.HardwareAddr)  { return nil }
-func (*winServer) WriteDiskConfig4(_ *V4ServerConf)             {}
-func (*winServer) WriteDiskConfig6(_ *V6ServerConf)             {}
-func (*winServer) Start() (err error)                           { return nil }
-func (*winServer) Stop() (err error)                            { return nil }
-func v4Create(_ *V4ServerConf) (s DHCPServer, err error)        { return &winServer{}, nil }
-func v6Create(_ V6ServerConf) (s DHCPServer, err error)         { return &winServer{}, nil }
+// type check
+var _ DHCPServer = winServer{}
+
+func (winServer) ResetLeases(_ []*Lease) (err error)           { return nil }
+func (winServer) GetLeases(_ GetLeasesFlags) (leases []*Lease) { return nil }
+func (winServer) getLeasesRef() []*Lease                       { return nil }
+func (winServer) AddStaticLease(_ *Lease) (err error)          { return nil }
+func (winServer) RemoveStaticLease(_ *Lease) (err error)       { return nil }
+func (winServer) FindMACbyIP(_ net.IP) (mac net.HardwareAddr)  { return nil }
+func (winServer) WriteDiskConfig4(_ *V4ServerConf)             {}
+func (winServer) WriteDiskConfig6(_ *V6ServerConf)             {}
+func (winServer) Start() (err error)                           { return nil }
+func (winServer) Stop() (err error)                            { return nil }
+
+func v4Create(_ *V4ServerConf) (s DHCPServer, err error) { return winServer{}, nil }
+func v6Create(_ V6ServerConf) (s DHCPServer, err error)  { return winServer{}, nil }
diff --git a/internal/dhcpd/v4.go → internal/dhcpd/v4_unix.go b/internal/dhcpd/v4.go → internal/dhcpd/v4_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/v4_test.go → internal/dhcpd/v4_unix_test.go b/internal/dhcpd/v4_test.go → internal/dhcpd/v4_unix_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/v6.go → internal/dhcpd/v6_unix.go b/internal/dhcpd/v6.go → internal/dhcpd/v6_unix.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd
 

diff --git a/internal/dhcpd/v6_test.go → internal/dhcpd/v6_unix_test.go b/internal/dhcpd/v6_test.go → internal/dhcpd/v6_unix_test.go
@@ -1,5 +1,4 @@
-//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+//go:build darwin || freebsd || linux || netbsd || openbsd
 
 package dhcpd