优化接入网关连接

server/global/gateway/gateway.go

@@ -57,15 +57,14 @@ func (g *Gateway) Run() {
 }
 
 func (g *Gateway) Close() {
-	g.exit <- true
 	if g.SshClient != nil {
 		_ = g.SshClient.Close()
 	}
-	if len(g.tunnels) > 0 {
+	for id := range g.tunnels {
-		for _, tunnel := range g.tunnels {
+		g.CloseSshTunnel(id)
-			tunnel.Close()
-		}
 	}
+
+	g.exit <- true
 }
 
 func (g *Gateway) OpenSshTunnel(id, ip string, port int) (exposedIP string, exposedPort int, err error) {
@@ -111,7 +110,5 @@ func (g *Gateway) OpenSshTunnel(id, ip string, port int) (exposedIP string, expo
 }
 
 func (g Gateway) CloseSshTunnel(id string) {
-	if g.tunnels[id] != nil {
+	g.Del <- id
-		g.tunnels[id].Close()
-	}
 }

server/global/gateway/tunnel.go

@@ -19,24 +19,34 @@ type Tunnel struct {
 	ctx               context.Context
 	cancel            context.CancelFunc
 	listener          net.Listener
-	err        error
+	localConnections  []net.Conn
+	remoteConnections []net.Conn
 }
 
 func (r *Tunnel) Open() {
 	localAddr := fmt.Sprintf("%s:%d", r.LocalHost, r.LocalPort)
-	for {
+
-		select {
+	go func() {
-		case <-r.ctx.Done():
+		<-r.ctx.Done()
 		_ = r.listener.Close()
+		for i := range r.localConnections {
+			_ = r.localConnections[i].Close()
+		}
+		r.localConnections = nil
+		for i := range r.remoteConnections {
+			_ = r.remoteConnections[i].Close()
+		}
+		r.remoteConnections = nil
 		log.Debugf("SSH 隧道 %v 关闭", localAddr)
-			return
+	}()
-		default:
+	for {
 		log.Debugf("等待客户端访问 %v", localAddr)
 		localConn, err := r.listener.Accept()
 		if err != nil {
-				log.Debugf("接受连接失败 %v", err.Error())
+			log.Debugf("接受连接失败 %v, 退出循环", err.Error())
-				continue
+			return
 		}
+		r.localConnections = append(r.localConnections, localConn)
 
 		log.Debugf("客户端 %v 连接至 %v", localConn.RemoteAddr().String(), localAddr)
 		remoteAddr := fmt.Sprintf("%s:%d", r.RemoteHost, r.RemotePort)
@@ -44,16 +54,15 @@ func (r *Tunnel) Open() {
 		remoteConn, err := r.Gateway.SshClient.Dial("tcp", remoteAddr)
 		if err != nil {
 			log.Debugf("连接远程主机 %v 失败", remoteAddr)
-				r.err = err
 			return
 		}
+		r.remoteConnections = append(r.remoteConnections, remoteConn)
 
 		log.Debugf("连接远程主机 %v 成功", remoteAddr)
 		go copyConn(localConn, remoteConn)
 		go copyConn(remoteConn, localConn)
 		log.Debugf("转发数据 [%v]->[%v]", localAddr, remoteAddr)
 	}
-	}
 }
 
 func (r Tunnel) Close() {

server/global/session/session.go

@@ -84,7 +84,7 @@ func (m *Manager) Start() {
 					_ = ss.GuacdTunnel.Close()
 				}
 				if ss.NextTerminal != nil {
-					_ = ss.NextTerminal.Close()
+					ss.NextTerminal.Close()
 				}
 
 				if ss.WebSocket != nil {

server/term/next_terminal.go

@@ -79,7 +79,7 @@ func (ret *NextTerminal) Write(p []byte) (int, error) {
 	return ret.StdinPipe.Write(p)
 }
 
-func (ret *NextTerminal) Close() error {
+func (ret *NextTerminal) Close() {
 
 	if ret.SftpClient != nil {
 		_ = ret.SftpClient.Close()
@@ -96,8 +96,6 @@ func (ret *NextTerminal) Close() error {
 	if ret.Recorder != nil {
 		ret.Recorder.Close()
 	}
-
-	return nil
 }
 
 func (ret *NextTerminal) WindowChange(h int, w int) error {