Rename IETF_BLOCKED to IETF_DATA_BLOCKED and IETF_STREAM_BLOCKED to IETF_STREAM_DATA_BLOCKED to match the RFC names.
gfe-relnote: n/a (Rename enum)
PiperOrigin-RevId: 285238330
Change-Id: Icc91e8244d1c3bee938885e8db17aa9d4238bab2
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 51f4aec..3235009 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -3075,7 +3075,7 @@
}
break;
}
- case IETF_BLOCKED: {
+ case IETF_DATA_BLOCKED: {
QuicBlockedFrame frame;
if (!ProcessIetfBlockedFrame(reader, &frame)) {
return RaiseError(QUIC_INVALID_BLOCKED_DATA);
@@ -3089,7 +3089,7 @@
}
break;
}
- case IETF_STREAM_BLOCKED: {
+ case IETF_STREAM_DATA_BLOCKED: {
QuicBlockedFrame frame;
if (!ProcessStreamBlockedFrame(reader, &frame)) {
return RaiseError(QUIC_INVALID_STREAM_BLOCKED_DATA);
@@ -4749,9 +4749,9 @@
case BLOCKED_FRAME:
if (frame.blocked_frame->stream_id ==
QuicUtils::GetInvalidStreamId(transport_version())) {
- type_byte = IETF_BLOCKED;
+ type_byte = IETF_DATA_BLOCKED;
} else {
- type_byte = IETF_STREAM_BLOCKED;
+ type_byte = IETF_STREAM_DATA_BLOCKED;
}
break;
case STOP_WAITING_FRAME:
diff --git a/quic/core/quic_framer_test.cc b/quic/core/quic_framer_test.cc
index 13f02bc..a810d7b 100644
--- a/quic/core/quic_framer_test.cc
+++ b/quic/core/quic_framer_test.cc
@@ -467,8 +467,8 @@
bool OnBlockedFrame(const QuicBlockedFrame& frame) override {
blocked_frame_ = frame;
if (VersionHasIetfQuicFrames(transport_version_)) {
- EXPECT_TRUE(IETF_BLOCKED == framer_->current_received_frame_type() ||
- IETF_STREAM_BLOCKED ==
+ EXPECT_TRUE(IETF_DATA_BLOCKED == framer_->current_received_frame_type() ||
+ IETF_STREAM_DATA_BLOCKED ==
framer_->current_received_frame_type());
} else {
EXPECT_EQ(0u, framer_->current_received_frame_type());
@@ -8384,7 +8384,7 @@
// packet number
0x12, 0x34, 0x56, 0x78,
- // frame type (IETF_BLOCKED frame)
+ // frame type (IETF_DATA_BLOCKED frame)
0x14,
// Offset
kVarInt62EightBytes + 0x3a, 0x98, 0xFE, 0xDC, 0x32, 0x10, 0x76, 0x54
@@ -9352,7 +9352,7 @@
// packet number
{"",
{0x12, 0x34, 0x9A, 0xBC}},
- // frame type (IETF_BLOCKED)
+ // frame type (IETF_DATA_BLOCKED)
{"",
{0x14}},
// blocked offset
@@ -9402,7 +9402,7 @@
// packet number
0x12, 0x34, 0x56, 0x78,
- // frame type (IETF_BLOCKED)
+ // frame type (IETF_DATA_BLOCKED)
0x14,
// Offset
kVarInt62EightBytes + 0x3a, 0x98, 0xFE, 0xDC, 0x32, 0x10, 0x76, 0x54
@@ -9435,7 +9435,7 @@
// packet number
{"",
{0x12, 0x34, 0x9A, 0xBC}},
- // frame type (IETF_STREAM_BLOCKED)
+ // frame type (IETF_STREAM_DATA_BLOCKED)
{"",
{0x15}},
// blocked offset
@@ -9488,7 +9488,7 @@
// packet number
0x12, 0x34, 0x56, 0x78,
- // frame type (IETF_STREAM_BLOCKED)
+ // frame type (IETF_STREAM_DATA_BLOCKED)
0x15,
// Stream ID
kVarInt62FourBytes + 0x01, 0x02, 0x03, 0x04,
diff --git a/quic/core/quic_types.cc b/quic/core/quic_types.cc
index ca12e76..1cee9fe 100644
--- a/quic/core/quic_types.cc
+++ b/quic/core/quic_types.cc
@@ -450,8 +450,8 @@
RETURN_STRING_LITERAL(IETF_MAX_STREAM_DATA);
RETURN_STRING_LITERAL(IETF_MAX_STREAMS_BIDIRECTIONAL);
RETURN_STRING_LITERAL(IETF_MAX_STREAMS_UNIDIRECTIONAL);
- RETURN_STRING_LITERAL(IETF_BLOCKED);
- RETURN_STRING_LITERAL(IETF_STREAM_BLOCKED);
+ RETURN_STRING_LITERAL(IETF_DATA_BLOCKED);
+ RETURN_STRING_LITERAL(IETF_STREAM_DATA_BLOCKED);
RETURN_STRING_LITERAL(IETF_STREAMS_BLOCKED_BIDIRECTIONAL);
RETURN_STRING_LITERAL(IETF_STREAMS_BLOCKED_UNIDIRECTIONAL);
RETURN_STRING_LITERAL(IETF_NEW_CONNECTION_ID);
diff --git a/quic/core/quic_types.h b/quic/core/quic_types.h
index 5a8ce07..fe52a3a 100644
--- a/quic/core/quic_types.h
+++ b/quic/core/quic_types.h
@@ -255,10 +255,8 @@
IETF_MAX_STREAM_DATA = 0x11,
IETF_MAX_STREAMS_BIDIRECTIONAL = 0x12,
IETF_MAX_STREAMS_UNIDIRECTIONAL = 0x13,
- IETF_BLOCKED = 0x14, // TODO(fkastenholz): Should, eventually, be renamed to
- // IETF_DATA_BLOCKED
- IETF_STREAM_BLOCKED = 0x15, // TODO(fkastenholz): Should, eventually, be
- // renamed to IETF_STREAM_DATA_BLOCKED
+ IETF_DATA_BLOCKED = 0x14,
+ IETF_STREAM_DATA_BLOCKED = 0x15,
IETF_STREAMS_BLOCKED_BIDIRECTIONAL = 0x16,
IETF_STREAMS_BLOCKED_UNIDIRECTIONAL = 0x17,
IETF_NEW_CONNECTION_ID = 0x18,
