TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-05 14:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/tailscaled: disable netns in userspace-networking mode

Browse Source 
Updates #2827
Updates #2822

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-09-09 15:20:08 -07:00 committed by Brad Fitzpatrick
parent 31c1331415
commit 382b349c54
7 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tailscaled/tailscaled.go
View File

@ -32,6 +32,7 @@
"tailscale.com/ipn/ipnserver"
"tailscale.com/logpolicy"
"tailscale.com/net/dns"
"tailscale.com/net/netns"
"tailscale.com/net/socks5/tssocks"
"tailscale.com/net/tstun"
"tailscale.com/paths"
@ -296,6 +297,9 @@ func run() error {
logf("wgengine.New: %v", err)
return err
}
if useNetstack {
netns.Disable()
}
var ns *netstack.Impl
if useNetstack || wrapNetstack {

14
net/netns/netns.go
View File

@ -19,12 +19,23 @@
"net"
"inet.af/netaddr"
"tailscale.com/syncs"
)
var disabled syncs.AtomicBool
// Disable disables netns for the process.
func Disable() {
disabled.Set(true)
}
// Listener returns a new net.Listener with its Control hook func
// initialized as necessary to run in logical network namespace that
// doesn't route back into Tailscale.
func Listener() *net.ListenConfig {
if disabled.Get() {
return new(net.ListenConfig)
}
return &net.ListenConfig{Control: control}
}
@ -41,6 +52,9 @@ func NewDialer() Dialer {
// handles using a SOCKS if configured in the environment with
// ALL_PROXY.
func FromDialer(d *net.Dialer) Dialer {
if disabled.Get() {
return d
}
d.Control = control
if wrapDialer != nil {
return wrapDialer(d)

1
tstest/integration/tailscaled_deps_test_darwin.go
View File

@ -43,6 +43,7 @@
_ "tailscale.com/logpolicy"
_ "tailscale.com/net/dns"
_ "tailscale.com/net/interfaces"
_ "tailscale.com/net/netns"
_ "tailscale.com/net/portmapper"
_ "tailscale.com/net/socks5/tssocks"
_ "tailscale.com/net/tshttpproxy"

1
tstest/integration/tailscaled_deps_test_freebsd.go
View File

@ -41,6 +41,7 @@
_ "tailscale.com/logpolicy"
_ "tailscale.com/net/dns"
_ "tailscale.com/net/interfaces"
_ "tailscale.com/net/netns"
_ "tailscale.com/net/portmapper"
_ "tailscale.com/net/socks5/tssocks"
_ "tailscale.com/net/tshttpproxy"

1
tstest/integration/tailscaled_deps_test_linux.go
View File

@ -41,6 +41,7 @@
_ "tailscale.com/logpolicy"
_ "tailscale.com/net/dns"
_ "tailscale.com/net/interfaces"
_ "tailscale.com/net/netns"
_ "tailscale.com/net/portmapper"
_ "tailscale.com/net/socks5/tssocks"
_ "tailscale.com/net/tshttpproxy"

1
tstest/integration/tailscaled_deps_test_openbsd.go
View File

@ -41,6 +41,7 @@
_ "tailscale.com/logpolicy"
_ "tailscale.com/net/dns"
_ "tailscale.com/net/interfaces"
_ "tailscale.com/net/netns"
_ "tailscale.com/net/portmapper"
_ "tailscale.com/net/socks5/tssocks"
_ "tailscale.com/net/tshttpproxy"

1
tstest/integration/tailscaled_deps_test_windows.go
View File

@ -45,6 +45,7 @@
_ "tailscale.com/logtail/backoff"
_ "tailscale.com/net/dns"
_ "tailscale.com/net/interfaces"
_ "tailscale.com/net/netns"
_ "tailscale.com/net/portmapper"
_ "tailscale.com/net/socks5/tssocks"
_ "tailscale.com/net/tshttpproxy"