cmd/tailscaled: disable netns earlier in userspace-networking mode

The earlier 382b349c54 was too late,
as engine creation itself needed to listen on things.

Fixes #2827
Updates #2822

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick
2021-09-10 22:24:30 -07:00
committed by Brad Fitzpatrick
parent 382b349c54
commit 4f648e6fcc
2 changed files with 8 additions and 7 deletions

View File

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