mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-05 20:26:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

net/netns: add more logging to returned interface in getInterfaceIndex

Browse Source 
Change-Id: If9940c3613a3022fcb5446f1c11c77e9f5f2683f
This commit is contained in:
Andrew Dunham 2023-09-12 11:11:51 -04:00
parent 2f07c6a9f4
commit 8689e4b901
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netns/netns_darwin.go
View File

@ -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