From 0f931ca54eb2777689cadb419fdb923f9c545f54 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Fri, 9 Nov 2018 09:00:25 +0700 Subject: [PATCH] use a uint64 for stream counts --- internal/protocol/stream_id.go | 2 +- session.go | 18 ++++++++++++++++-- streams_map.go | 8 ++++---- streams_map_incoming_bidi.go | 7 ++++--- streams_map_incoming_generic.go | 7 ++++--- streams_map_incoming_generic_test.go | 2 +- streams_map_incoming_uni.go | 7 ++++--- 7 files changed, 34 insertions(+), 17 deletions(-) diff --git a/internal/protocol/stream_id.go b/internal/protocol/stream_id.go index 45f1d464..61d027b2 100644 --- a/internal/protocol/stream_id.go +++ b/internal/protocol/stream_id.go @@ -31,7 +31,7 @@ func (s StreamID) Type() StreamType { // MaxStreamID is the highest stream ID that a peer is allowed to open, // when it is allowed to open numStreams. -func MaxStreamID(stype StreamType, numStreams int, pers Perspective) StreamID { +func MaxStreamID(stype StreamType, numStreams uint64, pers Perspective) StreamID { if numStreams == 0 { return 0 } diff --git a/session.go b/session.go index 125e3615..ba2c1922 100644 --- a/session.go +++ b/session.go @@ -158,7 +158,14 @@ var newSession = func( s.preSetup() initialStream := newCryptoStream() handshakeStream := newCryptoStream() - s.streamsMap = newStreamsMap(s, s.newFlowController, s.config.MaxIncomingStreams, s.config.MaxIncomingUniStreams, s.perspective, s.version) + s.streamsMap = newStreamsMap( + s, + s.newFlowController, + uint64(s.config.MaxIncomingStreams), + uint64(s.config.MaxIncomingUniStreams), + s.perspective, + s.version, + ) s.framer = newFramer(s.streamsMap, s.version) cs, err := handshake.NewCryptoSetupServer( initialStream, @@ -248,7 +255,14 @@ var newClientSession = func( s.cryptoStreamHandler = cs s.cryptoStreamManager = newCryptoStreamManager(cs, initialStream, handshakeStream) s.unpacker = newPacketUnpacker(cs, s.version) - s.streamsMap = newStreamsMap(s, s.newFlowController, s.config.MaxIncomingStreams, s.config.MaxIncomingUniStreams, s.perspective, s.version) + s.streamsMap = newStreamsMap( + s, + s.newFlowController, + uint64(s.config.MaxIncomingStreams), + uint64(s.config.MaxIncomingUniStreams), + s.perspective, + s.version, + ) s.framer = newFramer(s.streamsMap, s.version) s.packer = newPacketPacker( s.destConnID, diff --git a/streams_map.go b/streams_map.go index f909c5f0..a63640ba 100644 --- a/streams_map.go +++ b/streams_map.go @@ -26,8 +26,8 @@ var _ streamManager = &streamsMap{} func newStreamsMap( sender streamSender, newFlowController func(protocol.StreamID) flowcontrol.StreamFlowController, - maxIncomingStreams int, - maxIncomingUniStreams int, + maxIncomingStreams uint64, + maxIncomingUniStreams uint64, perspective protocol.Perspective, version protocol.VersionNumber, ) streamManager { @@ -162,8 +162,8 @@ func (m *streamsMap) HandleMaxStreamIDFrame(f *wire.MaxStreamIDFrame) error { func (m *streamsMap) UpdateLimits(p *handshake.TransportParameters) { // Max{Uni,Bidi}StreamID returns the highest stream ID that the peer is allowed to open. - m.outgoingBidiStreams.SetMaxStream(protocol.MaxStreamID(protocol.StreamTypeBidi, int(p.MaxBidiStreams), m.perspective)) - m.outgoingUniStreams.SetMaxStream(protocol.MaxStreamID(protocol.StreamTypeUni, int(p.MaxUniStreams), m.perspective)) + m.outgoingBidiStreams.SetMaxStream(protocol.MaxStreamID(protocol.StreamTypeBidi, p.MaxBidiStreams, m.perspective)) + m.outgoingUniStreams.SetMaxStream(protocol.MaxStreamID(protocol.StreamTypeUni, p.MaxUniStreams, m.perspective)) } func (m *streamsMap) CloseWithError(err error) { diff --git a/streams_map_incoming_bidi.go b/streams_map_incoming_bidi.go index 54c72d84..d507d323 100644 --- a/streams_map_incoming_bidi.go +++ b/streams_map_incoming_bidi.go @@ -21,7 +21,7 @@ type incomingBidiStreamsMap struct { nextStreamToAccept protocol.StreamID // the next stream that will be returned by AcceptStream() nextStreamToOpen protocol.StreamID // the highest stream that the peer openend maxStream protocol.StreamID // the highest stream that the peer is allowed to open - maxNumStreams int // maximum number of streams + maxNumStreams uint64 // maximum number of streams newStream func(protocol.StreamID) streamI queueMaxStreamID func(*wire.MaxStreamIDFrame) @@ -32,7 +32,7 @@ type incomingBidiStreamsMap struct { func newIncomingBidiStreamsMap( nextStreamToAccept protocol.StreamID, initialMaxStreamID protocol.StreamID, - maxNumStreams int, + maxNumStreams uint64, queueControlFrame func(wire.Frame), newStream func(protocol.StreamID) streamI, ) *incomingBidiStreamsMap { @@ -108,7 +108,8 @@ func (m *incomingBidiStreamsMap) DeleteStream(id protocol.StreamID) error { } delete(m.streams, id) // queue a MAX_STREAM_ID frame, giving the peer the option to open a new stream - if numNewStreams := m.maxNumStreams - len(m.streams); numNewStreams > 0 { + if m.maxNumStreams > uint64(len(m.streams)) { + numNewStreams := m.maxNumStreams - uint64(len(m.streams)) m.maxStream = m.nextStreamToOpen + protocol.StreamID((numNewStreams-1)*4) m.queueMaxStreamID(&wire.MaxStreamIDFrame{StreamID: m.maxStream}) } diff --git a/streams_map_incoming_generic.go b/streams_map_incoming_generic.go index ad1969f9..0ea7ecaf 100644 --- a/streams_map_incoming_generic.go +++ b/streams_map_incoming_generic.go @@ -19,7 +19,7 @@ type incomingItemsMap struct { nextStreamToAccept protocol.StreamID // the next stream that will be returned by AcceptStream() nextStreamToOpen protocol.StreamID // the highest stream that the peer openend maxStream protocol.StreamID // the highest stream that the peer is allowed to open - maxNumStreams int // maximum number of streams + maxNumStreams uint64 // maximum number of streams newStream func(protocol.StreamID) item queueMaxStreamID func(*wire.MaxStreamIDFrame) @@ -30,7 +30,7 @@ type incomingItemsMap struct { func newIncomingItemsMap( nextStreamToAccept protocol.StreamID, initialMaxStreamID protocol.StreamID, - maxNumStreams int, + maxNumStreams uint64, queueControlFrame func(wire.Frame), newStream func(protocol.StreamID) item, ) *incomingItemsMap { @@ -106,7 +106,8 @@ func (m *incomingItemsMap) DeleteStream(id protocol.StreamID) error { } delete(m.streams, id) // queue a MAX_STREAM_ID frame, giving the peer the option to open a new stream - if numNewStreams := m.maxNumStreams - len(m.streams); numNewStreams > 0 { + if m.maxNumStreams > uint64(len(m.streams)) { + numNewStreams := m.maxNumStreams - uint64(len(m.streams)) m.maxStream = m.nextStreamToOpen + protocol.StreamID((numNewStreams-1)*4) m.queueMaxStreamID(&wire.MaxStreamIDFrame{StreamID: m.maxStream}) } diff --git a/streams_map_incoming_generic_test.go b/streams_map_incoming_generic_test.go index 5aba8506..fe970348 100644 --- a/streams_map_incoming_generic_test.go +++ b/streams_map_incoming_generic_test.go @@ -27,7 +27,7 @@ func (s *mockGenericStream) closeForShutdown(err error) { var _ = Describe("Streams Map (incoming)", func() { const ( firstNewStream protocol.StreamID = 20 - maxNumStreams int = 10 + maxNumStreams uint64 = 10 initialMaxStream protocol.StreamID = firstNewStream + 4*protocol.StreamID(maxNumStreams-1) ) diff --git a/streams_map_incoming_uni.go b/streams_map_incoming_uni.go index c4b26e4b..d4019ca1 100644 --- a/streams_map_incoming_uni.go +++ b/streams_map_incoming_uni.go @@ -21,7 +21,7 @@ type incomingUniStreamsMap struct { nextStreamToAccept protocol.StreamID // the next stream that will be returned by AcceptStream() nextStreamToOpen protocol.StreamID // the highest stream that the peer openend maxStream protocol.StreamID // the highest stream that the peer is allowed to open - maxNumStreams int // maximum number of streams + maxNumStreams uint64 // maximum number of streams newStream func(protocol.StreamID) receiveStreamI queueMaxStreamID func(*wire.MaxStreamIDFrame) @@ -32,7 +32,7 @@ type incomingUniStreamsMap struct { func newIncomingUniStreamsMap( nextStreamToAccept protocol.StreamID, initialMaxStreamID protocol.StreamID, - maxNumStreams int, + maxNumStreams uint64, queueControlFrame func(wire.Frame), newStream func(protocol.StreamID) receiveStreamI, ) *incomingUniStreamsMap { @@ -108,7 +108,8 @@ func (m *incomingUniStreamsMap) DeleteStream(id protocol.StreamID) error { } delete(m.streams, id) // queue a MAX_STREAM_ID frame, giving the peer the option to open a new stream - if numNewStreams := m.maxNumStreams - len(m.streams); numNewStreams > 0 { + if m.maxNumStreams > uint64(len(m.streams)) { + numNewStreams := m.maxNumStreams - uint64(len(m.streams)) m.maxStream = m.nextStreamToOpen + protocol.StreamID((numNewStreams-1)*4) m.queueMaxStreamID(&wire.MaxStreamIDFrame{StreamID: m.maxStream}) }