Deprecate --gfe2_reloadable_flag_quic_enable_alps_client.
PiperOrigin-RevId: 369319842
Change-Id: Ic8266ef92cab4c8765dbffa1149c2b50ecf53725
diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index 287f176..a0d810d 100644
--- a/quic/core/quic_flags_list.h
+++ b/quic/core/quic_flags_list.h
@@ -41,7 +41,6 @@
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_donot_reset_ideal_next_packet_send_time, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_donot_write_mid_packet_processing, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_drop_unsent_path_response, false)
-QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_alps_client, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_alps_server, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_server_on_wire_ping, true)
diff --git a/quic/core/tls_client_handshaker.cc b/quic/core/tls_client_handshaker.cc
index b157500..76902aa 100644
--- a/quic/core/tls_client_handshaker.cc
+++ b/quic/core/tls_client_handshaker.cc
@@ -179,18 +179,16 @@
}
// Enable ALPS only for versions that use HTTP/3 frames.
- if (enable_alps_) {
- for (const std::string& alpn_string : alpns) {
- ParsedQuicVersion version = ParseQuicVersionString(alpn_string);
- if (!version.IsKnown() || !version.UsesHttp3()) {
- continue;
- }
- if (SSL_add_application_settings(
- ssl(), reinterpret_cast<const uint8_t*>(alpn_string.data()),
- alpn_string.size(), nullptr, /* settings_len = */ 0) != 1) {
- QUIC_BUG(quic_bug_10576_7) << "Failed to enable ALPS.";
- return false;
- }
+ for (const std::string& alpn_string : alpns) {
+ ParsedQuicVersion version = ParseQuicVersionString(alpn_string);
+ if (!version.IsKnown() || !version.UsesHttp3()) {
+ continue;
+ }
+ if (SSL_add_application_settings(
+ ssl(), reinterpret_cast<const uint8_t*>(alpn_string.data()),
+ alpn_string.size(), nullptr, /* settings_len = */ 0) != 1) {
+ QUIC_BUG(quic_bug_10576_7) << "Failed to enable ALPS.";
+ return false;
}
}
@@ -505,20 +503,18 @@
<< "'";
// Parse ALPS extension.
- if (enable_alps_) {
- const uint8_t* alps_data;
- size_t alps_length;
- SSL_get0_peer_application_settings(ssl(), &alps_data, &alps_length);
- if (alps_length > 0) {
- auto error = session()->OnAlpsData(alps_data, alps_length);
- if (error) {
- // Calling CloseConnection() is safe even in case OnAlpsData() has
- // already closed the connection.
- CloseConnection(
- QUIC_HANDSHAKE_FAILED,
- absl::StrCat("Error processing ALPS data: ", error.value()));
- return;
- }
+ const uint8_t* alps_data;
+ size_t alps_length;
+ SSL_get0_peer_application_settings(ssl(), &alps_data, &alps_length);
+ if (alps_length > 0) {
+ auto error = session()->OnAlpsData(alps_data, alps_length);
+ if (error) {
+ // Calling CloseConnection() is safe even in case OnAlpsData() has
+ // already closed the connection.
+ CloseConnection(
+ QUIC_HANDSHAKE_FAILED,
+ absl::StrCat("Error processing ALPS data: ", error.value()));
+ return;
}
}
diff --git a/quic/core/tls_client_handshaker.h b/quic/core/tls_client_handshaker.h
index 42d587f..24f6b26 100644
--- a/quic/core/tls_client_handshaker.h
+++ b/quic/core/tls_client_handshaker.h
@@ -166,9 +166,6 @@
std::unique_ptr<TransportParameters> received_transport_params_ = nullptr;
std::unique_ptr<ApplicationState> received_application_state_ = nullptr;
-
- // Latched value of reloadable flag quic_enable_alps_client.
- const bool enable_alps_ = GetQuicReloadableFlag(quic_enable_alps_client);
};
} // namespace quic
