From 7c2a5faae68daabf15f0979085a8851f94ff6dc1 Mon Sep 17 00:00:00 2001
From: "rui.zheng" <rui.zheng@tcl.com>
Date: Wed, 1 Nov 2017 17:35:01 +0800
Subject: [PATCH] fix bug #160

---
 cmd/gost/main.go |  3 +++
 ssh.go           | 15 ++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/cmd/gost/main.go b/cmd/gost/main.go
index 13c1810..51db078 100644
--- a/cmd/gost/main.go
+++ b/cmd/gost/main.go
@@ -214,11 +214,14 @@ func initChain() (*gost.Chain, error) {
 		)
 
 		interval, _ := strconv.Atoi(node.Values.Get("ping"))
+		retry, _ := strconv.Atoi(node.Values.Get("retry"))
 		node.HandshakeOptions = append(node.HandshakeOptions,
 			gost.AddrHandshakeOption(node.Addr),
 			gost.UserHandshakeOption(node.User),
 			gost.TLSConfigHandshakeOption(tlsCfg),
 			gost.IntervalHandshakeOption(time.Duration(interval)*time.Second),
+			gost.TimeoutHandshakeOption(time.Duration(timeout)*time.Second),
+			gost.RetryHandshakeOption(retry),
 		)
 		node.Client = &gost.Client{
 			Connector:   connector,
diff --git a/ssh.go b/ssh.go
index 83ec844..91c1bf3 100644
--- a/ssh.go
+++ b/ssh.go
@@ -185,7 +185,7 @@ func (tr *sshForwardTransporter) Handshake(conn net.Conn, options ...HandshakeOp
 			connChan: make(chan net.Conn, 1024),
 		}
 		tr.sessions[opts.Addr] = session
-		go session.Ping(opts.Interval, opts.Timeout, 1)
+		go session.Ping(opts.Interval, opts.Timeout, opts.Retry)
 		go session.waitServer()
 		go session.waitClose()
 	}
@@ -280,7 +280,7 @@ func (tr *sshTunnelTransporter) Handshake(conn net.Conn, options ...HandshakeOpt
 			deaded: make(chan struct{}),
 		}
 		tr.sessions[opts.Addr] = session
-		go session.Ping(opts.Interval, 30*time.Second, 1)
+		go session.Ping(opts.Interval, opts.Timeout, opts.Retry)
 		go session.waitServer()
 		go session.waitClose()
 	}
@@ -317,11 +317,16 @@ func (s *sshSession) Ping(interval, timeout time.Duration, retries int) {
 		return
 	}
 	if timeout <= 0 {
-		timeout = 0
+		timeout = 10 * time.Second
 	}
+
+	if retries == 0 {
+		retries = 1
+	}
+
 	defer close(s.deaded)
 
-	log.Log("[ssh] ping is enabled, interval:", interval)
+	log.Logf("[ssh] ping is enabled, interval: %v, timeout: %v, retry: %d", interval, timeout, retries)
 	baseCtx := context.Background()
 	t := time.NewTicker(interval)
 	defer t.Stop()
@@ -453,7 +458,7 @@ func (h *sshForwardHandler) handleForward(conn ssh.Conn, chans <-chan ssh.NewCha
 			case RemoteForwardRequest:
 				go h.tcpipForwardRequest(conn, req, quit)
 			default:
-				// log.Log("[ssh] unknown channel type:", req.Type)
+				// log.Log("[ssh] unknown request type:", req.Type, req.WantReply)
 				if req.WantReply {
 					req.Reply(false, nil)
 				}