Russtopia/xs
2
1
Fork 0
mirror of https://gogs.blitter.com/RLabs/xs synced 2024-08-14 10:26:42 +00:00
Code Issues Projects Releases Wiki Activity

Fixed tun reuse hang/error after closure

Browse source 
Signed-off-by: Russ Magee <rmagee@gmail.com>
This commit is contained in:
Russ Magee 2019-06-27 01:19:52 -07:00
parent c4c2e24af1
commit c327b2ec72
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
hkexnet/hkextun.go
View file

@ -157,6 +157,7 @@ func (hc *Conn) StartClientTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} else if strings.Contains(e.Error(), "i/o timeout") { } else if strings.Contains(e.Error(), "i/o timeout") {
if (*hc.tuns)[rport].Died { if (*hc.tuns)[rport].Died {
@ -165,6 +166,7 @@ func (hc *Conn) StartClientTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} }
} else { } else {
@ -177,6 +179,7 @@ func (hc *Conn) StartClientTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} }
} }
@ -253,6 +256,10 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
defer wg.Done() defer wg.Done()
for { for {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
if (*hc.tuns)[rport] == nil {
logger.LogDebug("[ServerTun] worker A: Client endpoint removed.")
break
}
(*hc.tuns)[rport].KeepAlive += 1 (*hc.tuns)[rport].KeepAlive += 1
if (*hc.tuns)[rport].KeepAlive > 25 { if (*hc.tuns)[rport].KeepAlive > 25 {
(*hc.tuns)[rport].Died = true (*hc.tuns)[rport].Died = true
@ -320,6 +327,7 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} else if strings.Contains(e.Error(), "i/o timeout") { } else if strings.Contains(e.Error(), "i/o timeout") {
if (*hc.tuns)[rport].Died { if (*hc.tuns)[rport].Died {
@ -328,6 +336,7 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} }
} else { } else {
@ -340,6 +349,7 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
close((*hc.tuns)[rport].Data) close((*hc.tuns)[rport].Data)
(*hc.tuns)[rport].Data = nil (*hc.tuns)[rport].Data = nil
} }
delete((*hc.tuns), rport)
break break
} }
} }