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

pass the byte offset of a RstStreamFrame to the flow controller

Browse Source 
fixes #377
This commit is contained in:
Marten Seemann
2017-01-03 12:37:45 +07:00
parent 74edf9caad
commit bf0caf3c03
3 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
session.go
View File

@@ -393,7 +393,6 @@ func (s *Session) handleWindowUpdateFrame(frame *frames.WindowUpdateFrame) error
return err
}
// TODO: Handle frame.byteOffset
func (s *Session) handleRstStreamFrame(frame *frames.RstStreamFrame) error {
str, err := s.streamsMap.GetOrOpenStream(frame.StreamID)
if err != nil {
@@ -402,6 +401,10 @@ func (s *Session) handleRstStreamFrame(frame *frames.RstStreamFrame) error {
if str == nil {
return errRstStreamOnInvalidStream
}
err = s.flowControlManager.ResetStream(frame.StreamID, frame.ByteOffset)
if err != nil {
return err
}
s.closeStreamWithError(str, fmt.Errorf("RST_STREAM received with code %d", frame.ErrorCode))
return nil
}

24
session_test.go
View File

@@ -317,6 +317,30 @@ var _ = Describe("Session", func() {
Expect(err).To(MatchError("RST_STREAM received with code 42"))
})
It("passes the byte offset to the flow controller", func() {
session.streamsMap.GetOrOpenStream(5)
session.flowControlManager = newMockFlowControlHandler()
err := session.handleRstStreamFrame(&frames.RstStreamFrame{
StreamID: 5,
ByteOffset: 0x1337,
})
Expect(err).ToNot(HaveOccurred())
Expect(session.flowControlManager.(*mockFlowControlHandler).highestReceivedForStream).To(Equal(protocol.StreamID(5)))
Expect(session.flowControlManager.(*mockFlowControlHandler).highestReceived).To(Equal(protocol.ByteCount(0x1337)))
})
It("returns errors from the flow controller", func() {
session.streamsMap.GetOrOpenStream(5)
session.flowControlManager = newMockFlowControlHandler()
testErr := errors.New("flow control violation")
session.flowControlManager.(*mockFlowControlHandler).flowControlViolation = testErr
err := session.handleRstStreamFrame(&frames.RstStreamFrame{
StreamID: 5,
ByteOffset: 0x1337,
})
Expect(err).To(MatchError(testErr))
})
It("ignores the error when the stream is not known", func() {
err := session.handleFrames([]frames.Frame{&frames.RstStreamFrame{
StreamID: 5,

2
stream_test.go
View File

@@ -62,7 +62,7 @@ func (m *mockFlowControlHandler) AddBytesRead(streamID protocol.StreamID, n prot
}
func (m *mockFlowControlHandler) ResetStream(streamID protocol.StreamID, byteOffset protocol.ByteCount) error {
panic("not implemented")
return m.UpdateHighestReceived(streamID, byteOffset)
}
func (m *mockFlowControlHandler) UpdateHighestReceived(streamID protocol.StreamID, byteOffset protocol.ByteCount) error {