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

respect connection flow control window in StreamFrameQueue

Browse Source
This commit is contained in:
Marten Seemann
2016-06-16 16:00:18 +07:00
committed by Lucas Clemente
parent 1b732a4afa
commit 8a9d70488a
3 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
stream_frame_queue.go
View File

@@ -148,7 +148,7 @@ func (q *streamFrameQueue) Pop(maxLength protocol.ByteCount) (*frames.StreamFram
q.byteLen -= frame.DataLen()
// TODO: find a better solution for identifying streams that don't contribute to connection level flow control
// TODO: don't add retransmission to connection-level flow control
q.flowControlManager.AddBytesSent(streamID, frame.DataLen())
q.len--
@@ -261,9 +261,21 @@ func (q *streamFrameQueue) getMaximumFrameDataSize(frame *frames.StreamFrame) (p
if err != nil {
return 0, err
}
if frame.Offset > highestAllowedStreamOffset { // stream level flow control blocked
// stream level flow control blocked
// TODO: shouldn't that be >=
if frame.Offset > highestAllowedStreamOffset {
return 0, errStreamFlowControlBlocked
}
return highestAllowedStreamOffset - frame.Offset, nil
maxFrameSize := highestAllowedStreamOffset - frame.Offset
contributes, err := q.flowControlManager.StreamContributesToConnectionFlowControl(frame.StreamID)
if err != nil {
return 0, err
}
if contributes {
maxFrameSize = utils.MinByteCount(maxFrameSize, q.flowControlManager.RemainingConnectionWindowSize())
}
return maxFrameSize, nil
}