extern/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2025-08-14 01:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix windows route zones (#2164)

Browse Source 
* Fix windows zone and add additional debug output

* Fix routes zone on BSD

* Remove redundant Unmap

* Add zone to windows routes
This commit is contained in:
Viktor Liu
2024-06-20 13:02:02 +02:00
committed by GitHub
parent c347a4c2ca
commit b075009ef7
4 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/internal/routemanager/systemops/systemops_generic.go
View File

@ -356,7 +356,7 @@ func GetNextHop(ip netip.Addr) (Nexthop, error) {
return Nexthop{}, fmt.Errorf("convert preferred source to address: %w", err)
}
return Nexthop{
IP: addr.Unmap(),
IP: addr,
Intf: intf,
}, nil
}
@ -380,12 +380,12 @@ func ipToAddr(ip net.IP, intf *net.Interface) (netip.Addr, error) {
}
if intf != nil && (addr.IsLinkLocalMulticast() || addr.IsLinkLocalUnicast()) {
log.Tracef("Adding zone %s to address %s", intf.Name, addr)
zone := intf.Name
if runtime.GOOS == "windows" {
addr = addr.WithZone(strconv.Itoa(intf.Index))
} else {
addr = addr.WithZone(intf.Name)
zone = strconv.Itoa(intf.Index)
}
log.Tracef("Adding zone %s to address %s", zone, addr)
addr = addr.WithZone(zone)
}
return addr.Unmap(), nil