mirrors/AdGuardHome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-04-01 06:53:30 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix windows build

Browse source
This commit is contained in:
Simon Zolin 2020-05-25 16:43:03 +03:00
parent b08ec98a97
commit 6b2fa5779e
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dhcpd/check_other_dhcp.go
View file

@ -1,3 +1,5 @@
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
package dhcpd package dhcpd
import ( import (
@ -15,7 +17,6 @@ import (
// CheckIfOtherDHCPServersPresent sends a DHCP request to the specified network interface, // CheckIfOtherDHCPServersPresent sends a DHCP request to the specified network interface,
// and waits for a response for a period defined by defaultDiscoverTime // and waits for a response for a period defined by defaultDiscoverTime
// nolint
func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) { func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
iface, err := net.InterfaceByName(ifaceName) iface, err := net.InterfaceByName(ifaceName)
if err != nil { if err != nil {
@ -25,7 +26,7 @@ func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
// get ipv4 address of an interface // get ipv4 address of an interface
ifaceIPNet := getIfaceIPv4(*iface) ifaceIPNet := getIfaceIPv4(*iface)
if len(ifaceIPNet) == 0 { if len(ifaceIPNet) == 0 {
return false, fmt.Errorf("Couldn't find IPv4 address of interface %s %+v", ifaceName, iface) return false, fmt.Errorf("couldn't find IPv4 address of interface %s %+v", ifaceName, iface)
} }
srcIP := ifaceIPNet[0] srcIP := ifaceIPNet[0]
@ -35,6 +36,9 @@ func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
hostname, _ := os.Hostname() hostname, _ := os.Hostname()
req, err := dhcpv4.NewDiscovery(iface.HardwareAddr) req, err := dhcpv4.NewDiscovery(iface.HardwareAddr)
if err != nil {
return false, fmt.Errorf("dhcpv4.NewDiscovery: %s", err)
}
req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr)) req.Options.Update(dhcpv4.OptClientIdentifier(iface.HardwareAddr))
req.Options.Update(dhcpv4.OptHostName(hostname)) req.Options.Update(dhcpv4.OptHostName(hostname))

7
dhcpd/check_other_dhcp_windows.go Normal file
View file

@ -0,0 +1,7 @@
package dhcpd
import "fmt"
func CheckIfOtherDHCPServersPresent(ifaceName string) (bool, error) {
return false, fmt.Errorf("not supported")
}