commit 0de9093ec176f8068fd2fdd66fcef9820fc6e306
author bnc <bnc@google.com> Tue Apr 20 07:35:03 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Apr 20 07:35:38 2021 -0700
tree 3e4a929dac9c7ed2f1f7262d3b82489a8bc314eb
parent 126f68e0346fd2da32e8545a64b3752340442f55

Deprecate --gfe2_reloadable_flag_quic_enable_alps_server.

PiperOrigin-RevId: 369436101
Change-Id: I31c8092fe02121187da4b02e0a78a50163c1e91a

quic/core/quic_flags_list.h

diff --git a/quic/core/quic_flags_list.h b/quic/core/quic_flags_list.h
index a0d810d..0834db6 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_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)
 QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_token_based_address_validation, true)

quic/core/tls_server_handshaker.cc

diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index 3336b7b..5906c44 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -935,35 +935,31 @@
   }
 
   // Enable ALPS for the selected ALPN protocol.
-  if (GetQuicReloadableFlag(quic_enable_alps_server)) {
-    QUIC_RELOADABLE_FLAG_COUNT(quic_enable_alps_server);
+  const uint8_t* alps_data = nullptr;
+  size_t alps_length = 0;
+  std::unique_ptr<char[]> buffer;
 
-    const uint8_t* alps_data = nullptr;
-    size_t alps_length = 0;
-    std::unique_ptr<char[]> buffer;
+  const std::string& hostname = crypto_negotiated_params_->sni;
+  std::string accept_ch_value = GetAcceptChValueForOrigin(hostname);
 
-    const std::string& hostname = crypto_negotiated_params_->sni;
-    std::string accept_ch_value = GetAcceptChValueForOrigin(hostname);
+  std::string origin;
+  if (GetQuicReloadableFlag(quic_alps_include_scheme_in_origin)) {
+    QUIC_RELOADABLE_FLAG_COUNT(quic_alps_include_scheme_in_origin);
+    origin = "https://";
+  }
+  origin.append(crypto_negotiated_params_->sni);
 
-    std::string origin;
-    if (GetQuicReloadableFlag(quic_alps_include_scheme_in_origin)) {
-      QUIC_RELOADABLE_FLAG_COUNT(quic_alps_include_scheme_in_origin);
-      origin = "https://";
-    }
-    origin.append(crypto_negotiated_params_->sni);
+  if (!accept_ch_value.empty()) {
+    AcceptChFrame frame{{{std::move(origin), std::move(accept_ch_value)}}};
+    alps_length = HttpEncoder::SerializeAcceptChFrame(frame, &buffer);
+    alps_data = reinterpret_cast<const uint8_t*>(buffer.get());
+  }
 
-    if (!accept_ch_value.empty()) {
-      AcceptChFrame frame{{{std::move(origin), std::move(accept_ch_value)}}};
-      alps_length = HttpEncoder::SerializeAcceptChFrame(frame, &buffer);
-      alps_data = reinterpret_cast<const uint8_t*>(buffer.get());
-    }
-
-    if (SSL_add_application_settings(
-            ssl(), reinterpret_cast<const uint8_t*>(selected_alpn->data()),
-            selected_alpn->size(), alps_data, alps_length) != 1) {
-      QUIC_DLOG(ERROR) << "Failed to enable ALPS";
-      return SSL_TLSEXT_ERR_NOACK;
-    }
+  if (SSL_add_application_settings(
+          ssl(), reinterpret_cast<const uint8_t*>(selected_alpn->data()),
+          selected_alpn->size(), alps_data, alps_length) != 1) {
+    QUIC_DLOG(ERROR) << "Failed to enable ALPS";
+    return SSL_TLSEXT_ERR_NOACK;
   }
 
   session()->OnAlpnSelected(*selected_alpn);