fix transport error displaying

grandduval2012 · Jun 21, 2020 · 3e196db · 3e196db
1 parent 768bed3
commit 3e196db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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,