use Link.Wait to wait loop

whitegerry · Apr 15, 2017 · dec4950 · dec4950
1 parent efbf3a4
commit dec4950
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/client/client.go b/client/client.go
@@ -175,7 +175,7 @@ func (client *Client) startTCP() {
 			IsServerSide:      false,
 			KeepaliveInterval: client.keepaliveInterval,
 		})
-		errCh, _ := l.Bind(conn)
+		l.Bind(conn)
 
 		for _, t := range client.tunnels {
 			proto, localHost, localPort, remoteHost, remotePort, reverse, err := parseTunnel(t)
@@ -185,9 +185,7 @@ func (client *Client) startTCP() {
 			l.OpenTunnel(proto, localHost, localPort, remoteHost, remotePort, reverse)
 		}
 
-		if err := <-errCh; err != nil {
-			logrus.WithField("error", err).Error("connection error")
-		}
+		l.Wait()
 		l.Close()
 		time.Sleep(1 * time.Second) // TODO: sleep smartly
 	}

diff --git a/server/server.go b/server/server.go
@@ -150,11 +150,8 @@ func (s *Server) handleTCPClient(conn es.Conn) {
 		IsServerSide:      true,
 		KeepaliveInterval: s.keepaliveInterval,
 	})
-	errCh, _ := l.Bind(conn)
-	if err := <-errCh; err != nil {
-		logrus.WithField("error", err).Error("connection error")
-	}
-	// client 断开连接
+	l.Bind(conn)
+	l.Wait()
 	logrus.Warnf("client %#v is offline", conn)
 	l.Close()
 	conn.Close()