gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

simplify stream now that the frame sorter handles gaps properly

Browse Source
This commit is contained in:
Lucas Clemente
2016-08-02 11:34:12 +02:00
parent 348c5ae8e8
commit 5a00fd89f6
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
stream.go
View File

@@ -85,19 +85,8 @@ func (s *stream) Read(p []byte) (int, error) {
break
}
if frame != nil {
// Pop and continue if the frame doesn't have any new data
if frame.Offset+frame.DataLen() <= s.readOffset && !frame.FinBit {
s.frameQueue.Pop()
frame = s.frameQueue.Head()
continue
}
// If the frame's offset is <= our current read pos, and we didn't
// go into the previous if, we can read data from the frame.
if frame.Offset <= s.readOffset {
// Set our read position in the frame properly
s.readPosInFrame = int(s.readOffset - frame.Offset)
break
}
s.readPosInFrame = int(s.readOffset - frame.Offset)
break
}
s.newFrameOrErrCond.Wait()
frame = s.frameQueue.Head()