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

retire conn IDs with sequence numbers smaller than the currently active

Browse source
This commit is contained in:
Marten Seemann 2020-05-23 15:08:24 +07:00
parent fa69438124
commit b0c1aed4d2
2 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
conn_id_manager.go
View file

@ -68,9 +68,9 @@ func (h *connIDManager) Add(f *wire.NewConnectionIDFrame) error {
} }
func (h *connIDManager) add(f *wire.NewConnectionIDFrame) error { func (h *connIDManager) add(f *wire.NewConnectionIDFrame) error {
// If the NEW_CONNECTION_ID frame is reordered, such that its sequence number // If the NEW_CONNECTION_ID frame is reordered, such that its sequence number is smaller than the currently active
// was already retired, send the RETIRE_CONNECTION_ID frame immediately. // connection ID or if it was already retired, send the RETIRE_CONNECTION_ID frame immediately.
if f.SequenceNumber < h.highestRetired { if f.SequenceNumber <= h.activeSequenceNumber || f.SequenceNumber < h.highestRetired {
h.queueControlFrame(&wire.RetireConnectionIDFrame{ h.queueControlFrame(&wire.RetireConnectionIDFrame{
SequenceNumber: f.SequenceNumber, SequenceNumber: f.SequenceNumber,
}) })

20
conn_id_manager_test.go
View file

@ -181,6 +181,26 @@ var _ = Describe("Connection ID Manager", func() {
Expect(frameQueue[0].(*wire.RetireConnectionIDFrame).SequenceNumber).To(BeEquivalentTo(4)) Expect(frameQueue[0].(*wire.RetireConnectionIDFrame).SequenceNumber).To(BeEquivalentTo(4))
}) })
It("ignores reordered connection IDs, if their sequence number was already retired or less than active", func() {
Expect(m.Add(&wire.NewConnectionIDFrame{
SequenceNumber: 10,
ConnectionID: protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef},
RetirePriorTo: 5,
})).To(Succeed())
Expect(frameQueue).To(HaveLen(1))
Expect(frameQueue[0].(*wire.RetireConnectionIDFrame).SequenceNumber).To(BeZero())
frameQueue = nil
Expect(m.Get()).To(Equal(protocol.ConnectionID{0xde, 0xad, 0xbe, 0xef}))
Expect(m.Add(&wire.NewConnectionIDFrame{
SequenceNumber: 9,
ConnectionID: protocol.ConnectionID{0xde, 0xca, 0xfb, 0xad},
RetirePriorTo: 5,
})).To(Succeed())
Expect(frameQueue).To(HaveLen(1))
Expect(frameQueue[0].(*wire.RetireConnectionIDFrame).SequenceNumber).To(BeEquivalentTo(9))
})
It("errors when the peer sends too connection IDs", func() { It("errors when the peer sends too connection IDs", func() {
for i := uint8(1); i < protocol.MaxActiveConnectionIDs; i++ { for i := uint8(1); i < protocol.MaxActiveConnectionIDs; i++ {
Expect(m.Add(&wire.NewConnectionIDFrame{ Expect(m.Add(&wire.NewConnectionIDFrame{