dhcpd: imp code, fmt

AdguardTeam · Sep 13, 2022 · 39b344f · 39b344f
1 parent a36d70d
commit 39b344f
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,11 @@ and this project adheres to
 ## [v0.108.0] - 2022-12-01 (APPROX.)
 -->
 
+### Security
+
+- Weaker cipher suites that use the CBC (cipher block chaining) mode of
+  operation have been disabled ([#2993]).
+
 ### Added
 
 - The new optional `dns.ipset_file` property in the configuration file.  It
@@ -30,11 +35,6 @@ and this project adheres to
 
 - Panic when adding a static lease within the disabled DHCP server ([#4722]).
 
-### Security
-
-- Weaker cipher suites that use the CBC (cipher block chaining) mode of
-  operation have been disabled ([#2993]).
-
 [#2993]: https://github.com/AdguardTeam/AdGuardHome/issues/2993
 [#4686]: https://github.com/AdguardTeam/AdGuardHome/issues/4686
 [#4722]: https://github.com/AdguardTeam/AdGuardHome/issues/4722

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

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

diff --git a/internal/dhcpd/config.go b/internal/dhcpd/config.go
@@ -65,7 +65,7 @@ type V4ServerConf struct {
 	Enabled       bool   `yaml:"-" json:"-"`
 	InterfaceName string `yaml:"-" json:"-"`
 
-	GatewayIP  net.IP `yaml:"gateway_ip"  json:"gateway_ip"`
+	GatewayIP  net.IP `yaml:"gateway_ip" json:"gateway_ip"`
 	SubnetMask net.IP `yaml:"subnet_mask" json:"subnet_mask"`
 	// broadcastIP is the broadcasting address pre-calculated from the
 	// configured gateway IP and subnet mask.
@@ -74,7 +74,7 @@ type V4ServerConf struct {
 	// The first & the last IP address for dynamic leases
 	// Bytes [0..2] of the last allowed IP address must match the first IP
 	RangeStart net.IP `yaml:"range_start" json:"range_start"`
-	RangeEnd   net.IP `yaml:"range_end"   json:"range_end"`
+	RangeEnd   net.IP `yaml:"range_end" json:"range_end"`
 
 	LeaseDuration uint32 `yaml:"lease_duration" json:"lease_duration"` // in seconds
 

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

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

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

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

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

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

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

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

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

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