TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-20 13:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/router: fix bug where getInterfaceRoutes always returned an empty list

Browse Source 
Regression from f2ce64f0c6 (r43710860)

Fixes #870
This commit is contained in:
Brad Fitzpatrick 2020-10-29 14:38:59 -07:00
parent 38bde61b3d
commit 508f5c3ae0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wgengine/router/ifconfig_windows.go
View File

@ -625,20 +625,17 @@ func deltaRouteData(a, b []*winipcfg.RouteData) (add, del []*winipcfg.RouteData)
// getInterfaceRoutes returns all the interface's routes. // getInterfaceRoutes returns all the interface's routes.
// Corresponds to GetIpForwardTable2 function, but filtered by interface. // Corresponds to GetIpForwardTable2 function, but filtered by interface.
func getInterfaceRoutes(ifc *winipcfg.IPAdapterAddresses, family winipcfg.AddressFamily) ([]*winipcfg.MibIPforwardRow2, error) { func getInterfaceRoutes(ifc *winipcfg.IPAdapterAddresses, family winipcfg.AddressFamily) (matches []*winipcfg.MibIPforwardRow2, err error) {
routes, err := winipcfg.GetIPForwardTable2(family) routes, err := winipcfg.GetIPForwardTable2(family)
if err != nil { if err != nil {
return nil, err return nil, err
} }
matches := make([]*winipcfg.MibIPforwardRow2, len(routes))
i := 0
for i := range routes { for i := range routes {
if routes[i].InterfaceLUID == ifc.LUID { if routes[i].InterfaceLUID == ifc.LUID {
matches[i] = &routes[i] matches = append(matches, &routes[i])
i++
} }
} }
return matches[:i], nil return
} }
// syncRoutes incrementally sets multiples routes on an interface. // syncRoutes incrementally sets multiples routes on an interface.