From d6eff22f9abd7950799596c716878a3ea4ca8103 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sun, 6 Oct 2019 08:11:54 +0200 Subject: [PATCH] introduce a sentinel ByteCount value --- internal/flowcontrol/stream_flow_controller_test.go | 8 ++++---- internal/protocol/protocol.go | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/internal/flowcontrol/stream_flow_controller_test.go b/internal/flowcontrol/stream_flow_controller_test.go index 8195c71e9..9f1d65d28 100644 --- a/internal/flowcontrol/stream_flow_controller_test.go +++ b/internal/flowcontrol/stream_flow_controller_test.go @@ -30,9 +30,9 @@ var _ = Describe("Stream Flow controller", func() { Context("Constructor", func() { rttStats := &utils.RTTStats{} - receiveWindow := protocol.ByteCount(2000) - maxReceiveWindow := protocol.ByteCount(3000) - sendWindow := protocol.ByteCount(4000) + const receiveWindow protocol.ByteCount = 2000 + const maxReceiveWindow protocol.ByteCount = 3000 + const sendWindow protocol.ByteCount = 4000 It("sets the send and receive windows", func() { cc := NewConnectionFlowController(0, 0, nil, nil, utils.DefaultLogger) @@ -50,7 +50,7 @@ var _ = Describe("Stream Flow controller", func() { queued = true } - cc := NewConnectionFlowController(0, 0, nil, nil, utils.DefaultLogger) + cc := NewConnectionFlowController(receiveWindow, maxReceiveWindow, func() {}, nil, utils.DefaultLogger) fc := NewStreamFlowController(5, cc, receiveWindow, maxReceiveWindow, sendWindow, queueWindowUpdate, rttStats, utils.DefaultLogger).(*streamFlowController) fc.AddBytesRead(receiveWindow) Expect(queued).To(BeTrue()) diff --git a/internal/protocol/protocol.go b/internal/protocol/protocol.go index 22e4a6fb7..74e9e98c2 100644 --- a/internal/protocol/protocol.go +++ b/internal/protocol/protocol.go @@ -44,11 +44,14 @@ const ( ) // A ByteCount in QUIC -type ByteCount uint64 +type ByteCount int64 // MaxByteCount is the maximum value of a ByteCount const MaxByteCount = ByteCount(1<<62 - 1) +// InvalidByteCount is an invalid byte count +const InvalidByteCount ByteCount = -1 + // An ApplicationErrorCode is an application-defined error code. type ApplicationErrorCode uint64