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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Jonathan Amsterdam <jba@google.com>
diff --git a/internal/quic/conn_recv.go b/internal/quic/conn_recv.go
index 19c4385..9b1ba1a 100644
--- a/internal/quic/conn_recv.go
+++ b/internal/quic/conn_recv.go
@@ -254,6 +254,11 @@
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
index 7501196..86eebc6 100644
--- a/internal/quic/stream_test.go
+++ b/internal/quic/stream_test.go
@@ -1217,6 +1217,23 @@
})
}
+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 (
