github/v2ray-core
4
0
Fork 0
mirror of https://github.com/v2ray/v2ray-core.git synced 2026-11-01 16:18:24 +00:00
Code Issues Releases Wiki Activity

temp fix deadlock in quic lib

Browse Source
This commit is contained in:
Darien Raymond
2018-11-29 17:17:07 +01:00
parent 3b1aaa9a3d
commit fd060a0880
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/github.com/lucas-clemente/quic-go/send_stream.go
Generated Vendored
+7 -3
View File
@@ -97,7 +97,7 @@ func (s *sendStream) Write(p []byte) (int, error) {
s.dataForWriting = make([]byte, len(p))
copy(s.dataForWriting, p)
s.sender.onHasStreamData(s.streamID)
go s.sender.onHasStreamData(s.streamID)
var bytesWritten int
var err error
@@ -222,7 +222,7 @@ func (s *sendStream) Close() error {
return fmt.Errorf("Close called for canceled stream %d", s.streamID)
}
s.finishedWriting = true
s.sender.onHasStreamData(s.streamID) // need to send the FIN
go s.sender.onHasStreamData(s.streamID) // need to send the FIN
s.ctxCancel()
return nil
}
@@ -268,10 +268,14 @@ func (s *sendStream) handleStopSendingFrame(frame *wire.StopSendingFrame) {
func (s *sendStream) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) {
s.flowController.UpdateSendWindow(frame.ByteOffset)
s.mutex.Lock()
hasData := false
if s.dataForWriting != nil {
s.sender.onHasStreamData(s.streamID)
hasData = true
}
s.mutex.Unlock()
if hasData {
s.sender.onHasStreamData(s.streamID)
}
}
// must be called after locking the mutex