Remove no longer necessary method QuicVersionInitializeSupportForIetfDraft()
This was initially needed, back in the day, to enable various flags
to make IETF QUIC work. But these days, IEFT QUIC works just fine
out of the box :)
PiperOrigin-RevId: 565675618
diff --git a/quiche/quic/core/http/end_to_end_test.cc b/quiche/quic/core/http/end_to_end_test.cc
index 8cfa2c6..48f3604 100644
--- a/quiche/quic/core/http/end_to_end_test.cc
+++ b/quiche/quic/core/http/end_to_end_test.cc
@@ -1373,17 +1373,6 @@
.length());
}
-TEST_P(EndToEndTest, SimpleRequestResponseWithIetfDraftSupport) {
- if (!version_.HasIetfQuicFrames()) {
- ASSERT_TRUE(Initialize());
- return;
- }
- QuicVersionInitializeSupportForIetfDraft();
- ASSERT_TRUE(Initialize());
-
- SendSynchronousFooRequestAndCheckResponse();
-}
-
TEST_P(EndToEndTest, SimpleRequestResponseWithLargeReject) {
chlo_multiplier_ = 1;
ASSERT_TRUE(Initialize());
diff --git a/quiche/quic/core/quic_versions.cc b/quiche/quic/core/quic_versions.cc
index a765a33..bb5c588 100644
--- a/quiche/quic/core/quic_versions.cc
+++ b/quiche/quic/core/quic_versions.cc
@@ -653,11 +653,6 @@
return "h3-" + ParsedQuicVersionToString(parsed_version);
}
-void QuicVersionInitializeSupportForIetfDraft() {
- // Enable necessary flags.
- SetQuicRestartFlag(quic_receive_ecn3, true);
-}
-
void QuicEnableVersion(const ParsedQuicVersion& version) {
SetVersionFlag(version, /*should_enable=*/true);
}
diff --git a/quiche/quic/core/quic_versions.h b/quiche/quic/core/quic_versions.h
index da66a17..3d7d151 100644
--- a/quiche/quic/core/quic_versions.h
+++ b/quiche/quic/core/quic_versions.h
@@ -614,10 +614,6 @@
// Returns the ALPN string to use in TLS for this version of QUIC.
QUICHE_EXPORT std::string AlpnForVersion(ParsedQuicVersion parsed_version);
-// Initializes support for the provided IETF draft version by setting the
-// correct flags.
-QUICHE_EXPORT void QuicVersionInitializeSupportForIetfDraft();
-
// Configures the flags required to enable support for this version of QUIC.
QUICHE_EXPORT void QuicEnableVersion(const ParsedQuicVersion& version);
diff --git a/quiche/quic/masque/masque_utils.cc b/quiche/quic/masque/masque_utils.cc
index 03d60e0..fc35005 100644
--- a/quiche/quic/masque/masque_utils.cc
+++ b/quiche/quic/masque/masque_utils.cc
@@ -16,7 +16,6 @@
namespace quic {
ParsedQuicVersionVector MasqueSupportedVersions() {
- QuicVersionInitializeSupportForIetfDraft();
ParsedQuicVersionVector versions;
for (const ParsedQuicVersion& version : AllSupportedVersions()) {
// Use all versions that support IETF QUIC except QUICv2.
diff --git a/quiche/quic/tools/quic_client_interop_test_bin.cc b/quiche/quic/tools/quic_client_interop_test_bin.cc
index 6fe1a51..990ae2b 100644
--- a/quiche/quic/tools/quic_client_interop_test_bin.cc
+++ b/quiche/quic/tools/quic_client_interop_test_bin.cc
@@ -425,7 +425,6 @@
}
// Pick QUIC version to use.
- quic::QuicVersionInitializeSupportForIetfDraft();
quic::ParsedQuicVersion version = quic::UnsupportedQuicVersion();
std::string quic_version_string =
quiche::GetQuicheCommandLineFlag(FLAGS_quic_version);
diff --git a/quiche/quic/tools/quic_toy_client.cc b/quiche/quic/tools/quic_toy_client.cc
index 87c34dc..791fdeb 100644
--- a/quiche/quic/tools/quic_toy_client.cc
+++ b/quiche/quic/tools/quic_toy_client.cc
@@ -119,10 +119,6 @@
"Client connection options as ASCII tags separated by commas, "
"e.g. \"ABCD,EFGH\"");
-DEFINE_QUICHE_COMMAND_LINE_FLAG(bool, quic_ietf_draft, false,
- "Use the IETF draft version. This also enables "
- "required internal QUIC flags.");
-
DEFINE_QUICHE_COMMAND_LINE_FLAG(
bool, version_mismatch_ok, false,
"If true, a version mismatch in the handshake is not considered a "
@@ -266,17 +262,6 @@
quic::ParsedQuicVersionVector versions = quic::CurrentSupportedVersions();
- if (quiche::GetQuicheCommandLineFlag(FLAGS_quic_ietf_draft)) {
- quic::QuicVersionInitializeSupportForIetfDraft();
- versions = {};
- for (const ParsedQuicVersion& version : AllSupportedVersions()) {
- if (version.HasIetfQuicFrames() &&
- version.handshake_protocol == quic::PROTOCOL_TLS1_3) {
- versions.push_back(version);
- }
- }
- }
-
std::string quic_version_string =
quiche::GetQuicheCommandLineFlag(FLAGS_quic_version);
if (!quic_version_string.empty()) {
diff --git a/quiche/quic/tools/quic_toy_server.cc b/quiche/quic/tools/quic_toy_server.cc
index 3f23af6..da4e4e9 100644
--- a/quiche/quic/tools/quic_toy_server.cc
+++ b/quiche/quic/tools/quic_toy_server.cc
@@ -36,10 +36,6 @@
"If true, then URLs which have a numeric path will send a dynamically "
"generated response of that many bytes.");
-DEFINE_QUICHE_COMMAND_LINE_FLAG(bool, quic_ietf_draft, false,
- "Only enable IETF draft versions. This also "
- "enables required internal QUIC flags.");
-
DEFINE_QUICHE_COMMAND_LINE_FLAG(
std::string, quic_versions, "",
"QUIC versions to enable, e.g. \"h3-25,h3-27\". If not set, then all "
@@ -132,19 +128,7 @@
: backend_factory_(backend_factory), server_factory_(server_factory) {}
int QuicToyServer::Start() {
- ParsedQuicVersionVector supported_versions;
- if (quiche::GetQuicheCommandLineFlag(FLAGS_quic_ietf_draft)) {
- QuicVersionInitializeSupportForIetfDraft();
- for (const ParsedQuicVersion& version : AllSupportedVersions()) {
- // Add all versions that supports IETF QUIC.
- if (version.HasIetfQuicFrames() &&
- version.handshake_protocol == quic::PROTOCOL_TLS1_3) {
- supported_versions.push_back(version);
- }
- }
- } else {
- supported_versions = AllSupportedVersions();
- }
+ ParsedQuicVersionVector supported_versions = AllSupportedVersions();
std::string versions_string =
quiche::GetQuicheCommandLineFlag(FLAGS_quic_versions);
if (!versions_string.empty()) {
