cmd/tailscaled: populate netstack variable to use dialer in SOCKS5

Signed-off-by: Naman Sood <mail@nsood.in>
pull/1710/head
Naman Sood 4 years ago committed by GitHub
parent d6a95d807a
commit 5ea53891fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -232,7 +232,7 @@ func run() error {
var ns *netstack.Impl var ns *netstack.Impl
if useNetstack || wrapNetstack { if useNetstack || wrapNetstack {
onlySubnets := wrapNetstack && !useNetstack onlySubnets := wrapNetstack && !useNetstack
mustStartNetstack(logf, e, onlySubnets) ns = mustStartNetstack(logf, e, onlySubnets)
} }
if socksListener != nil { 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() tunDev, magicConn, ok := e.(wgengine.InternalsGetter).GetInternals()
if !ok { if !ok {
log.Fatalf("%T is not a wgengine.InternalsGetter", e) 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 { if err := ns.Start(); err != nil {
log.Fatalf("failed to start netstack: %v", err) log.Fatalf("failed to start netstack: %v", err)
} }
return ns
} }

Loading…
Cancel
Save