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

move packing of ACK-only short header packets to composeNextPacket

Browse Source
This commit is contained in:
Marten Seemann
2022-09-04 10:44:37 +03:00
parent c57ea6f276
commit 2873125c15
1 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packet_packer.go
View File

@@ -321,9 +321,10 @@ func (p *packetPacker) packetLength(hdr *wire.ExtendedHeader, payload *payload)
} }
func (p *packetPacker) MaybePackAckPacket(handshakeConfirmed bool) (*packedPacket, error) { func (p *packetPacker) MaybePackAckPacket(handshakeConfirmed bool) (*packedPacket, error) {
var pay *payload
var encLevel protocol.EncryptionLevel var encLevel protocol.EncryptionLevel
var ack *wire.AckFrame
if !handshakeConfirmed { if !handshakeConfirmed {
var ack *wire.AckFrame
ack = p.acks.GetAckFrame(protocol.EncryptionInitial, true) ack = p.acks.GetAckFrame(protocol.EncryptionInitial, true)
if ack != nil { if ack != nil {
encLevel = protocol.EncryptionInitial encLevel = protocol.EncryptionInitial
@@ -333,24 +334,27 @@ func (p *packetPacker) MaybePackAckPacket(handshakeConfirmed bool) (*packedPacke
encLevel = protocol.EncryptionHandshake encLevel = protocol.EncryptionHandshake
} }
} }
if ack != nil {
pay = &payload{
ack: ack,
length: ack.Length(p.version),
}
}
} }
if ack == nil { if pay == nil {
ack = p.acks.GetAckFrame(protocol.Encryption1RTT, true) pay = p.composeNextPacket(p.maxPacketSize, true, true)
if ack == nil { if pay == nil {
return nil, nil return nil, nil
} }
encLevel = protocol.Encryption1RTT encLevel = protocol.Encryption1RTT
} }
payload := &payload{
ack: ack,
length: ack.Length(p.version),
}
sealer, hdr, err := p.getSealerAndHeader(encLevel) sealer, hdr, err := p.getSealerAndHeader(encLevel)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return p.writeSinglePacket(hdr, payload, encLevel, sealer) return p.writeSinglePacket(hdr, pay, encLevel, sealer)
} }
// size is the expected size of the packet, if no padding was applied. // size is the expected size of the packet, if no padding was applied.
@@ -426,7 +430,7 @@ func (p *packetPacker) PackCoalescedPacket() (*coalescedPacket, error) {
case protocol.Encryption0RTT: case protocol.Encryption0RTT:
appDataHdr, appDataPayload = p.maybeGetAppDataPacketFor0RTT(appDataSealer, maxPacketSize-size) appDataHdr, appDataPayload = p.maybeGetAppDataPacketFor0RTT(appDataSealer, maxPacketSize-size)
case protocol.Encryption1RTT: case protocol.Encryption1RTT:
appDataHdr, appDataPayload = p.maybeGetShortHeaderPacket(oneRTTSealer, maxPacketSize-size, size) appDataHdr, appDataPayload = p.maybeGetShortHeaderPacket(oneRTTSealer, maxPacketSize-size, size == 0)
} }
if appDataHdr != nil && appDataPayload != nil { if appDataHdr != nil && appDataPayload != nil {
size += p.packetLength(appDataHdr, appDataPayload) + protocol.ByteCount(appDataSealer.Overhead()) size += p.packetLength(appDataHdr, appDataPayload) + protocol.ByteCount(appDataSealer.Overhead())
@@ -476,7 +480,7 @@ func (p *packetPacker) PackPacket() (*packedPacket, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
hdr, payload := p.maybeGetShortHeaderPacket(sealer, p.maxPacketSize, 0) hdr, payload := p.maybeGetShortHeaderPacket(sealer, p.maxPacketSize, true)
if payload == nil { if payload == nil {
return nil, nil return nil, nil
} }
@@ -559,15 +563,15 @@ func (p *packetPacker) maybeGetAppDataPacketFor0RTT(sealer sealer, maxPacketSize
return hdr, payload return hdr, payload
} }
func (p *packetPacker) maybeGetShortHeaderPacket(sealer handshake.ShortHeaderSealer, maxPacketSize, currentSize protocol.ByteCount) (*wire.ExtendedHeader, *payload) { func (p *packetPacker) maybeGetShortHeaderPacket(sealer handshake.ShortHeaderSealer, maxPacketSize protocol.ByteCount, ackAllowed bool) (*wire.ExtendedHeader, *payload) {
hdr := p.getShortHeader(sealer.KeyPhase()) hdr := p.getShortHeader(sealer.KeyPhase())
maxPayloadSize := maxPacketSize - hdr.GetLength(p.version) - protocol.ByteCount(sealer.Overhead()) maxPayloadSize := maxPacketSize - hdr.GetLength(p.version) - protocol.ByteCount(sealer.Overhead())
payload := p.maybeGetAppDataPacket(maxPayloadSize, currentSize == 0) payload := p.maybeGetAppDataPacket(maxPayloadSize, ackAllowed)
return hdr, payload return hdr, payload
} }
func (p *packetPacker) maybeGetAppDataPacket(maxPayloadSize protocol.ByteCount, ackAllowed bool) *payload { func (p *packetPacker) maybeGetAppDataPacket(maxPayloadSize protocol.ByteCount, ackAllowed bool) *payload {
payload := p.composeNextPacket(maxPayloadSize, ackAllowed) payload := p.composeNextPacket(maxPayloadSize, false, ackAllowed)
// check if we have anything to send // check if we have anything to send
if len(payload.frames) == 0 { if len(payload.frames) == 0 {
@@ -590,7 +594,17 @@ func (p *packetPacker) maybeGetAppDataPacket(maxPayloadSize protocol.ByteCount,
return payload return payload
} }
func (p *packetPacker) composeNextPacket(maxFrameSize protocol.ByteCount, ackAllowed bool) *payload { func (p *packetPacker) composeNextPacket(maxFrameSize protocol.ByteCount, onlyAck, ackAllowed bool) *payload {
if onlyAck {
if ack := p.acks.GetAckFrame(protocol.Encryption1RTT, true); ack != nil {
payload := &payload{}
payload.ack = ack
payload.length += ack.Length(p.version)
return payload
}
return nil
}
payload := &payload{frames: make([]ackhandler.Frame, 0, 1)} payload := &payload{frames: make([]ackhandler.Frame, 0, 1)}
hasData := p.framer.HasData() hasData := p.framer.HasData()