Merge pull request #1344 from ibuildthecloud/dialer-fallback

If tunnel session does not exist fallback to default dialer

Merge pull request #1344 from ibuildthecloud/dialer-fallback
3592d0bd · Erik Wilson · GitHub · 1a2690d7 · 3396a7b0 · 3592d0bd
Unverified Commit 3592d0bd authored Jan 27, 2020 by Erik Wilson Committed by GitHub Jan 27, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

tunnel.go pkg/daemons/control/tunnel.go +6 -2

No files found.
--- a/pkg/daemons/control/tunnel.go
+++ b/pkg/daemons/control/tunnel.go
@@ -21,14 +21,18 @@ func setupTunnel() http.Handler {
 }

 func setupProxyDialer(tunnelServer *remotedialer.Server) {
-	app.DefaultProxyDialerFn = utilnet.DialFunc(func(_ context.Context, network, address string) (net.Conn, error) {
+	app.DefaultProxyDialerFn = utilnet.DialFunc(func(ctx context.Context, network, address string) (net.Conn, error) {
 		_, port, _ := net.SplitHostPort(address)
 		addr := "127.0.0.1"
 		if port != "" {
 			addr += ":" + port
 		}
 		nodeName, _ := kv.Split(address, ":")
-		return tunnelServer.Dial(nodeName, 15*time.Second, "tcp", addr)
+		if tunnelServer.HasSession(nodeName) {
+			return tunnelServer.Dial(nodeName, 15*time.Second, "tcp", addr)
+		}
+		var d net.Dialer
+		return d.DialContext(ctx, network, address)
 	})
 }