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

add method to PacketPacker to send WindowUpdate frames

Browse Source 
work towards #19
This commit is contained in:
Marten Seemann
2016-05-15 09:52:31 +07:00
parent 01edd2c395
commit 13f15c8c23
2 changed files with 73 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packet_packer.go
View File

@@ -27,8 +27,9 @@ type packetPacker struct {
sentPacketHandler ackhandler.SentPacketHandler
connectionParametersManager *handshake.ConnectionParametersManager
streamFrameQueue StreamFrameQueue
controlFrames []frames.Frame
streamFrameQueue StreamFrameQueue
windowUpdateFrames []*frames.WindowUpdateFrame
controlFrames []frames.Frame
lastPacketNumber protocol.PacketNumber
}
@@ -41,6 +42,10 @@ 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(controlFrames) == 0 && (p.streamFrameQueue.Len() == 0 || !includeStreamFrames) {
@@ -122,9 +127,24 @@ func (p *packetPacker) getPayload(frames []frames.Frame, currentPacketNumber pro
}
func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFrame, publicHeaderLength protocol.ByteCount, includeStreamFrames bool) ([]frames.Frame, error) {
payloadLength := protocol.ByteCount(0)
var payloadLength protocol.ByteCount
var payloadFrames []frames.Frame
maxFrameSize := protocol.MaxFrameAndPublicHeaderSize - publicHeaderLength
// TODO: handle the extremely unlikely case that there are more windowUpdateFrames than we can fit into one packet
for len(p.windowUpdateFrames) > 0 {
frame := p.windowUpdateFrames[0]
minLength, _ := frame.MinLength() // windowUpdateFrames.MinLength() *never* returns an error
payloadLength += minLength
payloadFrames = append(payloadFrames, frame)
p.windowUpdateFrames = p.windowUpdateFrames[1:]
if payloadLength > maxFrameSize {
panic("internal inconsistency: packet payload too large")
}
}
if stopWaitingFrame != nil {
payloadFrames = append(payloadFrames, stopWaitingFrame)
minLength, err := stopWaitingFrame.MinLength()
@@ -134,8 +154,6 @@ func (p *packetPacker) composeNextPacket(stopWaitingFrame *frames.StopWaitingFra
payloadLength += minLength
}
maxFrameSize := protocol.MaxFrameAndPublicHeaderSize - publicHeaderLength
for len(p.controlFrames) > 0 {
frame := p.controlFrames[0]
minLength, _ := frame.MinLength() // controlFrames does not contain any StopWaitingFrames. So it will *never* return an error