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

save connection IDs sent in NEW_CONNECTION_ID frames

Browse Source
This commit is contained in:
Marten Seemann
2019-09-15 14:33:09 +07:00
parent 8db230753f
commit a321f9faa6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
session.go
View File

@@ -116,7 +116,8 @@ type session struct {
conn connection conn connection
sendQueue *sendQueue sendQueue *sendQueue
streamsMap streamManager streamsMap streamManager
connIDManager *connIDManager
rttStats *congestion.RTTStats rttStats *congestion.RTTStats
@@ -332,6 +333,7 @@ func (s *session) preSetup() {
s.sendQueue = newSendQueue(s.conn) s.sendQueue = newSendQueue(s.conn)
s.retransmissionQueue = newRetransmissionQueue(s.version) s.retransmissionQueue = newRetransmissionQueue(s.version)
s.frameParser = wire.NewFrameParser(s.version) s.frameParser = wire.NewFrameParser(s.version)
s.connIDManager = newConnIDManager(s.queueControlFrame)
s.rttStats = &congestion.RTTStats{} s.rttStats = &congestion.RTTStats{}
s.receivedPacketHandler = ackhandler.NewReceivedPacketHandler(s.rttStats, s.logger, s.version) s.receivedPacketHandler = ackhandler.NewReceivedPacketHandler(s.rttStats, s.logger, s.version)
s.connFlowController = flowcontrol.NewConnectionFlowController( s.connFlowController = flowcontrol.NewConnectionFlowController(
@@ -774,6 +776,7 @@ func (s *session) handleFrame(f wire.Frame, pn protocol.PacketNumber, encLevel p
case *wire.NewTokenFrame: case *wire.NewTokenFrame:
err = s.handleNewTokenFrame(frame) err = s.handleNewTokenFrame(frame)
case *wire.NewConnectionIDFrame: case *wire.NewConnectionIDFrame:
err = s.handleNewConnectionIDFrame(frame)
case *wire.RetireConnectionIDFrame: case *wire.RetireConnectionIDFrame:
// since we don't send new connection IDs, we don't expect retirements // since we don't send new connection IDs, we don't expect retirements
err = errors.New("unexpected RETIRE_CONNECTION_ID frame") err = errors.New("unexpected RETIRE_CONNECTION_ID frame")
@@ -888,6 +891,10 @@ func (s *session) handleNewTokenFrame(frame *wire.NewTokenFrame) error {
return nil return nil
} }
func (s *session) handleNewConnectionIDFrame(f *wire.NewConnectionIDFrame) error {
return s.connIDManager.Add(f)
}
func (s *session) handleAckFrame(frame *wire.AckFrame, pn protocol.PacketNumber, encLevel protocol.EncryptionLevel) error { func (s *session) handleAckFrame(frame *wire.AckFrame, pn protocol.PacketNumber, encLevel protocol.EncryptionLevel) error {
if err := s.sentPacketHandler.ReceivedAck(frame, pn, encLevel, s.lastPacketReceivedTime); err != nil { if err := s.sentPacketHandler.ReceivedAck(frame, pn, encLevel, s.lastPacketReceivedTime); err != nil {
return err return err

8
session_test.go
View File

@@ -302,6 +302,14 @@ var _ = Describe("Session", func() {
}) })
}) })
It("handles NEW_CONNECTION_ID frames", func() {
Expect(sess.handleFrame(&wire.NewConnectionIDFrame{
SequenceNumber: 10,
ConnectionID: protocol.ConnectionID{1, 2, 3, 4},
}, 1, protocol.Encryption1RTT)).To(Succeed())
Expect(sess.connIDManager.queue.Front().Value.ConnectionID).To(Equal(protocol.ConnectionID{1, 2, 3, 4}))
})
It("handles PING frames", func() { It("handles PING frames", func() {
err := sess.handleFrame(&wire.PingFrame{}, 0, protocol.EncryptionUnspecified) err := sess.handleFrame(&wire.PingFrame{}, 0, protocol.EncryptionUnspecified)
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())