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

Update comment

This commit is contained in:
Andy Wang 2020-12-04 22:27:24 +00:00
parent ebce40ce2d
commit 39c06a6e1d
No known key found for this signature in database
GPG Key ID: 181B49F9F38F3374
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/multiplex/session.go
View File

@ -195,7 +195,9 @@ func (sesh *Session) closeStream(s *Stream, active bool) error {
log.Tracef("stream %v passively closed", s.id) log.Tracef("stream %v passively closed", s.id)
} }
// id may or may not exist as this is user input, if we use Delete(s.id) here it will panic // We set it as nil to signify that the stream id had existed before.
// If we Delete(s.id) straight away, later on in recvDataFromRemote, it will not be able to tell
// if the frame it received was from a new stream or a dying stream whose frame arrived late
sesh.streams.Store(s.id, nil) sesh.streams.Store(s.id, nil)
if sesh.streamCountDecr() == 0 { if sesh.streamCountDecr() == 0 {
if sesh.Singleplex { if sesh.Singleplex {

5
internal/multiplex/session_test.go
View File

@ -237,8 +237,9 @@ func TestRecvDataFromRemote_Closing_InOrder(t *testing.T) {
if s1I != nil { if s1I != nil {
t.Error("stream 1 exists after receiving stream close for the second time") t.Error("stream 1 exists after receiving stream close for the second time")
} }
if sesh.streamCount() != 1 { streamCount := sesh.streamCount()
t.Error("stream count isn't 1 after stream 1 closed twice") if streamCount != 1 {
t.Errorf("stream count is %v after stream 1 closed twice, expected 1", streamCount)
} }
// close session // close session