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

Only store stream in map after Accept

This commit is contained in:
Andy Wang 2019-08-19 11:31:56 +01:00
parent c8184fc1d2
commit ba467e8a32
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/multiplex/session.go
View File

@ -123,6 +123,9 @@ func (sesh *Session) Accept() (net.Conn, error) {
if stream == nil { if stream == nil {
return nil, ErrBrokenSession return nil, ErrBrokenSession
} }
sesh.streamsM.Lock()
sesh.streams[stream.id] = stream
sesh.streamsM.Unlock()
log.Tracef("stream %v of session %v accepted", stream.id, sesh.id) log.Tracef("stream %v of session %v accepted", stream.id, sesh.id)
return stream, nil return stream, nil
} }
@ -161,7 +164,6 @@ func (sesh *Session) recvDataFromRemote(data []byte) error {
connId, _ := sesh.sb.assignRandomConn() connId, _ := sesh.sb.assignRandomConn()
// we ignore the error here. If the switchboard is broken, it will be reflected upon stream.Write // we ignore the error here. If the switchboard is broken, it will be reflected upon stream.Write
stream = makeStream(sesh, frame.StreamID, connId) stream = makeStream(sesh, frame.StreamID, connId)
sesh.streams[frame.StreamID] = stream
sesh.acceptCh <- stream sesh.acceptCh <- stream
stream.writeFrame(frame) stream.writeFrame(frame)
return nil return nil