daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: use netip for web

Browse Source
This commit is contained in:
Eugene Burkov
2022-09-29 14:56:37 +03:00
parent e528d2f23b
commit de837e4eec
10 changed files with 41 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/aghnet/net.go
View File

@@ -130,7 +130,7 @@ func NetInterfaceFrom(iface *net.Interface) (niface *NetInterface, err error) {
for _, addr := range addrs {
n, ok := addr.(*net.IPNet)
if !ok {
// Should be net.IPNet, this is weird.
// Should be *net.IPNet, this is weird.
return nil, fmt.Errorf("expected %[2]s to be %[1]T, got %[2]T", n, addr)
} else if ip4 := n.IP.To4(); ip4 != nil {
n.IP = ip4
@@ -141,13 +141,13 @@ func NetInterfaceFrom(iface *net.Interface) (niface *NetInterface, err error) {
return nil, fmt.Errorf("bad address %s", n.IP)
}
ip = ip.WithZone(iface.Name)
if ip.IsLinkLocalUnicast() {
// Ignore link-local IPv4.
if ip.Is4() {
continue
}
// Ignore link-local IPv4.
//
// TODO(e.burkov): !! or not??
if ip.Is4() && ip.IsLinkLocalUnicast() {
continue
ip = ip.WithZone(iface.Name)
}
ones, _ := n.Mask.Size()

2
internal/aghnet/net_test.go
View File

@@ -199,7 +199,7 @@ func TestBroadcastFromIPNet(t *testing.T) {
}
func TestCheckPort(t *testing.T) {
laddr := netip.AddrPortFrom(netip.AddrFrom4([4]byte{127, 0, 0, 1}), 0)
laddr := netip.AddrPortFrom(IPv4Localhost(), 0)
t.Run("tcp_bound", func(t *testing.T) {
l, err := net.Listen("tcp", laddr.String())