kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce code duplication in session closing

This commit is contained in:
Andy Wang 2020-12-06 10:50:45 +00:00
parent 46f4235ccb
commit 61b1031da6
No known key found for this signature in database
GPG Key ID: 181B49F9F38F3374
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/multiplex/session.go
View File

@ -253,8 +253,7 @@ func (sesh *Session) TerminalMsg() string {
} }
} }
func (sesh *Session) passiveClose() error { func (sesh *Session) closeSession(closeSwitchboard bool) error {
log.Debugf("attempting to passively close session %v", sesh.id)
if atomic.SwapUint32(&sesh.closed, 1) == 1 { if atomic.SwapUint32(&sesh.closed, 1) == 1 {
log.Debugf("session %v has already been closed", sesh.id) log.Debugf("session %v has already been closed", sesh.id)
return errRepeatSessionClosing return errRepeatSessionClosing
@ -273,7 +272,18 @@ func (sesh *Session) passiveClose() error {
return true return true
}) })
if closeSwitchboard {
sesh.sb.closeAll() sesh.sb.closeAll()
}
return nil
}
func (sesh *Session) passiveClose() error {
log.Debugf("attempting to passively close session %v", sesh.id)
err := sesh.closeSession(true)
if err != nil {
return err
}
log.Debugf("session %v closed gracefully", sesh.id) log.Debugf("session %v closed gracefully", sesh.id)
return nil return nil
} }
@ -288,25 +298,10 @@ func genRandomPadding() []byte {
func (sesh *Session) Close() error { func (sesh *Session) Close() error {
log.Debugf("attempting to actively close session %v", sesh.id) log.Debugf("attempting to actively close session %v", sesh.id)
if atomic.SwapUint32(&sesh.closed, 1) == 1 { err := sesh.closeSession(false)
log.Debugf("session %v has already been closed", sesh.id) if err != nil {
return errRepeatSessionClosing return err
} }
sesh.acceptCh <- nil
// close all streams
sesh.streams.Range(func(key, streamI interface{}) bool {
if streamI == nil {
return true
}
stream := streamI.(*Stream)
atomic.StoreUint32(&stream.closed, 1)
_ = stream.recvBuf.Close() // will not block
sesh.streams.Delete(key)
sesh.streamCountDecr()
return true
})
// we send a notice frame telling remote to close the session // we send a notice frame telling remote to close the session
pad := genRandomPadding() pad := genRandomPadding()
f := &Frame{ f := &Frame{