Introduce QuicDisableVersion and QuicVersionIsEnabled
These functions are mainly meant for tests, but are accessible from prod code because there are legitimate uses for disabling versions in production. The main goal here is to simplify adding and removing new versions by reducing the amount of code that sets these flags directly. This CL does not change any existing behavior.
No behavior change
PiperOrigin-RevId: 316944337
Change-Id: Ieebd6ae4cc493b49269540c5d0fd7acbe655e5fa
diff --git a/quic/core/quic_dispatcher_test.cc b/quic/core/quic_dispatcher_test.cc
index c478abf..12008c4 100644
--- a/quic/core/quic_dispatcher_test.cc
+++ b/quic/core/quic_dispatcher_test.cc
@@ -1014,17 +1014,11 @@
VerifyVersionNotSupported(QuicVersionReservedForNegotiation());
for (ParsedQuicVersion version : CurrentSupportedVersions()) {
VerifyVersionSupported(version);
+ QuicDisableVersion(version);
+ VerifyVersionNotSupported(version);
+ QuicEnableVersion(version);
+ VerifyVersionSupported(version);
}
-
- // Turn off version Q050.
- SetQuicReloadableFlag(quic_disable_version_q050, true);
- VerifyVersionNotSupported(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50));
-
- // Turn on version Q050.
- SetQuicReloadableFlag(quic_disable_version_q050, false);
- VerifyVersionSupported(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50));
}
TEST_P(QuicDispatcherTestOneVersion,
@@ -2260,8 +2254,7 @@
// Regression test for b/117874922.
TEST_P(BufferedPacketStoreTest, ProcessBufferedChloWithDifferentVersion) {
// Ensure the preferred version is not supported by the server.
- SetQuicReloadableFlag(quic_enable_version_draft_29, false);
- ASSERT_EQ(AllSupportedVersions()[0], ParsedQuicVersion::Draft29());
+ QuicDisableVersion(AllSupportedVersions().front());
uint64_t last_connection_id = kMaxNumSessionsToCreate + 5;
ParsedQuicVersionVector supported_versions = CurrentSupportedVersions();
diff --git a/quic/core/quic_versions.cc b/quic/core/quic_versions.cc
index 55316a3..1a1ddc7 100644
--- a/quic/core/quic_versions.cc
+++ b/quic/core/quic_versions.cc
@@ -39,6 +39,37 @@
return result;
}
+void SetVersionFlag(const ParsedQuicVersion& version, bool should_enable) {
+ static_assert(SupportedVersions().size() == 10u,
+ "Supported versions out of sync");
+ const bool enable = should_enable;
+ const bool disable = !should_enable;
+ if (version == ParsedQuicVersion::Draft29()) {
+ SetQuicReloadableFlag(quic_enable_version_draft_29, enable);
+ } else if (version == ParsedQuicVersion::Draft28()) {
+ SetQuicReloadableFlag(quic_enable_version_draft_28, enable);
+ } else if (version == ParsedQuicVersion::Draft27()) {
+ SetQuicReloadableFlag(quic_disable_version_draft_27, disable);
+ } else if (version == ParsedQuicVersion::Draft25()) {
+ SetQuicReloadableFlag(quic_disable_version_draft_25, disable);
+ } else if (version == ParsedQuicVersion::T050()) {
+ SetQuicReloadableFlag(quic_disable_version_t050, disable);
+ } else if (version == ParsedQuicVersion::Q050()) {
+ SetQuicReloadableFlag(quic_disable_version_q050, disable);
+ } else if (version == ParsedQuicVersion::Q049()) {
+ SetQuicReloadableFlag(quic_disable_version_q049, disable);
+ } else if (version == ParsedQuicVersion::Q048()) {
+ SetQuicReloadableFlag(quic_disable_version_q048, disable);
+ } else if (version == ParsedQuicVersion::Q046()) {
+ SetQuicReloadableFlag(quic_disable_version_q046, disable);
+ } else if (version == ParsedQuicVersion::Q043()) {
+ SetQuicReloadableFlag(quic_disable_version_q043, disable);
+ } else {
+ QUIC_BUG << "Cannot " << (should_enable ? "en" : "dis") << "able version "
+ << version;
+ }
+}
+
} // namespace
bool ParsedQuicVersion::IsKnown() const {
@@ -678,36 +709,17 @@
SetQuicReloadableFlag(quic_enable_zero_rtt_for_tls, true);
}
-void QuicEnableVersion(ParsedQuicVersion parsed_version) {
- static_assert(SupportedVersions().size() == 10u,
- "Supported versions out of sync");
- if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_29) {
- QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
- SetQuicReloadableFlag(quic_enable_version_draft_29, true);
- } else if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_28) {
- QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
- SetQuicReloadableFlag(quic_enable_version_draft_28, true);
- } else if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_27) {
- QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
- SetQuicReloadableFlag(quic_disable_version_draft_27, false);
- } else if (parsed_version.transport_version == QUIC_VERSION_IETF_DRAFT_25) {
- QUIC_BUG_IF(parsed_version.handshake_protocol != PROTOCOL_TLS1_3);
- SetQuicReloadableFlag(quic_disable_version_draft_25, false);
- } else if (parsed_version.transport_version == QUIC_VERSION_50) {
- if (parsed_version.handshake_protocol == PROTOCOL_QUIC_CRYPTO) {
- SetQuicReloadableFlag(quic_disable_version_q050, false);
- } else {
- SetQuicReloadableFlag(quic_disable_version_t050, false);
- }
- } else if (parsed_version.transport_version == QUIC_VERSION_49) {
- SetQuicReloadableFlag(quic_disable_version_q049, false);
- } else if (parsed_version.transport_version == QUIC_VERSION_48) {
- SetQuicReloadableFlag(quic_disable_version_q048, false);
- } else if (parsed_version.transport_version == QUIC_VERSION_46) {
- SetQuicReloadableFlag(quic_disable_version_q046, false);
- } else if (parsed_version.transport_version == QUIC_VERSION_43) {
- SetQuicReloadableFlag(quic_disable_version_q043, false);
- }
+void QuicEnableVersion(const ParsedQuicVersion& version) {
+ SetVersionFlag(version, /*should_enable=*/true);
+}
+
+void QuicDisableVersion(const ParsedQuicVersion& version) {
+ SetVersionFlag(version, /*should_enable=*/false);
+}
+
+bool QuicVersionIsEnabled(const ParsedQuicVersion& version) {
+ ParsedQuicVersionVector current = CurrentSupportedVersions();
+ return std::find(current.begin(), current.end(), version) != current.end();
}
#undef RETURN_STRING_LITERAL // undef for jumbo builds
diff --git a/quic/core/quic_versions.h b/quic/core/quic_versions.h
index 227e20a..d42c13f 100644
--- a/quic/core/quic_versions.h
+++ b/quic/core/quic_versions.h
@@ -665,8 +665,14 @@
// correct flags.
QUIC_EXPORT_PRIVATE void QuicVersionInitializeSupportForIetfDraft();
-// Enables the flags required to support this version of QUIC.
-QUIC_EXPORT_PRIVATE void QuicEnableVersion(ParsedQuicVersion parsed_version);
+// Configures the flags required to enable support for this version of QUIC.
+QUIC_EXPORT_PRIVATE void QuicEnableVersion(const ParsedQuicVersion& version);
+
+// Configures the flags required to disable support for this version of QUIC.
+QUIC_EXPORT_PRIVATE void QuicDisableVersion(const ParsedQuicVersion& version);
+
+// Returns whether support for this version of QUIC is currently enabled.
+QUIC_EXPORT_PRIVATE bool QuicVersionIsEnabled(const ParsedQuicVersion& version);
} // namespace quic
diff --git a/quic/core/quic_versions_test.cc b/quic/core/quic_versions_test.cc
index 9b2c555..14c5793 100644
--- a/quic/core/quic_versions_test.cc
+++ b/quic/core/quic_versions_test.cc
@@ -206,35 +206,28 @@
}
TEST_F(QuicVersionsTest, ParseQuicVersionLabel) {
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43),
+ EXPECT_EQ(ParsedQuicVersion::Q043(),
ParseQuicVersionLabel(MakeVersionLabel('Q', '0', '4', '3')));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46),
+ EXPECT_EQ(ParsedQuicVersion::Q046(),
ParseQuicVersionLabel(MakeVersionLabel('Q', '0', '4', '6')));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48),
+ EXPECT_EQ(ParsedQuicVersion::Q048(),
ParseQuicVersionLabel(MakeVersionLabel('Q', '0', '4', '8')));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50),
+ EXPECT_EQ(ParsedQuicVersion::Q050(),
ParseQuicVersionLabel(MakeVersionLabel('Q', '0', '5', '0')));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50),
+ EXPECT_EQ(ParsedQuicVersion::T050(),
ParseQuicVersionLabel(MakeVersionLabel('T', '0', '5', '0')));
}
TEST_F(QuicVersionsTest, ParseQuicVersionString) {
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43),
- ParseQuicVersionString("Q043"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46),
+ EXPECT_EQ(ParsedQuicVersion::Q043(), ParseQuicVersionString("Q043"));
+ EXPECT_EQ(ParsedQuicVersion::Q046(),
ParseQuicVersionString("QUIC_VERSION_46"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46),
- ParseQuicVersionString("46"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46),
- ParseQuicVersionString("Q046"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48),
- ParseQuicVersionString("Q048"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50),
- ParseQuicVersionString("Q050"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50),
- ParseQuicVersionString("50"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50),
- ParseQuicVersionString("h3-Q050"));
+ EXPECT_EQ(ParsedQuicVersion::Q046(), ParseQuicVersionString("46"));
+ EXPECT_EQ(ParsedQuicVersion::Q046(), ParseQuicVersionString("Q046"));
+ EXPECT_EQ(ParsedQuicVersion::Q048(), ParseQuicVersionString("Q048"));
+ EXPECT_EQ(ParsedQuicVersion::Q050(), ParseQuicVersionString("Q050"));
+ EXPECT_EQ(ParsedQuicVersion::Q050(), ParseQuicVersionString("50"));
+ EXPECT_EQ(ParsedQuicVersion::Q050(), ParseQuicVersionString("h3-Q050"));
EXPECT_EQ(UnsupportedQuicVersion(), ParseQuicVersionString(""));
EXPECT_EQ(UnsupportedQuicVersion(), ParseQuicVersionString("Q 46"));
@@ -242,24 +235,16 @@
EXPECT_EQ(UnsupportedQuicVersion(), ParseQuicVersionString("99"));
EXPECT_EQ(UnsupportedQuicVersion(), ParseQuicVersionString("70"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50),
- ParseQuicVersionString("T050"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50),
- ParseQuicVersionString("h3-T050"));
+ EXPECT_EQ(ParsedQuicVersion::T050(), ParseQuicVersionString("T050"));
+ EXPECT_EQ(ParsedQuicVersion::T050(), ParseQuicVersionString("h3-T050"));
EXPECT_EQ(ParsedQuicVersion::Draft29(), ParseQuicVersionString("ff00001d"));
EXPECT_EQ(ParsedQuicVersion::Draft29(), ParseQuicVersionString("h3-29"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28),
- ParseQuicVersionString("ff00001c"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28),
- ParseQuicVersionString("h3-28"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27),
- ParseQuicVersionString("ff00001b"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27),
- ParseQuicVersionString("h3-27"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25),
- ParseQuicVersionString("ff000019"));
- EXPECT_EQ(ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25),
- ParseQuicVersionString("h3-25"));
+ EXPECT_EQ(ParsedQuicVersion::Draft28(), ParseQuicVersionString("ff00001c"));
+ EXPECT_EQ(ParsedQuicVersion::Draft28(), ParseQuicVersionString("h3-28"));
+ EXPECT_EQ(ParsedQuicVersion::Draft27(), ParseQuicVersionString("ff00001b"));
+ EXPECT_EQ(ParsedQuicVersion::Draft27(), ParseQuicVersionString("h3-27"));
+ EXPECT_EQ(ParsedQuicVersion::Draft25(), ParseQuicVersionString("ff000019"));
+ EXPECT_EQ(ParsedQuicVersion::Draft25(), ParseQuicVersionString("h3-25"));
}
TEST_F(QuicVersionsTest, ParseQuicVersionVectorString) {
@@ -343,22 +328,17 @@
TEST_F(QuicVersionsTest, CreateQuicVersionLabel) {
EXPECT_EQ(MakeVersionLabel('Q', '0', '4', '3'),
- CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43)));
+ CreateQuicVersionLabel(ParsedQuicVersion::Q043()));
EXPECT_EQ(MakeVersionLabel('Q', '0', '4', '6'),
- CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46)));
+ CreateQuicVersionLabel(ParsedQuicVersion::Q046()));
EXPECT_EQ(MakeVersionLabel('Q', '0', '4', '8'),
- CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48)));
+ CreateQuicVersionLabel(ParsedQuicVersion::Q048()));
EXPECT_EQ(MakeVersionLabel('Q', '0', '5', '0'),
- CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50)));
+ CreateQuicVersionLabel(ParsedQuicVersion::Q050()));
// Test a TLS version:
EXPECT_EQ(MakeVersionLabel('T', '0', '5', '0'),
- CreateQuicVersionLabel(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50)));
+ CreateQuicVersionLabel(ParsedQuicVersion::T050()));
// Make sure the negotiation reserved version is in the IETF reserved space.
EXPECT_EQ(MakeVersionLabel(0xda, 0x5a, 0x3a, 0x3a) & 0x0f0f0f0f,
@@ -453,111 +433,29 @@
}
TEST_F(QuicVersionsTest, FilterSupportedVersionsAllVersions) {
- static_assert(SupportedVersions().size() == 10u,
- "Supported versions out of sync");
- SetQuicReloadableFlag(quic_enable_version_draft_29, true);
- SetQuicReloadableFlag(quic_enable_version_draft_28, true);
- SetQuicReloadableFlag(quic_disable_version_draft_27, false);
- SetQuicReloadableFlag(quic_disable_version_draft_25, 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);
- SetQuicReloadableFlag(quic_disable_version_q046, false);
- SetQuicReloadableFlag(quic_disable_version_q043, false);
-
+ for (const ParsedQuicVersion& version : AllSupportedVersions()) {
+ QuicEnableVersion(version);
+ }
ParsedQuicVersionVector expected_parsed_versions;
- expected_parsed_versions.push_back(ParsedQuicVersion::Draft29());
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25));
- 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));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43));
-
- ASSERT_EQ(expected_parsed_versions,
+ for (const ParsedQuicVersion& version : SupportedVersions()) {
+ expected_parsed_versions.push_back(version);
+ }
+ EXPECT_EQ(expected_parsed_versions,
FilterSupportedVersions(AllSupportedVersions()));
- ASSERT_EQ(expected_parsed_versions, AllSupportedVersions());
+ EXPECT_EQ(expected_parsed_versions, AllSupportedVersions());
}
TEST_F(QuicVersionsTest, FilterSupportedVersionsWithoutFirstVersion) {
- static_assert(SupportedVersions().size() == 10u,
- "Supported versions out of sync");
- SetQuicReloadableFlag(quic_enable_version_draft_29, false);
- SetQuicReloadableFlag(quic_enable_version_draft_28, true);
- SetQuicReloadableFlag(quic_disable_version_draft_27, false);
- SetQuicReloadableFlag(quic_disable_version_draft_25, 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);
- SetQuicReloadableFlag(quic_disable_version_q046, false);
- SetQuicReloadableFlag(quic_disable_version_q043, false);
-
+ for (const ParsedQuicVersion& version : AllSupportedVersions()) {
+ QuicEnableVersion(version);
+ }
+ QuicDisableVersion(AllSupportedVersions().front());
ParsedQuicVersionVector expected_parsed_versions;
- expected_parsed_versions.push_back(ParsedQuicVersion::Draft28());
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25));
- 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));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43));
-
- ASSERT_EQ(expected_parsed_versions,
- FilterSupportedVersions(AllSupportedVersions()));
-}
-
-TEST_F(QuicVersionsTest, FilterSupportedVersionsNoEnabledFlags) {
- static_assert(SupportedVersions().size() == 10u,
- "Supported versions out of sync");
- SetQuicReloadableFlag(quic_enable_version_draft_29, false);
- SetQuicReloadableFlag(quic_enable_version_draft_28, false);
- SetQuicReloadableFlag(quic_disable_version_draft_27, true);
- SetQuicReloadableFlag(quic_disable_version_draft_25, 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);
- SetQuicReloadableFlag(quic_disable_version_q046, false);
- SetQuicReloadableFlag(quic_disable_version_q043, false);
-
- 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));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_46));
- expected_parsed_versions.push_back(
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_43));
-
- ASSERT_EQ(expected_parsed_versions,
+ for (const ParsedQuicVersion& version : SupportedVersions()) {
+ expected_parsed_versions.push_back(version);
+ }
+ expected_parsed_versions.erase(expected_parsed_versions.begin());
+ EXPECT_EQ(expected_parsed_versions,
FilterSupportedVersions(AllSupportedVersions()));
}
@@ -617,20 +515,13 @@
TEST_F(QuicVersionsTest, AlpnForVersion) {
static_assert(SupportedVersions().size() == 10u,
"Supported versions out of sync");
- ParsedQuicVersion parsed_version_q048 =
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_48);
- ParsedQuicVersion parsed_version_q049 =
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_49);
- ParsedQuicVersion parsed_version_q050 =
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50);
- ParsedQuicVersion parsed_version_t050 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50);
- ParsedQuicVersion parsed_version_draft_25 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25);
- ParsedQuicVersion parsed_version_draft_27 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27);
- ParsedQuicVersion parsed_version_draft_28 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28);
+ ParsedQuicVersion parsed_version_q048 = ParsedQuicVersion::Q048();
+ ParsedQuicVersion parsed_version_q049 = ParsedQuicVersion::Q049();
+ ParsedQuicVersion parsed_version_q050 = ParsedQuicVersion::Q050();
+ ParsedQuicVersion parsed_version_t050 = ParsedQuicVersion::T050();
+ ParsedQuicVersion parsed_version_draft_25 = ParsedQuicVersion::Draft25();
+ ParsedQuicVersion parsed_version_draft_27 = ParsedQuicVersion::Draft27();
+ ParsedQuicVersion parsed_version_draft_28 = ParsedQuicVersion::Draft28();
EXPECT_EQ("h3-Q048", AlpnForVersion(parsed_version_q048));
EXPECT_EQ("h3-Q049", AlpnForVersion(parsed_version_q049));
@@ -642,68 +533,13 @@
EXPECT_EQ("h3-29", AlpnForVersion(ParsedQuicVersion::Draft29()));
}
-TEST_F(QuicVersionsTest, QuicEnableVersion) {
- static_assert(SupportedVersions().size() == 10u,
- "Supported versions out of sync");
- ParsedQuicVersion parsed_version_draft_28 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_28);
- ParsedQuicVersion parsed_version_draft_27 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_27);
- ParsedQuicVersion parsed_version_draft_25 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_IETF_DRAFT_25);
- ParsedQuicVersion parsed_version_q050 =
- ParsedQuicVersion(PROTOCOL_QUIC_CRYPTO, QUIC_VERSION_50);
- ParsedQuicVersion parsed_version_t050 =
- ParsedQuicVersion(PROTOCOL_TLS1_3, QUIC_VERSION_50);
-
- {
+TEST_F(QuicVersionsTest, QuicVersionEnabling) {
+ for (const ParsedQuicVersion& version : AllSupportedVersions()) {
QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_enable_version_draft_29, false);
- QuicEnableVersion(ParsedQuicVersion::Draft29());
- EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_draft_29));
- }
-
- {
- QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_enable_version_draft_28, false);
- QuicEnableVersion(parsed_version_draft_28);
- EXPECT_TRUE(GetQuicReloadableFlag(quic_enable_version_draft_28));
- }
-
- {
- QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_disable_version_draft_27, true);
- QuicEnableVersion(parsed_version_draft_27);
- EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_draft_27));
- }
-
- {
- QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_disable_version_draft_25, true);
- QuicEnableVersion(parsed_version_draft_25);
- EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_draft_25));
- }
-
- {
- QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_disable_version_q050, true);
- QuicEnableVersion(parsed_version_q050);
- EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_q050));
- }
-
- {
- QuicFlagSaver flag_saver;
- SetQuicReloadableFlag(quic_disable_version_t050, true);
- QuicEnableVersion(parsed_version_t050);
- EXPECT_FALSE(GetQuicReloadableFlag(quic_disable_version_t050));
- }
-
- {
- QuicFlagSaver flag_saver;
- for (const ParsedQuicVersion& version : SupportedVersions()) {
- QuicEnableVersion(version);
- }
- ASSERT_EQ(AllSupportedVersions(), CurrentSupportedVersions());
+ QuicDisableVersion(version);
+ EXPECT_FALSE(QuicVersionIsEnabled(version));
+ QuicEnableVersion(version);
+ EXPECT_TRUE(QuicVersionIsEnabled(version));
}
}
diff --git a/quic/test_tools/quic_test_utils.cc b/quic/test_tools/quic_test_utils.cc
index 8076aec..61d4ec6 100644
--- a/quic/test_tools/quic_test_utils.cc
+++ b/quic/test_tools/quic_test_utils.cc
@@ -842,11 +842,9 @@
}
void DisableQuicVersionsWithTls() {
- SetQuicReloadableFlag(quic_enable_version_draft_29, false);
- SetQuicReloadableFlag(quic_enable_version_draft_28, false);
- SetQuicReloadableFlag(quic_disable_version_draft_27, true);
- SetQuicReloadableFlag(quic_disable_version_draft_25, true);
- SetQuicReloadableFlag(quic_disable_version_t050, true);
+ for (const ParsedQuicVersion& version : AllSupportedVersionsWithTls()) {
+ QuicDisableVersion(version);
+ }
}
QuicEncryptedPacket* ConstructEncryptedPacket(
