TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-07 08:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/interfaces: make syscall and netstat agree when multiple gateways are present

Browse Source 
likelyHomeRouterIPDarwinSyscall iterates through the list of routes,
looking for a private gateway, returning the first one it finds.

likelyHomeRouterIPDarwinExec does the same thing,
except that it returns the last one it finds.

As a result, when there are multiple gateways,
TestLikelyHomeRouterIPSyscallExec fails.
(At least, I think that that is what is happening;
I am going inferring from observed behavior.)

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2020-11-19 09:05:32 -08:00 committed by Josh Bleecher Snyder
parent eccc167733
commit 1ebbaaaebb
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/interfaces/interfaces_darwin.go
View File

@ -5,6 +5,7 @@
package interfaces package interfaces
import ( import (
"errors"
"os/exec" "os/exec"
"go4.org/mem" "go4.org/mem"
@ -62,8 +63,12 @@ func likelyHomeRouterIPDarwinExec() (ret netaddr.IP, ok bool) {
ip, err := netaddr.ParseIP(string(mem.Append(nil, ipm))) ip, err := netaddr.ParseIP(string(mem.Append(nil, ipm)))
if err == nil && isPrivateIP(ip) { if err == nil && isPrivateIP(ip) {
ret = ip ret = ip
// We've found what we're looking for.
return stopReadingNetstatTable
} }
return nil return nil
}) })
return ret, !ret.IsZero() return ret, !ret.IsZero()
} }
var stopReadingNetstatTable = errors.New("found private gateway")