Deprecate quic_version_negotiation_grease
gfe-relnote: deprecate gfe2_reloadable_flag_quic_version_negotiation_grease
PiperOrigin-RevId: 282661022
Change-Id: Ia86aa24484f0dd2b7e83cc3d039be06c7b2465be
diff --git a/quic/core/quic_framer.cc b/quic/core/quic_framer.cc
index 27e738a..fdb2074 100644
--- a/quic/core/quic_framer.cc
+++ b/quic/core/quic_framer.cc
@@ -1255,33 +1255,26 @@
bool use_length_prefix,
const ParsedQuicVersionVector& versions) {
ParsedQuicVersionVector wire_versions = versions;
- if (!GetQuicReloadableFlag(quic_version_negotiation_grease)) {
- if (wire_versions.empty()) {
- wire_versions = {QuicVersionReservedForNegotiation()};
- }
+ // Add a version reserved for negotiation as suggested by the
+ // "Using Reserved Versions" section of draft-ietf-quic-transport.
+ if (wire_versions.empty()) {
+ // Ensure that version negotiation packets we send have at least two
+ // versions. This guarantees that, under all circumstances, all QUIC
+ // packets we send are at least 14 bytes long.
+ wire_versions = {QuicVersionReservedForNegotiation(),
+ QuicVersionReservedForNegotiation()};
} else {
- // Add a version reserved for negotiation as suggested by the
- // "Using Reserved Versions" section of draft-ietf-quic-transport.
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_version_negotiation_grease, 1, 2);
- if (wire_versions.empty()) {
- // Ensure that version negotiation packets we send have at least two
- // versions. This guarantees that, under all circumstances, all QUIC
- // packets we send are at least 14 bytes long.
- wire_versions = {QuicVersionReservedForNegotiation(),
- QuicVersionReservedForNegotiation()};
- } else {
- // This is not uniformely distributed but is acceptable since no security
- // depends on this randomness.
- size_t version_index = 0;
- const bool disable_randomness =
- GetQuicFlag(FLAGS_quic_disable_version_negotiation_grease_randomness);
- if (!disable_randomness) {
- version_index = QuicRandom::GetInstance()->RandUint64() %
- (wire_versions.size() + 1);
- }
- wire_versions.insert(wire_versions.begin() + version_index,
- QuicVersionReservedForNegotiation());
+ // This is not uniformely distributed but is acceptable since no security
+ // depends on this randomness.
+ size_t version_index = 0;
+ const bool disable_randomness =
+ GetQuicFlag(FLAGS_quic_disable_version_negotiation_grease_randomness);
+ if (!disable_randomness) {
+ version_index =
+ QuicRandom::GetInstance()->RandUint64() % (wire_versions.size() + 1);
}
+ wire_versions.insert(wire_versions.begin() + version_index,
+ QuicVersionReservedForNegotiation());
}
if (ietf_quic) {
return BuildIetfVersionNegotiationPacket(
diff --git a/quic/core/quic_framer_test.cc b/quic/core/quic_framer_test.cc
index 0f86dbe..2d158fb 100644
--- a/quic/core/quic_framer_test.cc
+++ b/quic/core/quic_framer_test.cc
@@ -6532,7 +6532,6 @@
}
TEST_P(QuicFramerTest, BuildVersionNegotiationPacket) {
- SetQuicReloadableFlag(quic_version_negotiation_grease, true);
SetQuicFlag(FLAGS_quic_disable_version_negotiation_grease_randomness, true);
// clang-format off
unsigned char packet[] = {
@@ -6599,7 +6598,6 @@
return;
}
- SetQuicReloadableFlag(quic_version_negotiation_grease, true);
SetQuicFlag(FLAGS_quic_disable_version_negotiation_grease_randomness, true);
// clang-format off
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 5b9e8f1..abeb64e 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -27,10 +27,6 @@
}
QuicVersionLabel CreateRandomVersionLabelForNegotiation() {
- if (!GetQuicReloadableFlag(quic_version_negotiation_grease)) {
- return MakeVersionLabel(0xda, 0x5a, 0x3a, 0x3a);
- }
- QUIC_RELOADABLE_FLAG_COUNT_N(quic_version_negotiation_grease, 2, 2);
QuicVersionLabel result;
if (!GetQuicFlag(FLAGS_quic_disable_version_negotiation_grease_randomness)) {
QuicRandom::GetInstance()->RandBytes(&result, sizeof(result));
