gfe-relnote: Remove QUIC version 44.
False deprecate gfe2_reloadable_flag_quic_enable_version_44.
PiperOrigin-RevId: 250877268
Change-Id: I22b949baa3eea488245d84ca537342c9eadbfb48
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 04b824a..fa6dbd20 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -195,24 +195,12 @@
}
uint8_t PacketNumberLengthToOnWireValue(
- QuicTransportVersion version,
QuicPacketNumberLength packet_number_length) {
- if (version > QUIC_VERSION_44) {
- return packet_number_length - 1;
- }
- switch (packet_number_length) {
- case PACKET_1BYTE_PACKET_NUMBER:
- return 0;
- case PACKET_2BYTE_PACKET_NUMBER:
- return 1;
- case PACKET_4BYTE_PACKET_NUMBER:
- return 2;
- default:
- QUIC_BUG << "Invalid packet number length.";
- return 0;
- }
+ return packet_number_length - 1;
}
+// TODO(fayang): Remove |version| when deprecating
+// quic_no_framer_object_in_dispatcher.
bool GetShortHeaderPacketNumberLength(
QuicTransportVersion version,
uint8_t type,
@@ -220,7 +208,7 @@
QuicPacketNumberLength* packet_number_length) {
DCHECK(!(type & FLAGS_LONG_HEADER));
const bool two_bits_packet_number_length =
- infer_packet_header_type_from_version ? version > QUIC_VERSION_44
+ infer_packet_header_type_from_version ? version > 44
: (type & FLAGS_FIXED_BIT);
if (two_bits_packet_number_length) {
*packet_number_length =
@@ -244,17 +232,16 @@
return true;
}
-uint8_t LongHeaderTypeToOnWireValue(QuicTransportVersion version,
- QuicLongHeaderType type) {
+uint8_t LongHeaderTypeToOnWireValue(QuicLongHeaderType type) {
switch (type) {
case INITIAL:
- return version > QUIC_VERSION_44 ? 0 : 0x7F;
+ return 0;
case ZERO_RTT_PROTECTED:
- return version > QUIC_VERSION_44 ? 1 << 4 : 0x7C;
+ return 1 << 4;
case HANDSHAKE:
- return version > QUIC_VERSION_44 ? 2 << 4 : 0x7D;
+ return 2 << 4;
case RETRY:
- return version > QUIC_VERSION_44 ? 3 << 4 : 0x7E;
+ return 3 << 4;
case VERSION_NEGOTIATION:
return 0xF0; // Value does not matter
default:
@@ -263,11 +250,13 @@
}
}
+// TODO(fayang): Remove |version| when deprecating
+// quic_no_framer_object_in_dispatcher.
bool GetLongHeaderType(QuicTransportVersion version,
uint8_t type,
QuicLongHeaderType* long_header_type) {
DCHECK((type & FLAGS_LONG_HEADER) && version != QUIC_VERSION_UNSUPPORTED);
- if (version > QUIC_VERSION_44) {
+ if (version > 44) {
switch ((type & 0x30) >> 4) {
case 0:
*long_header_type = INITIAL;
@@ -311,10 +300,12 @@
return true;
}
+// TODO(fayang): Remove |version| when deprecating
+// quic_no_framer_object_in_dispatcher.
QuicPacketNumberLength GetLongHeaderPacketNumberLength(
QuicTransportVersion version,
uint8_t type) {
- if (version > QUIC_VERSION_44) {
+ if (version > 44) {
return static_cast<QuicPacketNumberLength>((type & 0x03) + 1);
}
return PACKET_4BYTE_PACKET_NUMBER;
@@ -1365,8 +1356,7 @@
type |= FLAGS_FIXED_BIT;
type |= FLAGS_SHORT_HEADER_RESERVED_1;
type |= FLAGS_SHORT_HEADER_RESERVED_2;
- type |= PacketNumberLengthToOnWireValue(QUIC_VERSION_UNSUPPORTED,
- PACKET_1BYTE_PACKET_NUMBER);
+ type |= PacketNumberLengthToOnWireValue(PACKET_1BYTE_PACKET_NUMBER);
// Append type byte.
if (!writer.WriteUInt8(type)) {
@@ -2135,34 +2125,15 @@
bool QuicFramer::AppendIetfHeaderTypeByte(const QuicPacketHeader& header,
QuicDataWriter* writer) {
uint8_t type = 0;
- if (transport_version() > QUIC_VERSION_44) {
- if (header.version_flag) {
- type = static_cast<uint8_t>(
- FLAGS_LONG_HEADER | FLAGS_FIXED_BIT |
- LongHeaderTypeToOnWireValue(transport_version(),
- header.long_packet_type) |
- PacketNumberLengthToOnWireValue(transport_version(),
- header.packet_number_length));
- } else {
- type = static_cast<uint8_t>(
- FLAGS_FIXED_BIT |
- PacketNumberLengthToOnWireValue(transport_version(),
- header.packet_number_length));
- }
- return writer->WriteUInt8(type);
- }
-
if (header.version_flag) {
type = static_cast<uint8_t>(
- FLAGS_LONG_HEADER | LongHeaderTypeToOnWireValue(
- transport_version(), header.long_packet_type));
- DCHECK_EQ(PACKET_4BYTE_PACKET_NUMBER, header.packet_number_length);
+ FLAGS_LONG_HEADER | FLAGS_FIXED_BIT |
+ LongHeaderTypeToOnWireValue(header.long_packet_type) |
+ PacketNumberLengthToOnWireValue(header.packet_number_length));
} else {
- type |= FLAGS_SHORT_HEADER_RESERVED_1;
- type |= FLAGS_SHORT_HEADER_RESERVED_2;
- DCHECK_GE(PACKET_4BYTE_PACKET_NUMBER, header.packet_number_length);
- type |= PacketNumberLengthToOnWireValue(transport_version(),
- header.packet_number_length);
+ type = static_cast<uint8_t>(
+ FLAGS_FIXED_BIT |
+ PacketNumberLengthToOnWireValue(header.packet_number_length));
}
return writer->WriteUInt8(type);
}
@@ -2548,7 +2519,9 @@
} else {
header->version = ParseQuicVersionLabel(version_label);
if (header->version.transport_version != QUIC_VERSION_UNSUPPORTED) {
- if (header->version.transport_version > QUIC_VERSION_44 &&
+ // TODO(fayang): remove version check when deprecating
+ // quic_no_framer_object_in_dispatcher.
+ if (header->version.transport_version > 44 &&
!(type & FLAGS_FIXED_BIT)) {
set_detailed_error("Fixed bit is 0 in long header.");
return false;
@@ -2593,8 +2566,10 @@
perspective_ == Perspective::IS_CLIENT ? CONNECTION_ID_ABSENT
: CONNECTION_ID_PRESENT;
header->source_connection_id_included = CONNECTION_ID_ABSENT;
- if (infer_packet_header_type_from_version_ &&
- transport_version() > QUIC_VERSION_44 && !(type & FLAGS_FIXED_BIT)) {
+ // TODO(fayang): remove version check when deprecating
+ // quic_no_framer_object_in_dispatcher.
+ if (infer_packet_header_type_from_version_ && transport_version() > 44 &&
+ !(type & FLAGS_FIXED_BIT)) {
set_detailed_error("Fixed bit is 0 in short header.");
return false;
}
@@ -2768,7 +2743,7 @@
set_detailed_error("Unable to read frame type.");
return RaiseError(QUIC_INVALID_FRAME_DATA);
}
- const uint8_t special_mask = transport_version() <= QUIC_VERSION_44
+ const uint8_t special_mask = transport_version() <= QUIC_VERSION_43
? kQuicFrameTypeBrokenMask
: kQuicFrameTypeSpecialMask;
if (frame_type & special_mask) {
@@ -2887,7 +2862,7 @@
case STOP_WAITING_FRAME: {
if (GetQuicReloadableFlag(quic_do_not_accept_stop_waiting) &&
- version_.transport_version >= QUIC_VERSION_44) {
+ version_.transport_version > QUIC_VERSION_43) {
QUIC_RELOADABLE_FLAG_COUNT(quic_do_not_accept_stop_waiting);
set_detailed_error("STOP WAITING not supported in version 44+.");
return RaiseError(QUIC_INVALID_STOP_WAITING_DATA);
