From f3435ebd40c30a0efc17f042a8deebeb94da5654 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B2=B3?= <shixi_liuhe1@staff.sina.com.cn>
Date: Thu, 10 Jan 2019 21:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/server.go | 3 ++-
 server/tcp.go    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/server.go b/server/server.go
index d60a399..4329c44 100644
--- a/server/server.go
+++ b/server/server.go
@@ -157,7 +157,8 @@ func InitCsvDb() *Csv {
 //get key by host from x
 func GetKeyByHost(host string) (h *HostList, t *ServerConfig, err error) {
 	for _, v := range CsvDb.Hosts {
-		if strings.Contains(host, v.Host) {
+		s := strings.Split(host, ":")
+		if s[0] == v.Host {
 			h = v
 			t, err = CsvDb.GetTask(v.Vkey)
 			return
diff --git a/server/tcp.go b/server/tcp.go
index 1b85d5b..def5521 100755
--- a/server/tcp.go
+++ b/server/tcp.go
@@ -63,6 +63,7 @@ func (s *TunnelModeServer) auth(r *http.Request, c *utils.Conn, u, p string) err
 
 //与客户端建立通道
 func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr string, method string, rb []byte) error {
+reGet:
 	link, err := s.bridge.GetTunnel(getverifyval(cnf.VerifyKey), cnf.CompressEncode, cnf.CompressDecode, cnf.Crypt, cnf.Mux)
 	defer func() {
 		if cnf.Mux {
@@ -72,7 +73,7 @@ func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr str
 		}
 	}()
 	if err != nil {
-		log.Println(err)
+		log.Println("conn to client error:", err)
 		c.Close()
 		return err
 	}
@@ -80,7 +81,7 @@ func (s *TunnelModeServer) dealClient(c *utils.Conn, cnf *ServerConfig, addr str
 		c.Close()
 		link.Close()
 		log.Println(err)
-		return err
+		goto reGet
 	}
 	if flag, err := link.ReadFlag(); err == nil {
 		if flag == utils.CONN_SUCCESS {