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

Fix potential deadlocks

This commit is contained in:
Andy Wang 2019-10-08 23:11:16 +01:00
parent dd61c35356
commit c9318dc90b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/multiplex/session.go
View File

@ -56,6 +56,7 @@ type Session struct {
// Switchboard manages all connections to remote // Switchboard manages all connections to remote
sb *switchboard sb *switchboard
// Used for LocalAddr() and RemoteAddr() etc.
addrs atomic.Value addrs atomic.Value
// For accepting new streams // For accepting new streams
@ -150,8 +151,8 @@ func (sesh *Session) recvDataFromRemote(data []byte) error {
} }
sesh.streamsM.Lock() sesh.streamsM.Lock()
defer sesh.streamsM.Unlock()
stream, existing := sesh.streams[frame.StreamID] stream, existing := sesh.streams[frame.StreamID]
sesh.streamsM.Unlock()
if existing { if existing {
return stream.writeFrame(*frame) return stream.writeFrame(*frame)
} else { } else {

3
internal/multiplex/stream.go
View File

@ -112,6 +112,9 @@ func (s *Stream) Write(in []byte) (n int, err error) {
n, err = s.session.sb.send(s.obfsBuf[:i], &s.assignedConnId) n, err = s.session.sb.send(s.obfsBuf[:i], &s.assignedConnId)
log.Tracef("%v sent to remote through stream %v with err %v", len(in), s.id, err) log.Tracef("%v sent to remote through stream %v with err %v", len(in), s.id, err)
if err != nil { if err != nil {
if err == errBrokenSwitchboard {
s.session.Close()
}
return return
} }
return len(in), nil return len(in), nil