TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-20 01:47:33 +00:00
Code Issues 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

5
net/netns/netns_windows.go
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
}