From 2a5a45a700c455b001c2ff9c23bb298d96e8b98f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B2=B3?= <shixi_liuhe1@staff.sina.com.cn>
Date: Mon, 25 Mar 2019 20:40:22 +0800
Subject: [PATCH] https crypt bug

---
 client/client.go | 2 +-
 client/local.go  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/client.go b/client/client.go
index a499a7b..266644f 100755
--- a/client/client.go
+++ b/client/client.go
@@ -208,7 +208,7 @@ func (s *TRPClient) srcProcess(src net.Conn) {
 		src.Close()
 	} else {
 		logs.Trace("new %s connection with the goal of %s, remote address:%s", lk.ConnType, lk.Host, lk.RemoteAddr)
-		conn.CopyWaitGroup(src, targetConn, lk.Crypt, lk.Compress, nil, nil, false)
+		conn.CopyWaitGroup(src, targetConn, lk.Crypt, lk.Compress, nil, nil, false, nil)
 	}
 }
 
diff --git a/client/local.go b/client/local.go
index 545f3ea..c6bc7ae 100644
--- a/client/local.go
+++ b/client/local.go
@@ -70,7 +70,7 @@ func processSecret(localTcpConn net.Conn, config *config.CommonConfig, l *config
 		logs.Error("Local connection server failed ", err.Error())
 		return
 	}
-	conn.CopyWaitGroup(remoteConn.Conn, localTcpConn, false, false, nil, nil, false)
+	conn.CopyWaitGroup(remoteConn.Conn, localTcpConn, false, false, nil, nil, false, nil)
 }
 
 func processP2P(localTcpConn net.Conn, config *config.CommonConfig, l *config.LocalServer) {
@@ -91,7 +91,7 @@ func processP2P(localTcpConn net.Conn, config *config.CommonConfig, l *config.Lo
 		logs.Error(err)
 		return
 	}
-	conn.CopyWaitGroup(nowConn, localTcpConn, config.Cnf.Crypt, config.Cnf.Compress, nil, nil, false)
+	conn.CopyWaitGroup(nowConn, localTcpConn, config.Cnf.Crypt, config.Cnf.Compress, nil, nil, false, nil)
 }
 
 func newUdpConn(config *config.CommonConfig, l *config.LocalServer) {
@@ -124,11 +124,11 @@ func newUdpConn(config *config.CommonConfig, l *config.LocalServer) {
 		return
 	}
 	localKcpConn, err := kcp.NewConn(string(rAddr), nil, 150, 3, localConn)
-	conn.SetUdpSession(localKcpConn)
 	if err != nil {
 		logs.Error(err)
 		return
 	}
+	conn.SetUdpSession(localKcpConn)
 	//写入密钥、provider身份
 	if _, err := localKcpConn.Write([]byte(crypt.Md5(l.Password))); err != nil {
 		logs.Error(err)