From a80e4df6f02ad96017980f5e96cc1f82c63e00c0 Mon Sep 17 00:00:00 2001
From: "arraykeys@gmail.com" <arraykeys@gmail.com>
Date: Fri, 20 Oct 2017 12:59:23 +0800
Subject: [PATCH] Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>

---
 services/http.go  | 31 +++++++++++++++++++++----------
 services/socks.go |  3 ++-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/services/http.go b/services/http.go
index 73c4f99..a9fb03c 100644
--- a/services/http.go
+++ b/services/http.go
@@ -190,17 +190,28 @@ func (s *HTTP) OutToTCP(useProxy bool, address string, inConn *net.Conn, req *ut
 	}
 	var outConn net.Conn
 	var _outConn interface{}
-	if useProxy {
-		if *s.cfg.ParentType == "ssh" {
-			outConn, err = s.getSSHConn(address)
-		} else {
-			_outConn, err = s.outPool.Pool.Get()
-			if err == nil {
-				outConn = _outConn.(net.Conn)
+	tryCount := 0
+	maxTryCount := 5
+	for {
+		if useProxy {
+			if *s.cfg.ParentType == "ssh" {
+				outConn, err = s.getSSHConn(address)
+			} else {
+				_outConn, err = s.outPool.Pool.Get()
+				if err == nil {
+					outConn = _outConn.(net.Conn)
+				}
 			}
+		} else {
+			outConn, err = utils.ConnectHost(address, *s.cfg.Timeout)
+		}
+		tryCount++
+		if err == nil || tryCount > maxTryCount {
+			break
+		} else {
+			log.Printf("connect to %s , err:%s,retrying...", *s.cfg.Parent, err)
+			time.Sleep(time.Second * 2)
 		}
-	} else {
-		outConn, err = utils.ConnectHost(address, *s.cfg.Timeout)
 	}
 	if err != nil {
 		log.Printf("connect to %s , err:%s", *s.cfg.Parent, err)
@@ -242,7 +253,7 @@ RETRY:
 		return
 	}
 	wait := make(chan bool, 1)
-	func() {
+	go func() {
 		defer func() {
 			if err == nil {
 				err = recover()
diff --git a/services/socks.go b/services/socks.go
index 61a38e5..40ffc1b 100644
--- a/services/socks.go
+++ b/services/socks.go
@@ -392,7 +392,7 @@ func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
 	var err interface{}
 	useProxy := true
 	tryCount := 0
-	maxTryCount := 3
+	maxTryCount := 5
 	for {
 		if *s.cfg.Always {
 			outConn, err = s.getOutConn(methodReq.Bytes(), request.Bytes(), request.Addr())
@@ -414,6 +414,7 @@ func (s *Socks) proxyTCP(inConn *net.Conn, methodReq socks.MethodsRequest, reque
 			break
 		} else {
 			log.Printf("get out conn fail,%s,retrying...", err)
+			time.Sleep(time.Second * 2)
 		}
 	}
 	if err != nil {