Replace quic_enable_version_t050 with quic_disable_version_t050 This CL deprecates quic_enable_version_t050_v2 and replaces it with quic_disable_version_t050 which has the opposite meaning. Deprecate gfe2_reloadable_flag_quic_enable_version_t050_v2, replace with gfe2_reloadable_flag_quic_disable_version_t050 PiperOrigin-RevId: 314223351 Change-Id: Ic6cc830ea75b51b6047e3e479114225b3a93a5c6
diff --git a/quic/core/quic_version_manager.cc b/quic/core/quic_version_manager.cc index d4cc329..4d33d48 100644 --- a/quic/core/quic_version_manager.cc +++ b/quic/core/quic_version_manager.cc
@@ -22,7 +22,7 @@ enable_version_draft_25_( GetQuicReloadableFlag(quic_enable_version_draft_25_v3)), disable_version_q050_(GetQuicReloadableFlag(quic_disable_version_q050)), - enable_version_t050_(GetQuicReloadableFlag(quic_enable_version_t050_v2)), + disable_version_t050_(GetQuicReloadableFlag(quic_disable_version_t050)), disable_version_q049_(GetQuicReloadableFlag(quic_disable_version_q049)), disable_version_q048_(GetQuicReloadableFlag(quic_disable_version_q048)), disable_version_q046_(GetQuicReloadableFlag(quic_disable_version_q046)), @@ -68,8 +68,8 @@ GetQuicReloadableFlag(quic_enable_version_draft_25_v3) || disable_version_q050_ != GetQuicReloadableFlag(quic_disable_version_q050) || - enable_version_t050_ != - GetQuicReloadableFlag(quic_enable_version_t050_v2) || + disable_version_t050_ != + GetQuicReloadableFlag(quic_disable_version_t050) || disable_version_q049_ != GetQuicReloadableFlag(quic_disable_version_q049) || disable_version_q048_ != @@ -85,7 +85,7 @@ enable_version_draft_25_ = GetQuicReloadableFlag(quic_enable_version_draft_25_v3); disable_version_q050_ = GetQuicReloadableFlag(quic_disable_version_q050); - enable_version_t050_ = GetQuicReloadableFlag(quic_enable_version_t050_v2); + disable_version_t050_ = GetQuicReloadableFlag(quic_disable_version_t050); disable_version_q049_ = GetQuicReloadableFlag(quic_disable_version_q049); disable_version_q048_ = GetQuicReloadableFlag(quic_disable_version_q048); disable_version_q046_ = GetQuicReloadableFlag(quic_disable_version_q046);
diff --git a/quic/core/quic_version_manager.h b/quic/core/quic_version_manager.h index 6a1afd2..dcfe6a8 100644 --- a/quic/core/quic_version_manager.h +++ b/quic/core/quic_version_manager.h
@@ -60,8 +60,8 @@ bool enable_version_draft_25_; // quic_disable_version_q050 flag bool disable_version_q050_; - // quic_enable_version_t050_v2 flag - bool enable_version_t050_; + // quic_disable_version_t050 flag + bool disable_version_t050_; // quic_disable_version_q049 flag bool disable_version_q049_; // quic_disable_version_q048 flag
diff --git a/quic/core/quic_version_manager_test.cc b/quic/core/quic_version_manager_test.cc index 7fbd2d1..81514a9 100644 --- a/quic/core/quic_version_manager_test.cc +++ b/quic/core/quic_version_manager_test.cc
@@ -23,7 +23,7 @@ SetQuicReloadableFlag(quic_enable_version_draft_28, false); SetQuicReloadableFlag(quic_enable_version_draft_27, false); SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false); - SetQuicReloadableFlag(quic_enable_version_t050_v2, false); + SetQuicReloadableFlag(quic_disable_version_t050, false); SetQuicReloadableFlag(quic_disable_version_q050, false); SetQuicReloadableFlag(quic_disable_version_q049, false); SetQuicReloadableFlag(quic_disable_version_q048, false); @@ -33,6 +33,8 @@ ParsedQuicVersionVector expected_parsed_versions; expected_parsed_versions.push_back( + ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50)); + expected_parsed_versions.push_back( ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50)); expected_parsed_versions.push_back( ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49)); @@ -44,36 +46,19 @@ ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43)); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); - EXPECT_EQ(expected_parsed_versions, - manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), manager.GetSupportedVersions()); EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), manager.GetSupportedVersionsWithQuicCrypto()); - EXPECT_THAT( - manager.GetSupportedAlpns(), - ElementsAre("h3-Q050", "h3-Q049", "h3-Q048", "h3-Q046", "h3-Q043")); - - SetQuicReloadableFlag(quic_enable_version_draft_28, true); - expected_parsed_versions.insert( - expected_parsed_versions.begin(), - ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28)); - EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); - EXPECT_EQ(expected_parsed_versions.size() - 1, - manager.GetSupportedVersionsWithQuicCrypto().size()); - EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), - manager.GetSupportedVersions()); - EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), - manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(), - ElementsAre("h3-28", "h3-Q050", "h3-Q049", "h3-Q048", "h3-Q046", + ElementsAre("h3-T050", "h3-Q050", "h3-Q049", "h3-Q048", "h3-Q046", "h3-Q043")); - SetQuicReloadableFlag(quic_enable_version_draft_27, true); + SetQuicReloadableFlag(quic_enable_version_draft_28, true); expected_parsed_versions.insert( - expected_parsed_versions.begin() + 1, - ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27)); + expected_parsed_versions.begin(), + ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28)); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); EXPECT_EQ(expected_parsed_versions.size() - 2, manager.GetSupportedVersionsWithQuicCrypto().size()); @@ -82,31 +67,31 @@ EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(), - ElementsAre("h3-28", "h3-27", "h3-Q050", "h3-Q049", "h3-Q048", + ElementsAre("h3-28", "h3-T050", "h3-Q050", "h3-Q049", "h3-Q048", "h3-Q046", "h3-Q043")); + SetQuicReloadableFlag(quic_enable_version_draft_27, true); + expected_parsed_versions.insert( + expected_parsed_versions.begin() + 1, + ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27)); + EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); + EXPECT_EQ(expected_parsed_versions.size() - 3, + manager.GetSupportedVersionsWithQuicCrypto().size()); + EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), + manager.GetSupportedVersions()); + EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), + manager.GetSupportedVersionsWithQuicCrypto()); + EXPECT_THAT(manager.GetSupportedAlpns(), + ElementsAre("h3-28", "h3-27", "h3-T050", "h3-Q050", "h3-Q049", + "h3-Q048", "h3-Q046", "h3-Q043")); + SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true); expected_parsed_versions.insert( expected_parsed_versions.begin() + 2, ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25)); EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); - EXPECT_EQ(expected_parsed_versions.size() - 3, - manager.GetSupportedVersionsWithQuicCrypto().size()); - EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), - manager.GetSupportedVersionsWithQuicCrypto()); - EXPECT_THAT(manager.GetSupportedAlpns(), - ElementsAre("h3-28", "h3-27", "h3-25", "h3-Q050", "h3-Q049", - "h3-Q048", "h3-Q046", "h3-Q043")); - - SetQuicReloadableFlag(quic_enable_version_t050_v2, true); - expected_parsed_versions.insert( - expected_parsed_versions.begin() + 3, - ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50)); - EXPECT_EQ(expected_parsed_versions, manager.GetSupportedVersions()); EXPECT_EQ(expected_parsed_versions.size() - 4, manager.GetSupportedVersionsWithQuicCrypto().size()); - EXPECT_EQ(FilterSupportedVersions(AllSupportedVersions()), - manager.GetSupportedVersions()); EXPECT_EQ(CurrentSupportedVersionsWithQuicCrypto(), manager.GetSupportedVersionsWithQuicCrypto()); EXPECT_THAT(manager.GetSupportedAlpns(),
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc index a952368..5db61bf 100644 --- a/quic/core/quic_versions.cc +++ b/quic/core/quic_versions.cc
@@ -424,7 +424,7 @@ filtered_versions.push_back(version); } } else { - if (GetQuicReloadableFlag(quic_enable_version_t050_v2)) { + if (!GetQuicReloadableFlag(quic_disable_version_t050)) { filtered_versions.push_back(version); } } @@ -678,7 +678,7 @@ if (parsed_version.handshake_protocol == PROTOCOL_QUIC_CRYPTO) { SetQuicReloadableFlag(quic_disable_version_q050, false); } else { - SetQuicReloadableFlag(quic_enable_version_t050_v2, true); + SetQuicReloadableFlag(quic_disable_version_t050, false); } } else if (parsed_version.transport_version == QUIC_VERSION_49) { SetQuicReloadableFlag(quic_disable_version_q049, false);
diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc index ad2d334..67c8f47 100644 --- a/quic/core/quic_versions_test.cc +++ b/quic/core/quic_versions_test.cc
@@ -453,7 +453,7 @@ SetQuicReloadableFlag(quic_enable_version_draft_28, true); SetQuicReloadableFlag(quic_enable_version_draft_27, true); SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true); - SetQuicReloadableFlag(quic_enable_version_t050_v2, true); + SetQuicReloadableFlag(quic_disable_version_t050, false); SetQuicReloadableFlag(quic_disable_version_q050, false); SetQuicReloadableFlag(quic_disable_version_q049, false); SetQuicReloadableFlag(quic_disable_version_q048, false); @@ -491,7 +491,7 @@ SetQuicReloadableFlag(quic_enable_version_draft_28, false); SetQuicReloadableFlag(quic_enable_version_draft_27, true); SetQuicReloadableFlag(quic_enable_version_draft_25_v3, true); - SetQuicReloadableFlag(quic_enable_version_t050_v2, true); + SetQuicReloadableFlag(quic_disable_version_t050, false); SetQuicReloadableFlag(quic_disable_version_q050, false); SetQuicReloadableFlag(quic_disable_version_q049, false); SetQuicReloadableFlag(quic_disable_version_q048, false); @@ -526,7 +526,7 @@ SetQuicReloadableFlag(quic_enable_version_draft_28, false); SetQuicReloadableFlag(quic_enable_version_draft_27, false); SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false); - SetQuicReloadableFlag(quic_enable_version_t050_v2, false); + SetQuicReloadableFlag(quic_disable_version_t050, false); SetQuicReloadableFlag(quic_disable_version_q050, false); SetQuicReloadableFlag(quic_disable_version_q049, false); SetQuicReloadableFlag(quic_disable_version_q048, false); @@ -535,6 +535,8 @@ ParsedQuicVersionVector expected_parsed_versions; expected_parsed_versions.push_back( + ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50)); + expected_parsed_versions.push_back( ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50)); expected_parsed_versions.push_back( ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49)); @@ -672,9 +674,9 @@ { QuicFlagSaver flag_saver; - SetQuicReloadableFlag(quic_enable_version_t050_v2, false); + SetQuicReloadableFlag(quic_disable_version_t050, true); QuicEnableVersion(parsed_version_t050); - EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_t050_v2)); + EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_t050)); } {
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc index 44e2d34..fec4cc7 100644 --- a/quic/test_tools/quic_test_utils.cc +++ b/quic/test_tools/quic_test_utils.cc
@@ -844,7 +844,7 @@ SetQuicReloadableFlag(quic_enable_version_draft_28, false); SetQuicReloadableFlag(quic_enable_version_draft_27, false); SetQuicReloadableFlag(quic_enable_version_draft_25_v3, false); - SetQuicReloadableFlag(quic_enable_version_t050_v2, false); + SetQuicReloadableFlag(quic_disable_version_t050, true); } QuicEncryptedPacket* ConstructEncryptedPacket(