TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-06 00:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netmon: use Monitor's tsIfName if set by SetTailscaleInterfaceName

Browse Source 
Currently nobody calls SetTailscaleInterfaceName yet, so this is a
no-op. I checked oss, android, and the macOS/iOS client. Nobody calls
this, or ever did.

But I want to in the future.

Updates #15408
Updates #9040

Change-Id: I05dfabe505174f9067b929e91c6e0d8bc42628d7
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-03-24 10:57:57 -07:00 committed by Brad Fitzpatrick
parent 156cd53e77
commit 14db99241f
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipn/ipnlocal/local.go
View File

@ -4968,7 +4968,7 @@ func (b *LocalBackend) authReconfig() {
return return
} }
oneCGNATRoute := shouldUseOneCGNATRoute(b.logf, b.sys.ControlKnobs(), version.OS()) oneCGNATRoute := shouldUseOneCGNATRoute(b.logf, b.sys.NetMon.Get(), b.sys.ControlKnobs(), version.OS())
rcfg := b.routerConfig(cfg, prefs, oneCGNATRoute) rcfg := b.routerConfig(cfg, prefs, oneCGNATRoute)
err = b.e.Reconfig(cfg, rcfg, dcfg) err = b.e.Reconfig(cfg, rcfg, dcfg)
@ -4992,7 +4992,7 @@ func (b *LocalBackend) authReconfig() {
// //
// The versionOS is a Tailscale-style version ("iOS", "macOS") and not // The versionOS is a Tailscale-style version ("iOS", "macOS") and not
// a runtime.GOOS. // a runtime.GOOS.
func shouldUseOneCGNATRoute(logf logger.Logf, controlKnobs *controlknobs.Knobs, versionOS string) bool { func shouldUseOneCGNATRoute(logf logger.Logf, mon *netmon.Monitor, controlKnobs *controlknobs.Knobs, versionOS string) bool {
if controlKnobs != nil { if controlKnobs != nil {
// Explicit enabling or disabling always take precedence. // Explicit enabling or disabling always take precedence.
if v, ok := controlKnobs.OneCGNAT.Load().Get(); ok { if v, ok := controlKnobs.OneCGNAT.Load().Get(); ok {
@ -5007,7 +5007,7 @@ func shouldUseOneCGNATRoute(logf logger.Logf, controlKnobs *controlknobs.Knobs,
// use fine-grained routes if another interfaces is also using the CGNAT // use fine-grained routes if another interfaces is also using the CGNAT
// IP range. // IP range.
if versionOS == "macOS" { if versionOS == "macOS" {
hasCGNATInterface, err := netmon.HasCGNATInterface() hasCGNATInterface, err := mon.HasCGNATInterface()
if err != nil { if err != nil {
logf("shouldUseOneCGNATRoute: Could not determine if any interfaces use CGNAT: %v", err) logf("shouldUseOneCGNATRoute: Could not determine if any interfaces use CGNAT: %v", err)
return false return false

2
ipn/ipnlocal/peerapi.go
View File

@ -481,7 +481,7 @@ func (h *peerAPIHandler) handleServeInterfaces(w http.ResponseWriter, r *http.Re
fmt.Fprintf(w, "<h3>Could not get the default route: %s</h3>\n", html.EscapeString(err.Error())) fmt.Fprintf(w, "<h3>Could not get the default route: %s</h3>\n", html.EscapeString(err.Error()))
} }
if hasCGNATInterface, err := netmon.HasCGNATInterface(); hasCGNATInterface { if hasCGNATInterface, err := h.ps.b.sys.NetMon.Get().HasCGNATInterface(); hasCGNATInterface {
fmt.Fprintln(w, "<p>There is another interface using the CGNAT range.</p>") fmt.Fprintln(w, "<p>There is another interface using the CGNAT range.</p>")
} else if err != nil { } else if err != nil {
fmt.Fprintf(w, "<p>Could not check for CGNAT interfaces: %s</p>\n", html.EscapeString(err.Error())) fmt.Fprintf(w, "<p>Could not check for CGNAT interfaces: %s</p>\n", html.EscapeString(err.Error()))

2
net/netmon/interfaces_test.go
View File

@ -13,7 +13,7 @@ import (
) )
func TestGetState(t *testing.T) { func TestGetState(t *testing.T) {
st, err := getState() st, err := getState("")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

2
net/netmon/netmon.go
View File

@ -161,7 +161,7 @@ func (m *Monitor) InterfaceState() *State {
} }
func (m *Monitor) interfaceStateUncached() (*State, error) { func (m *Monitor) interfaceStateUncached() (*State, error) {
return getState() return getState(m.tsIfName)
} }
// SetTailscaleInterfaceName sets the name of the Tailscale interface. For // SetTailscaleInterfaceName sets the name of the Tailscale interface. For

14
net/netmon/state.go
View File

@ -461,21 +461,22 @@ func isTailscaleInterface(name string, ips []netip.Prefix) bool {
// getPAC, if non-nil, returns the current PAC file URL. // getPAC, if non-nil, returns the current PAC file URL.
var getPAC func() string var getPAC func() string
// GetState returns the state of all the current machine's network interfaces. // getState returns the state of all the current machine's network interfaces.
// //
// It does not set the returned State.IsExpensive. The caller can populate that. // It does not set the returned State.IsExpensive. The caller can populate that.
// //
// Deprecated: use netmon.Monitor.InterfaceState instead. // optTSInterfaceName is the name of the Tailscale interface, if known.
func getState() (*State, error) { func getState(optTSInterfaceName string) (*State, error) {
s := &State{ s := &State{
InterfaceIPs: make(map[string][]netip.Prefix), InterfaceIPs: make(map[string][]netip.Prefix),
Interface: make(map[string]Interface), Interface: make(map[string]Interface),
} }
if err := ForeachInterface(func(ni Interface, pfxs []netip.Prefix) { if err := ForeachInterface(func(ni Interface, pfxs []netip.Prefix) {
isTSInterfaceName := optTSInterfaceName != "" && ni.Name == optTSInterfaceName
ifUp := ni.IsUp() ifUp := ni.IsUp()
s.Interface[ni.Name] = ni s.Interface[ni.Name] = ni
s.InterfaceIPs[ni.Name] = append(s.InterfaceIPs[ni.Name], pfxs...) s.InterfaceIPs[ni.Name] = append(s.InterfaceIPs[ni.Name], pfxs...)
if !ifUp || isTailscaleInterface(ni.Name, pfxs) { if !ifUp || isTSInterfaceName || isTailscaleInterface(ni.Name, pfxs) {
return return
} }
for _, pfx := range pfxs { for _, pfx := range pfxs {
@ -755,11 +756,12 @@ func DefaultRoute() (DefaultRouteDetails, error) {
// HasCGNATInterface reports whether there are any non-Tailscale interfaces that // HasCGNATInterface reports whether there are any non-Tailscale interfaces that
// use a CGNAT IP range. // use a CGNAT IP range.
func HasCGNATInterface() (bool, error) { func (m *Monitor) HasCGNATInterface() (bool, error) {
hasCGNATInterface := false hasCGNATInterface := false
cgnatRange := tsaddr.CGNATRange() cgnatRange := tsaddr.CGNATRange()
err := ForeachInterface(func(i Interface, pfxs []netip.Prefix) { err := ForeachInterface(func(i Interface, pfxs []netip.Prefix) {
if hasCGNATInterface || !i.IsUp() || isTailscaleInterface(i.Name, pfxs) { isTSInterfaceName := m.tsIfName != "" && i.Name == m.tsIfName
if hasCGNATInterface || !i.IsUp() || isTSInterfaceName || isTailscaleInterface(i.Name, pfxs) {
return return
} }
for _, pfx := range pfxs { for _, pfx := range pfxs {