control/controlclient: use netns package to dial connections.

Signed-off-by: David Anderson <danderson@tailscale.com>
reviewable/pr425/r1
David Anderson 5 years ago
parent 1617a232e1
commit 03682cb271

@ -28,6 +28,7 @@ import (
"golang.org/x/crypto/nacl/box" "golang.org/x/crypto/nacl/box"
"golang.org/x/oauth2" "golang.org/x/oauth2"
"tailscale.com/log/logheap" "tailscale.com/log/logheap"
"tailscale.com/net/netns"
"tailscale.com/net/tlsdial" "tailscale.com/net/tlsdial"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger" "tailscale.com/types/logger"
@ -134,7 +135,9 @@ func NewDirect(opts Options) (*Direct, error) {
httpc := opts.HTTPTestClient httpc := opts.HTTPTestClient
if httpc == nil { if httpc == nil {
dialer := netns.Dialer()
tr := http.DefaultTransport.(*http.Transport).Clone() tr := http.DefaultTransport.(*http.Transport).Clone()
tr.DialContext = dialer.DialContext
tr.ForceAttemptHTTP2 = true tr.ForceAttemptHTTP2 = true
tr.TLSClientConfig = tlsdial.Config(serverURL.Host, tr.TLSClientConfig) tr.TLSClientConfig = tlsdial.Config(serverURL.Host, tr.TLSClientConfig)
httpc = &http.Client{Transport: tr} httpc = &http.Client{Transport: tr}

Loading…
Cancel
Save