evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(tunnel):recover code

Browse Source
This commit is contained in:
1mtrue 2022-05-05 18:08:31 +08:00
parent 9e44b25b87
commit 8f62eab194
1 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
server/global/gateway/tunnel.go
View File

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