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

improve sending of WindowUpdate frames

Browse Source 
fixes #96
This commit is contained in:
Marten Seemann
2016-05-15 18:05:15 +07:00
parent a3ff4dd891
commit 089582dd9f
7 changed files with 173 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packet_packer.go
View File

@@ -27,9 +27,8 @@ type packetPacker struct {
sentPacketHandler ackhandler.SentPacketHandler
connectionParametersManager *handshake.ConnectionParametersManager
streamFrameQueue StreamFrameQueue
windowUpdateFrames []*frames.WindowUpdateFrame
controlFrames []frames.Frame
streamFrameQueue StreamFrameQueue
controlFrames []frames.Frame
lastPacketNumber protocol.PacketNumber
}
@@ -42,13 +41,9 @@ func (p *packetPacker) AddHighPrioStreamFrame(f frames.StreamFrame) {
p.streamFrameQueue.Push(&f, true)
}
func (p *packetPacker) AddWindowUpdateFrame(f *frames.WindowUpdateFrame) {
p.windowUpdateFrames = append(p.windowUpdateFrames, f)
}
func (p *packetPacker) PackPacket(stopWaitingFrame *frames.StopWaitingFrame, controlFrames []frames.Frame, includeStreamFrames bool) (*packedPacket, error) {
// don't send out packets that only contain a StopWaitingFrame
if len(p.windowUpdateFrames) == 0 && len(controlFrames) == 0 && (p.streamFrameQueue.Len() == 0 || !includeStreamFrames) {
if len(controlFrames) == 0 && (p.streamFrameQueue.Len() == 0 || !includeStreamFrames) {
return nil, nil
}
@@ -132,17 +127,6 @@ func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFra
maxFrameSize := protocol.MaxFrameAndPublicHeaderSize - publicHeaderLength
for len(p.windowUpdateFrames) > 0 {
frame := p.windowUpdateFrames[0]
minLength, _ := frame.MinLength() // windowUpdateFrames.MinLength() *never* returns an error
if payloadLength+minLength > maxFrameSize {
break
}
payloadLength += minLength
payloadFrames = append(payloadFrames, frame)
p.windowUpdateFrames = p.windowUpdateFrames[1:]
}
if stopWaitingFrame != nil {
payloadFrames = append(payloadFrames, stopWaitingFrame)
minLength, err := stopWaitingFrame.MinLength()