From 8500462671d188d6759d5892496f5fd2dd0c8647 Mon Sep 17 00:00:00 2001
From: lwch <lwch748@gmail.com>
Date: Mon, 23 Aug 2021 18:37:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=94=B9=E5=86=99from?=
 =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 code/client/pool/handler.go | 2 +-
 code/client/pool/pool.go    | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/code/client/pool/handler.go b/code/client/pool/handler.go
index ca18ead..21e2fd7 100644
--- a/code/client/pool/handler.go
+++ b/code/client/pool/handler.go
@@ -26,7 +26,7 @@ func (p *Pool) handleConnectReq(conn *network.Conn, from, to string, req *networ
 	port, _ := strconv.ParseUint(pt, 10, 16)
 	tn := tunnel.New(global.Tunnel{
 		Name:       req.GetName(),
-		Target:     to,
+		Target:     from,
 		Type:       dial,
 		LocalAddr:  host,
 		LocalPort:  uint16(port),
diff --git a/code/client/pool/pool.go b/code/client/pool/pool.go
index 0777471..59ff54f 100644
--- a/code/client/pool/pool.go
+++ b/code/client/pool/pool.go
@@ -108,6 +108,14 @@ func (p *Pool) connect(cfg *global.Configure, idx int) {
 			logging.Error("read message: %v", err)
 			return
 		}
+		from := msg.GetFrom()
+		if len(from) > 0 {
+			n := strings.LastIndex(from, "-")
+			if n != -1 {
+				from = from[:n]
+			}
+			msg.From = from
+		}
 		switch msg.GetXType() {
 		case network.Msg_connect_req:
 			p.handleConnectReq(c, msg.GetFrom(), msg.GetTo(), msg.GetCreq())