TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-16 18:08:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp/derphttp: make DERP client use netns for dial-outs.

Browse Source
This commit is contained in:
David Anderson 2020-05-28 23:48:08 +00:00
parent 9e3ad4f79f
commit e9f7d01b91
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
derp/derphttp/derphttp_client.go
View File

@ -27,6 +27,7 @@ import (
"inet.af/netaddr" "inet.af/netaddr"
"tailscale.com/derp" "tailscale.com/derp"
"tailscale.com/net/dnscache" "tailscale.com/net/dnscache"
"tailscale.com/net/netns"
"tailscale.com/net/tlsdial" "tailscale.com/net/tlsdial"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/key" "tailscale.com/types/key"
@ -296,7 +297,7 @@ func (c *Client) dialURL(ctx context.Context) (net.Conn, error) {
host := c.url.Hostname() host := c.url.Hostname()
hostOrIP := host hostOrIP := host
var stdDialer dialer = new(net.Dialer) var stdDialer dialer = netns.Dialer()
var dialer = stdDialer var dialer = stdDialer
if wrapDialer != nil { if wrapDialer != nil {
dialer = wrapDialer(dialer) dialer = wrapDialer(dialer)
@ -345,7 +346,7 @@ func (c *Client) dialRegion(ctx context.Context, reg *tailcfg.DERPRegion) (net.C
} }
func (c *Client) dialContext(ctx context.Context, proto, addr string) (net.Conn, error) { func (c *Client) dialContext(ctx context.Context, proto, addr string) (net.Conn, error) {
var stdDialer dialer = new(net.Dialer) var stdDialer dialer = netns.Dialer()
var dialer = stdDialer var dialer = stdDialer
if wrapDialer != nil { if wrapDialer != nil {
dialer = wrapDialer(dialer) dialer = wrapDialer(dialer)

7
net/netns/netns.go
View File

@ -23,6 +23,13 @@ func Listener() *net.ListenConfig {
return &net.ListenConfig{Control: control} return &net.ListenConfig{Control: control}
} }
// Dialer returns a new net.Dialer with its Control hook func
// initialized as necessary to run in a logical network namespace that
// doesn't route back into Tailscale.
func Dialer() *net.Dialer {
return &net.Dialer{Control: control}
}
// control marks c as necessary to dial in a separate network namespace. // control marks c as necessary to dial in a separate network namespace.
// //
// It's intentionally the same signature as net.Dialer.Control // It's intentionally the same signature as net.Dialer.Control