mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 12:47:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

queue 0-RTT packets for retransmission when 0-RTT is rejected

Browse source
This commit is contained in:
Marten Seemann 2020-01-23 15:11:05 +07:00
parent bc82887eff
commit 2473eb0895
4 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/ackhandler/received_packet_handler.go
View file

@ -93,6 +93,9 @@ func (h *receivedPacketHandler) DropPackets(encLevel protocol.EncryptionLevel) {
h.initialPackets = nil h.initialPackets = nil
case protocol.EncryptionHandshake: case protocol.EncryptionHandshake:
h.handshakePackets = nil h.handshakePackets = nil
case protocol.Encryption0RTT:
// Nothing to do here.
// If we are rejecting 0-RTT, no 0-RTT packets will have been decrypted.
default: default:
panic(fmt.Sprintf("Cannot drop keys for encryption level %s", encLevel)) panic(fmt.Sprintf("Cannot drop keys for encryption level %s", encLevel))
} }

4
internal/ackhandler/received_packet_handler_test.go
View file

@ -91,4 +91,8 @@ var _ = Describe("Received Packet Handler", func() {
Expect(handler.GetAckFrame(protocol.EncryptionHandshake)).To(BeNil()) Expect(handler.GetAckFrame(protocol.EncryptionHandshake)).To(BeNil())
Expect(handler.GetAckFrame(protocol.Encryption1RTT)).ToNot(BeNil()) Expect(handler.GetAckFrame(protocol.Encryption1RTT)).ToNot(BeNil())
}) })
It("does nothing when droping 0-RTT packets", func() {
handler.DropPackets(protocol.Encryption0RTT)
})
}) })

29
internal/ackhandler/sent_packet_handler.go
View file

@ -102,19 +102,34 @@ func NewSentPacketHandler(
func (h *sentPacketHandler) DropPackets(encLevel protocol.EncryptionLevel) { func (h *sentPacketHandler) DropPackets(encLevel protocol.EncryptionLevel) {
// remove outstanding packets from bytes_in_flight // remove outstanding packets from bytes_in_flight
pnSpace := h.getPacketNumberSpace(encLevel) if encLevel == protocol.EncryptionInitial || encLevel == protocol.EncryptionHandshake {
pnSpace.history.Iterate(func(p *Packet) (bool, error) { pnSpace := h.getPacketNumberSpace(encLevel)
if p.includedInBytesInFlight { pnSpace.history.Iterate(func(p *Packet) (bool, error) {
h.bytesInFlight -= p.Length if p.includedInBytesInFlight {
} h.bytesInFlight -= p.Length
return true, nil }
}) return true, nil
})
}
// drop the packet history // drop the packet history
switch encLevel { switch encLevel {
case protocol.EncryptionInitial: case protocol.EncryptionInitial:
h.initialPackets = nil h.initialPackets = nil
case protocol.EncryptionHandshake: case protocol.EncryptionHandshake:
h.handshakePackets = nil h.handshakePackets = nil
case protocol.Encryption0RTT:
// TODO(#2067): invalidate sent data
h.appDataPackets.history.Iterate(func(p *Packet) (bool, error) {
if p.EncryptionLevel != protocol.Encryption0RTT {
return false, nil
}
h.queueFramesForRetransmission(p)
if p.includedInBytesInFlight {
h.bytesInFlight -= p.Length
}
h.appDataPackets.history.Remove(p.PacketNumber)
return true, nil
})
default: default:
panic(fmt.Sprintf("Cannot drop keys for encryption level %s", encLevel)) panic(fmt.Sprintf("Cannot drop keys for encryption level %s", encLevel))
} }

17
internal/ackhandler/sent_packet_handler_test.go
View file

@ -838,6 +838,23 @@ var _ = Describe("SentPacketHandler", func() {
Expect(handler.bytesInFlight).To(Equal(protocol.ByteCount(10))) Expect(handler.bytesInFlight).To(Equal(protocol.ByteCount(10)))
Expect(handler.handshakePackets).To(BeNil()) Expect(handler.handshakePackets).To(BeNil())
}) })
// TODO(#2067): invalidate 0-RTT data when 0-RTT is rejected
It("retransmits 0-RTT packets when 0-RTT keys are dropped", func() {
for i := protocol.PacketNumber(0); i < 6; i++ {
handler.SentPacket(ackElicitingPacket(&Packet{
PacketNumber: i,
EncryptionLevel: protocol.Encryption0RTT,
}))
}
for i := protocol.PacketNumber(0); i < 6; i++ {
handler.SentPacket(ackElicitingPacket(&Packet{PacketNumber: i}))
}
Expect(handler.bytesInFlight).To(Equal(protocol.ByteCount(12)))
handler.DropPackets(protocol.Encryption0RTT)
Expect(lostPackets).To(Equal([]protocol.PacketNumber{0, 1, 2, 3, 4, 5}))
Expect(handler.bytesInFlight).To(Equal(protocol.ByteCount(6)))
})
}) })
Context("peeking and popping packet number", func() { Context("peeking and popping packet number", func() {