From 3e196db29d4e339be0a8fbfb5b338162dc0704cb Mon Sep 17 00:00:00 2001 From: Page Fault Date: Sun, 21 Jun 2020 02:18:10 +0000 Subject: [PATCH] fix transport error displaying --- redirector/redirector.go | 4 ++++ tunnel/transport/client.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/redirector/redirector.go b/redirector/redirector.go index c4406a2..682d511 100644 --- a/redirector/redirector.go +++ b/redirector/redirector.go @@ -42,6 +42,10 @@ func (r *Redirector) worker() { if redirection.Dial == nil { redirection.Dial = defaultDial } + if redirection.RedirectTo == nil { + log.Error("nil redirection addr") + return + } log.Warn("redirecting connection from", redirection.InboundConn.RemoteAddr(), "to", redirection.RedirectTo.String()) outboundConn, err := redirection.Dial(redirection.RedirectTo) if err != nil { diff --git a/tunnel/transport/client.go b/tunnel/transport/client.go index 0e2edb7..784a72a 100644 --- a/tunnel/transport/client.go +++ b/tunnel/transport/client.go @@ -37,7 +37,7 @@ func (c *Client) DialConn(*tunnel.Address, tunnel.Tunnel) (tunnel.Conn, error) { dialer := new(net.Dialer) conn, err := dialer.DialContext(c.ctx, "tcp", c.serverAddress.String()) if err != nil { - return nil, common.NewError("transport failed to connect to remote server") + return nil, common.NewError("transport failed to connect to remote server").Base(err) } return &Conn{ Conn: conn,