Use QUIC v47 for variable length connection IDs instead of CRYPTO frames
This CL takes over v47 to not be related to CRYPTO frames any more but instead support for variable length connection IDs. CRYPTO frames will be given v48 in a followup CL.
gfe-relnote: v47-specific change, protected by gfe2_reloadable_flag_quic_enable_version_47
PiperOrigin-RevId: 239634999
Change-Id: Ie274fb5b5e1536e05fe1c2056b1825b2cdc09642
diff --git a/quic/core/quic_framer_test.cc b/quic/core/quic_framer_test.cc
index ea362eb..782ff03 100644
--- a/quic/core/quic_framer_test.cc
+++ b/quic/core/quic_framer_test.cc
@@ -11147,8 +11147,8 @@
}
TEST_P(QuicFramerTest, NewConnectionIdFrameVariableLength) {
- if (!QuicUtils::VariableLengthConnectionIdAllowedForVersion(
- framer_.transport_version())) {
+ if (framer_.transport_version() != QUIC_VERSION_99) {
+ // This frame is only for version 99.
return;
}
// clang-format off
diff --git a/quic/core/quic_utils.cc b/quic/core/quic_utils.cc
index d03cc0e..d12ebeb 100644
--- a/quic/core/quic_utils.cc
+++ b/quic/core/quic_utils.cc
@@ -493,7 +493,7 @@
// static
bool QuicUtils::VariableLengthConnectionIdAllowedForVersion(
QuicTransportVersion version) {
- return version == QUIC_VERSION_99;
+ return version >= QUIC_VERSION_47;
}
// static
diff --git a/quic/core/quic_versions.h b/quic/core/quic_versions.h
index 042c95c..b23ae08 100644
--- a/quic/core/quic_versions.h
+++ b/quic/core/quic_versions.h
@@ -103,7 +103,7 @@
QUIC_VERSION_46 = 46, // Use IETF draft-17 header format with demultiplexing
// bit.
- QUIC_VERSION_47 = 47, // Use CRYPTO frames for QuicCryptoStreams.
+ QUIC_VERSION_47 = 47, // Allow variable-length QUIC connection IDs.
QUIC_VERSION_99 = 99, // Dumping ground for IETF QUIC changes which are not
// yet ready for production.
};
@@ -345,7 +345,7 @@
// instead of stream 1.
QUIC_EXPORT_PRIVATE inline bool QuicVersionUsesCryptoFrames(
QuicTransportVersion transport_version) {
- return transport_version >= QUIC_VERSION_47;
+ return transport_version == QUIC_VERSION_99;
}
} // namespace quic
