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

Reduce unnecessary allocation size on stream closing

This commit is contained in:
Andy Wang 2020-10-18 15:37:14 +01:00
parent 64d857c74d
commit 0fc27d747e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/multiplex/session.go
View File

@ -166,7 +166,7 @@ func (sesh *Session) closeStream(s *Stream, active bool) error {
}
s.nextSendSeq++
obfsBuf := make([]byte, len(padding)+64)
obfsBuf := make([]byte, len(padding)+HEADER_LEN+sesh.Obfuscator.maxOverhead)
i, err := sesh.Obfs(f, obfsBuf, 0)
if err != nil {
return err
@ -180,7 +180,8 @@ func (sesh *Session) closeStream(s *Stream, active bool) error {
log.Tracef("stream %v passively closed", s.id)
}
sesh.streams.Store(s.id, nil) // id may or may not exist. if we use Delete(s.id) here it will panic
// id may or may not exist as this is user input, if we use Delete(s.id) here it will panic
sesh.streams.Store(s.id, nil)
if sesh.streamCountDecr() == 0 {
if sesh.Singleplex {
return sesh.Close()
@ -276,6 +277,7 @@ func (sesh *Session) Close() error {
}
sesh.acceptCh <- nil
// close all streams
sesh.streams.Range(func(key, streamI interface{}) bool {
if streamI == nil {
return true
@ -296,7 +298,7 @@ func (sesh *Session) Close() error {
Closing: C_SESSION,
Payload: pad,
}
obfsBuf := make([]byte, len(pad)+64)
obfsBuf := make([]byte, len(pad)+HEADER_LEN+sesh.Obfuscator.maxOverhead)
i, err := sesh.Obfs(f, obfsBuf, 0)
if err != nil {
return err