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

don't retransmit PATH_CHALLENGE and PATH_RESPONSE frames (#4200)

Browse source
This commit is contained in:
Marten Seemann 2023-12-13 09:52:13 +05:30 • committed by GitHub
parent 574dc84c0c
commit ff6d575ee3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
packet_packer.go
View file

@ -640,8 +640,14 @@ func (p *packetPacker) composeNextPacket(maxFrameSize protocol.ByteCount, onlyAc
pl.length += lengthAdded pl.length += lengthAdded
// add handlers for the control frames that were added // add handlers for the control frames that were added
for i := startLen; i < len(pl.frames); i++ { for i := startLen; i < len(pl.frames); i++ {
switch pl.frames[i].Frame.(type) {
case *wire.PathChallengeFrame, *wire.PathResponseFrame:
// Path probing is currently not supported, therefore we don't need to set the OnAcked callback yet.
// PATH_CHALLENGE and PATH_RESPONSE are never retransmitted.
default:
pl.frames[i].Handler = p.retransmissionQueue.AppDataAckHandler() pl.frames[i].Handler = p.retransmissionQueue.AppDataAckHandler()
} }
}
pl.streamFrames, lengthAdded = p.framer.AppendStreamFrames(pl.streamFrames, maxFrameSize-pl.length, v) pl.streamFrames, lengthAdded = p.framer.AppendStreamFrames(pl.streamFrames, maxFrameSize-pl.length, v)
pl.length += lengthAdded pl.length += lengthAdded

31
packet_packer_test.go
View file

@ -562,6 +562,37 @@ var _ = Describe("Packet packer", func() {
Expect(buffer.Len()).ToNot(BeZero()) Expect(buffer.Len()).ToNot(BeZero())
}) })
It("packs PATH_CHALLENGE and PATH_RESPONSE frames", func() {
pnManager.EXPECT().PeekPacketNumber(protocol.Encryption1RTT).Return(protocol.PacketNumber(0x42), protocol.PacketNumberLen2)
pnManager.EXPECT().PopPacketNumber(protocol.Encryption1RTT).Return(protocol.PacketNumber(0x42))
sealingManager.EXPECT().Get1RTTSealer().Return(getSealer(), nil)
framer.EXPECT().HasData().Return(true)
ackFramer.EXPECT().GetAckFrame(protocol.Encryption1RTT, false)
frames := []ackhandler.Frame{
{Frame: &wire.PathChallengeFrame{}},
{Frame: &wire.PathResponseFrame{}},
{Frame: &wire.DataBlockedFrame{}},
}
expectAppendControlFrames(frames...)
expectAppendStreamFrames()
buffer := getPacketBuffer()
p, err := packer.AppendPacket(buffer, maxPacketSize, protocol.Version1)
Expect(p).ToNot(BeNil())
Expect(err).ToNot(HaveOccurred())
Expect(p.Frames).To(HaveLen(3))
for i, f := range p.Frames {
Expect(f).To(BeAssignableToTypeOf(frames[i]))
switch f.Frame.(type) {
case *wire.PathChallengeFrame, *wire.PathResponseFrame:
// This means that the frame won't be retransmitted.
Expect(f.Handler).To(BeNil())
default:
Expect(f.Handler).ToNot(BeNil())
}
}
Expect(buffer.Len()).ToNot(BeZero())
})
It("packs DATAGRAM frames", func() { It("packs DATAGRAM frames", func() {
ackFramer.EXPECT().GetAckFrame(protocol.Encryption1RTT, true) ackFramer.EXPECT().GetAckFrame(protocol.Encryption1RTT, true)
pnManager.EXPECT().PeekPacketNumber(protocol.Encryption1RTT).Return(protocol.PacketNumber(0x42), protocol.PacketNumberLen2) pnManager.EXPECT().PeekPacketNumber(protocol.Encryption1RTT).Return(protocol.PacketNumber(0x42), protocol.PacketNumberLen2)