diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index 7af0f1678..f6d6ae11b 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -297,9 +297,6 @@ func run() error { logf("wgengine.New: %v", err) return err } - if useNetstack { - netns.Disable() - } var ns *netstack.Impl if useNetstack || wrapNetstack { @@ -391,6 +388,10 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine. ListenPort: args.port, LinkMonitor: linkMon, } + + useNetstack = name == "userspace-networking" + netns.SetEnabled(!useNetstack) + if args.birdSocketPath != "" && createBIRDClient != nil { log.Printf("Connecting to BIRD at %s ...", args.birdSocketPath) conf.BIRDClient, err = createBIRDClient(args.birdSocketPath) @@ -398,7 +399,6 @@ func tryEngine(logf logger.Logf, linkMon *monitor.Mon, name string) (e wgengine. return nil, false, err } } - useNetstack = name == "userspace-networking" if !useNetstack { dev, devName, err := tstun.New(logf, name) if err != nil { diff --git a/net/netns/netns.go b/net/netns/netns.go index ff448fd8d..994fb8fac 100644 --- a/net/netns/netns.go +++ b/net/netns/netns.go @@ -24,9 +24,10 @@ import ( var disabled syncs.AtomicBool -// Disable disables netns for the process. -func Disable() { - disabled.Set(true) +// SetEnabled enables or disables netns for the process. +// It defaults to being enabled. +func SetEnabled(on bool) { + disabled.Set(!on) } // Listener returns a new net.Listener with its Control hook func