quic: handle DATA_BLOCKED frames

We never send DATA_BLOCKED frames, and ignore ones sent by the peer, but we do need to parse them. For golang/go#58547 Change-Id: Ic9893245108fd1c32067d14811e2d44488ce1ab5 Reviewed-on: https://go-review.googlesource.com/c/net/+/532715 LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Jonathan Amsterdam <[email protected]>
golang · Oct 5, 2023 · 73d82ef · 73d82ef
1 parent 5d5a036
commit 73d82ef
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/internal/quic/conn_recv.go b/internal/quic/conn_recv.go
@@ -254,6 +254,11 @@ func (c *Conn) handleFrames(now time.Time, ptype packetType, space numberSpace,
  return
  }
  n = c.handleMaxStreamsFrame(now, payload)
+ case frameTypeDataBlocked:
+ if !frameOK(c, ptype, __01) {
+ return
+ }
+ _, n = consumeDataBlockedFrame(payload)
  case frameTypeStreamsBlockedBidi, frameTypeStreamsBlockedUni:
  if !frameOK(c, ptype, __01) {
  return

diff --git a/internal/quic/stream_test.go b/internal/quic/stream_test.go
@@ -1217,6 +1217,23 @@ func TestStreamPeerStopSendingForActiveStream(t *testing.T) {
  })
 }
 
+func TestStreamReceiveDataBlocked(t *testing.T) {
+ tc := newTestConn(t, serverSide, permissiveTransportParameters)
+ tc.handshake()
+ tc.ignoreFrame(frameTypeAck)
+
+ // We don't do anything with these frames,
+ // but should accept them if the peer sends one.
+ tc.writeFrames(packetType1RTT, debugFrameStreamDataBlocked{
+ id: newStreamID(clientSide, bidiStream, 0),
+ max: 100,
+ })
+ tc.writeFrames(packetType1RTT, debugFrameDataBlocked{
+ max: 100,
+ })
+ tc.wantIdle("no response to STREAM_DATA_BLOCKED and DATA_BLOCKED")
+}
+
 type streamSide string
 
 const (