修复「接入网关」无法使用的问题 fixed #207 #218

server/global/gateway/gateway.go

@@ -44,7 +44,7 @@ func (g *Gateway) Run() {
 		select {
 		case t := <-g.Add:
 			g.tunnels[t.ID] = t
-			go t.Run()
+			go t.Open()
 		case k := <-g.Del:
 			if _, ok := g.tunnels[k]; ok {
 				g.tunnels[k].Close()

server/global/gateway/manager.go

@@ -15,7 +15,7 @@ func NewManager() *Manager {
 	}
 }
 
-func (m *Manager) Run() {
+func (m *Manager) Start() {
 	for {
 		select {
 		case g := <-m.Add:
@@ -38,5 +38,5 @@ var GlobalGatewayManager *Manager
 
 func init() {
 	GlobalGatewayManager = NewManager()
-	go GlobalGatewayManager.Run()
+	go GlobalGatewayManager.Start()
 }

server/global/gateway/tunnel.go

@@ -22,36 +22,35 @@ type Tunnel struct {
 	err        error
 }
 
-func (r *Tunnel) Run() {
+func (r *Tunnel) Open() {
 	localAddr := fmt.Sprintf("%s:%d", r.LocalHost, r.LocalPort)
-	log.Debugf("等待客户端访问 [%v] ...", localAddr)
+
+	go func() {
+		<-r.ctx.Done()
+		_ = r.listener.Close()
+		log.Debugf("SSH 隧道 %v 关闭", localAddr)
+	}()
+	log.Debugf("等待客户端访问 %v", localAddr)
 	localConn, err := r.listener.Accept()
 	if err != nil {
 		r.err = err
 		return
 	}
 
-	log.Debugf("客户端 [%v] 已连接至 [%v]", localConn.RemoteAddr().String(), localAddr)
+	log.Debugf("客户端 %v 连接至 %v", localConn.RemoteAddr().String(), localAddr)
 	remoteAddr := fmt.Sprintf("%s:%d", r.RemoteHost, r.RemotePort)
-	log.Debugf("连接远程主机 [%v] ...", remoteAddr)
+	log.Debugf("连接远程主机 %v ...", remoteAddr)
 	remoteConn, err := r.Gateway.SshClient.Dial("tcp", remoteAddr)
 	if err != nil {
-		log.Debugf("连接远程主机 [%v] 失败", remoteAddr)
+		log.Debugf("连接远程主机 %v 失败", remoteAddr)
 		r.err = err
 		return
 	}
 
-	log.Debugf("连接远程主机 [%v] 成功", remoteAddr)
+	log.Debugf("连接远程主机 %v 成功", remoteAddr)
 	go copyConn(localConn, remoteConn)
 	go copyConn(remoteConn, localConn)
-	log.Debugf("开始转发数据 [%v]->[%v]", localAddr, remoteAddr)
-	go func() {
-		<-r.ctx.Done()
-		_ = r.listener.Close()
-		_ = localConn.Close()
-		_ = remoteConn.Close()
-		log.Debugf("SSH隧道 [%v]-[%v] 已关闭", localAddr, remoteAddr)
-	}()
+	log.Debugf("转发数据 [%v]->[%v]", localAddr, remoteAddr)
 }
 
 func (r Tunnel) Close() {