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

pass the version to the receiveStream constructor

Browse source
This commit is contained in:
Marten Seemann 2018-02-02 14:55:22 +08:00
parent d0a394430f
commit 5d45bb046b
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
receive_stream.go
View file

@ -55,6 +55,7 @@ func newReceiveStream(
streamID protocol.StreamID, streamID protocol.StreamID,
sender streamSender, sender streamSender,
flowController flowcontrol.StreamFlowController, flowController flowcontrol.StreamFlowController,
version protocol.VersionNumber,
) *receiveStream { ) *receiveStream {
return &receiveStream{ return &receiveStream{
streamID: streamID, streamID: streamID,
@ -62,6 +63,7 @@ func newReceiveStream(
flowController: flowController, flowController: flowController,
frameQueue: newStreamFrameSorter(), frameQueue: newStreamFrameSorter(),
readChan: make(chan struct{}, 1), readChan: make(chan struct{}, 1),
version: version,
} }
} }

8
receive_stream_test.go
View file

@ -29,7 +29,7 @@ var _ = Describe("Receive Stream", func() {
BeforeEach(func() { BeforeEach(func() {
mockSender = NewMockStreamSender(mockCtrl) mockSender = NewMockStreamSender(mockCtrl)
mockFC = mocks.NewMockStreamFlowController(mockCtrl) mockFC = mocks.NewMockStreamFlowController(mockCtrl)
str = newReceiveStream(streamID, mockSender, mockFC) str = newReceiveStream(streamID, mockSender, mockFC, versionIETFFrames)
timeout := scaleDuration(250 * time.Millisecond) timeout := scaleDuration(250 * time.Millisecond)
strWithTimeout = gbytes.TimeoutReader(str, timeout) strWithTimeout = gbytes.TimeoutReader(str, timeout)
@ -494,6 +494,7 @@ var _ = Describe("Receive Stream", func() {
}) })
It("queues a STOP_SENDING frame, for IETF QUIC", func() { It("queues a STOP_SENDING frame, for IETF QUIC", func() {
str.version = versionIETFFrames
mockSender.EXPECT().queueControlFrame(&wire.StopSendingFrame{ mockSender.EXPECT().queueControlFrame(&wire.StopSendingFrame{
StreamID: streamID, StreamID: streamID,
ErrorCode: 1234, ErrorCode: 1234,
@ -503,7 +504,10 @@ var _ = Describe("Receive Stream", func() {
}) })
It("doesn't queue a STOP_SENDING frame, for gQUIC", func() { It("doesn't queue a STOP_SENDING frame, for gQUIC", func() {
str.version = versionGQUICFrames
// no calls to mockSender.queueControlFrame
err := str.CancelRead(1234)
Expect(err).ToNot(HaveOccurred())
}) })
}) })

2
stream.go
View file

@ -125,7 +125,7 @@ func newStream(streamID protocol.StreamID,
s.completedMutex.Unlock() s.completedMutex.Unlock()
}, },
} }
s.receiveStream = *newReceiveStream(streamID, senderForReceiveStream, flowController) s.receiveStream = *newReceiveStream(streamID, senderForReceiveStream, flowController, version)
return s return s
} }