diff options
| author | Naman Sood <mail@nsood.in> | 2021-04-14 13:13:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-14 13:13:10 -0400 |
| commit | 5ea53891fe4c090aa4685162cb5aaa7511de08e2 (patch) | |
| tree | f3986ccfc043342684e4059c1f137d686d5d263e /cmd | |
| parent | d6a95d807a01e76f0bbf0d122cd2f766d2c1fab2 (diff) | |
| download | tailscale-5ea53891fe4c090aa4685162cb5aaa7511de08e2.tar.xz tailscale-5ea53891fe4c090aa4685162cb5aaa7511de08e2.zip | |
cmd/tailscaled: populate netstack variable to use dialer in SOCKS5
Signed-off-by: Naman Sood <mail@nsood.in>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/tailscaled/tailscaled.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/tailscaled/tailscaled.go b/cmd/tailscaled/tailscaled.go index c36d13992..983eaac1b 100644 --- a/cmd/tailscaled/tailscaled.go +++ b/cmd/tailscaled/tailscaled.go @@ -232,7 +232,7 @@ func run() error { var ns *netstack.Impl if useNetstack || wrapNetstack { onlySubnets := wrapNetstack && !useNetstack - mustStartNetstack(logf, e, onlySubnets) + ns = mustStartNetstack(logf, e, onlySubnets) } if socksListener != nil { @@ -402,7 +402,7 @@ func runDebugServer(mux *http.ServeMux, addr string) { } } -func mustStartNetstack(logf logger.Logf, e wgengine.Engine, onlySubnets bool) { +func mustStartNetstack(logf logger.Logf, e wgengine.Engine, onlySubnets bool) *netstack.Impl { tunDev, magicConn, ok := e.(wgengine.InternalsGetter).GetInternals() if !ok { log.Fatalf("%T is not a wgengine.InternalsGetter", e) @@ -414,4 +414,5 @@ func mustStartNetstack(logf logger.Logf, e wgengine.Engine, onlySubnets bool) { if err := ns.Start(); err != nil { log.Fatalf("failed to start netstack: %v", err) } + return ns } |
