diff options
| author | Andrew Dunham <andrew@du.nham.ca> | 2023-09-12 11:11:51 -0400 |
|---|---|---|
| committer | Andrew Dunham <andrew@du.nham.ca> | 2023-09-12 11:11:51 -0400 |
| commit | 8689e4b9016409e1dcb13bfeaf19fcef907d5452 (patch) | |
| tree | da9c447112c396870da78cee68b4a3268287f7af | |
| parent | 2f07c6a9f4e1c6cadf5bd60c82b1c7f939df1db7 (diff) | |
| download | tailscale-andrew/netns-more-logging.tar.xz tailscale-andrew/netns-more-logging.zip | |
net/netns: add more logging to returned interface in getInterfaceIndexandrew/netns-more-logging
Change-Id: If9940c3613a3022fcb5446f1c11c77e9f5f2683f
| -rw-r--r-- | net/netns/netns_darwin.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netns/netns_darwin.go b/net/netns/netns_darwin.go index 3a5e499f2..44b82bf38 100644 --- a/net/netns/netns_darwin.go +++ b/net/netns/netns_darwin.go @@ -67,7 +67,7 @@ func getInterfaceIndex(logf logger.Logf, netMon *netmon.Monitor, address string) // Helper so we can log errors. defaultIdx := func() (int, error) { if netMon == nil { - idx, err := interfaces.DefaultRouteInterfaceIndex() + iface, err := interfaces.DefaultRoute() if err != nil { // It's somewhat common for there to be no default gateway route // (e.g. on a phone with no connectivity), don't log those errors @@ -77,7 +77,8 @@ func getInterfaceIndex(logf logger.Logf, netMon *netmon.Monitor, address string) } return -1, err } - return idx, nil + logf("getInterfaceIndex(%q): no netMon: returning %d: %+v", address, iface.InterfaceIndex, iface) + return iface.InterfaceIndex, nil } state := netMon.InterfaceState() if state == nil { @@ -85,6 +86,7 @@ func getInterfaceIndex(logf logger.Logf, netMon *netmon.Monitor, address string) } if iface, ok := state.Interface[state.DefaultRouteInterface]; ok { + logf("getInterfaceIndex(%q): netMon: returning %d: %+v", address, state.DefaultRouteInterface, iface) return iface.Index, nil } return -1, errInterfaceStateInvalid |