RusstopiaLabs
/
xs
mirror of https://gogs.blitter.com/RLabs/xs
1
0
Fork 0
Code Issues Releases Wiki Activity

Got rid of superfluous weAreDialled var 

Signed-off-by: Russ Magee <rmagee@gmail.com>
This commit is contained in:
Russ Magee 2018-11-11 21:55:21 -08:00
parent 0943797300
commit 709f2ae3dd
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hkexnet/hkextun.go
View File

@ -243,11 +243,10 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
go func() { go func() {
var wg sync.WaitGroup var wg sync.WaitGroup
weAreDialled := false
for cmd := range (*hc.tuns)[rport].Ctl { for cmd := range (*hc.tuns)[rport].Ctl {
var c net.Conn var c net.Conn
logger.LogDebug(fmt.Sprintf("[ServerTun] got Ctl '%c'. weAreDialled: %v", cmd, weAreDialled)) logger.LogDebug(fmt.Sprintf("[ServerTun] got Ctl '%c'.", cmd))
if cmd == 'd' && !weAreDialled { if cmd == 'd' {
// if re-using tunnel, re-init it // if re-using tunnel, re-init it
if (*hc.tuns)[rport] == nil { if (*hc.tuns)[rport] == nil {
hc.InitTunEndpoint(lport, "", rport) hc.InitTunEndpoint(lport, "", rport)
@ -262,7 +261,6 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
hc.WritePacket(resp.Bytes(), CSOTunRefused) hc.WritePacket(resp.Bytes(), CSOTunRefused)
} else { } else {
logger.LogDebug(fmt.Sprintf("[ServerTun] Tunnel Opened - %v", (*hc.tuns)[rport])) logger.LogDebug(fmt.Sprintf("[ServerTun] Tunnel Opened - %v", (*hc.tuns)[rport]))
weAreDialled = true
var resp bytes.Buffer var resp bytes.Buffer
binary.Write(&resp, binary.BigEndian, lport) binary.Write(&resp, binary.BigEndian, lport)
binary.Write(&resp, binary.BigEndian, rport) binary.Write(&resp, binary.BigEndian, rport)
@ -279,7 +277,6 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
if c.Close() != nil { if c.Close() != nil {
logger.LogDebug("[ServerTun] workerA: conn c already closed") logger.LogDebug("[ServerTun] workerA: conn c already closed")
} }
weAreDialled = false
wg.Done() wg.Done()
}() }()
@ -343,7 +340,6 @@ func (hc *Conn) StartServerTunnel(lport, rport uint16) {
if c.Close() != nil { if c.Close() != nil {
logger.LogDebug("[ServerTun] worker B: conn c already closed") logger.LogDebug("[ServerTun] worker B: conn c already closed")
} }
weAreDialled = false
wg.Done() wg.Done()
}() }()