webnet/tailscale
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

net/{interfaces,netmon}, all: merge net/interfaces package into net/netmon

Browse Source 
In prep for most of the package funcs in net/interfaces to become
methods in a long-lived netmon.Monitor that can cache things.  (Many
of the funcs are very heavy to call regularly, whereas the long-lived
netmon.Monitor can subscribe to things from the OS and remember
answers to questions it's asked regularly later)

Updates tailscale/corp#10910
Updates tailscale/corp#18960
Updates #7967
Updates #3299

Change-Id: Ie4e8dedb70136af2d611b990b865a822cd1797e5
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2024-04-27 21:18:18 -07:00
committed by Brad Fitzpatrick
parent 6b95219e3a
commit b9adbe2002
45 changed files with 846 additions and 874 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netns/netns_darwin.go
+2 -3
View File
@@ -18,7 +18,6 @@ import (
"golang.org/x/net/route"
"golang.org/x/sys/unix"
"tailscale.com/envknob"
"tailscale.com/net/interfaces"
"tailscale.com/net/netmon"
"tailscale.com/net/tsaddr"
"tailscale.com/types/logger"
@@ -62,12 +61,12 @@ 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()
idx, err := netmon.DefaultRouteInterfaceIndex()
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
// since they are expected.
if !errors.Is(err, interfaces.ErrNoGatewayIndexFound) {
if !errors.Is(err, netmon.ErrNoGatewayIndexFound) {
logf("[unexpected] netns: DefaultRouteInterfaceIndex: %v", err)
}
return -1, err
net/netns/netns_darwin_test.go
+2 -2
View File
@@ -6,7 +6,7 @@ package netns
import (
"testing"
"tailscale.com/net/interfaces"
"tailscale.com/net/netmon"
)
func TestGetInterfaceIndex(t *testing.T) {
@@ -63,7 +63,7 @@ func TestGetInterfaceIndex(t *testing.T) {
t.Skip("no tailscale interface on this machine")
}
defaultIdx, err := interfaces.DefaultRouteInterfaceIndex()
defaultIdx, err := netmon.DefaultRouteInterfaceIndex()
if err != nil {
t.Fatal(err)
}
net/netns/netns_linux.go
+1 -2
View File
@@ -14,7 +14,6 @@ import (
"golang.org/x/sys/unix"
"tailscale.com/envknob"
"tailscale.com/net/interfaces"
"tailscale.com/net/netmon"
"tailscale.com/types/logger"
"tailscale.com/util/linuxfw"
@@ -119,7 +118,7 @@ func setBypassMark(fd uintptr) error {
}
func bindToDevice(fd uintptr) error {
ifc, err := interfaces.DefaultRouteInterface()
ifc, err := netmon.DefaultRouteInterface()
if err != nil {
// Make sure we bind to *some* interface,
// or we could get a routing loop.
net/netns/netns_windows.go
+2 -3
View File
@@ -11,7 +11,6 @@ import (
"golang.org/x/sys/cpu"
"golang.org/x/sys/windows"
"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
"tailscale.com/net/interfaces"
"tailscale.com/net/netmon"
"tailscale.com/types/logger"
)
@@ -52,7 +51,7 @@ func controlC(network, address string, c syscall.RawConn) error {
}
if canV4 {
iface, err := interfaces.GetWindowsDefault(windows.AF_INET)
iface, err := netmon.GetWindowsDefault(windows.AF_INET)
if err != nil {
return err
}
@@ -62,7 +61,7 @@ func controlC(network, address string, c syscall.RawConn) error {
}
if canV6 {
iface, err := interfaces.GetWindowsDefault(windows.AF_INET6)
iface, err := netmon.GetWindowsDefault(windows.AF_INET6)
if err != nil {
return err
}