mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-12-15 03:02:07 +03:00
e8c1f5c8d3
Merge in DNS/adguard-home from 2508-ip-conversion to master Updates #2508. Squashed commit of the following: commit 3f64709fbc73ef74c11b910997be1e9bc337193c Merge: 5ac7faaaa0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 16:21:34 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 12:00:11 2021 +0300 all: replace conditions with appropriate functions in tests commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71 Merge: db992a42abba74859e
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Jan 13 10:47:10 2021 +0300 Merge branch 'master' into 2508-ip-conversion commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:55:53 2021 +0300 sysutil: fix linux tests commit f629b15d62349323ce2da05e68dc9cc0b5f6e194 Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 18:41:20 2021 +0300 all: improve code quality commit 3bf03a75524040738562298bd1de6db536af130f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 17:33:26 2021 +0300 sysutil: fix linux net.IP conversion commit 5d5b6994916923636e635588631b63b7e7b74e5f Author: Eugene Burkov <e.burkov@adguard.com> Date: Tue Jan 12 14:57:26 2021 +0300 dnsforward: remove redundant net.IP <-> string conversion commit 0b955d99b7fad40942f21d1dd8734adb99126195 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Jan 11 18:04:25 2021 +0300 dhcpd: remove net.IP <-> string conversion
45 lines
707 B
Go
45 lines
707 B
Go
package dhcpd
|
|
|
|
import (
|
|
"encoding/binary"
|
|
"fmt"
|
|
"net"
|
|
)
|
|
|
|
func isTimeout(err error) bool {
|
|
operr, ok := err.(*net.OpError)
|
|
if !ok {
|
|
return false
|
|
}
|
|
return operr.Timeout()
|
|
}
|
|
|
|
func tryTo4(ip net.IP) (ip4 net.IP, err error) {
|
|
if ip == nil {
|
|
return nil, fmt.Errorf("%v is not an IP address", ip)
|
|
}
|
|
|
|
ip4 = ip.To4()
|
|
if ip4 == nil {
|
|
return nil, fmt.Errorf("%v is not an IPv4 address", ip)
|
|
}
|
|
|
|
return ip4, nil
|
|
}
|
|
|
|
// Return TRUE if subnet mask is correct (e.g. 255.255.255.0)
|
|
func isValidSubnetMask(mask net.IP) bool {
|
|
var n uint32
|
|
n = binary.BigEndian.Uint32(mask)
|
|
for i := 0; i != 32; i++ {
|
|
if n == 0 {
|
|
break
|
|
}
|
|
if (n & 0x80000000) == 0 {
|
|
return false
|
|
}
|
|
n <<= 1
|
|
}
|
|
return true
|
|
}
|