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

Close session immediately after receiving signal

This commit is contained in:
Andy Wang 2020-01-22 21:30:30 +00:00
parent d65aee725a
commit 3f5fdae284
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
internal/multiplex/session.go
View File

@ -184,7 +184,7 @@ func (sesh *Session) recvDataFromRemote(data []byte) error {
if frame.Closing == C_STREAM {
streamI, existing := sesh.streams.Load(frame.StreamID)
if existing {
// DO NOT close the stream (or session below) straight away here because the sequence number of this frame
// DO NOT close the stream straight away here because the sequence number of this frame
// hasn't been checked. There may be later data frames which haven't arrived
stream := streamI.(*Stream)
return stream.writeFrame(*frame)
@ -193,15 +193,9 @@ func (sesh *Session) recvDataFromRemote(data []byte) error {
return nil
}
} else if frame.Closing == C_SESSION {
streamI, existing := sesh.streams.Load(frame.StreamID)
if existing {
stream := streamI.(*Stream)
return stream.writeFrame(*frame)
} else {
// Closing session
sesh.SetTerminalMsg("Received a closing notification frame")
return sesh.passiveClose()
}
// Closing session
sesh.SetTerminalMsg("Received a closing notification frame")
return sesh.passiveClose()
} else {
connId, _, _ := sesh.sb.pickRandConn()
// we ignore the error here. If the switchboard is broken, it will be reflected upon stream.Write