commit ecf9bd86d4931c515b57252707fb735dc248aaa0
author wub <wub@google.com> Wed Jun 05 04:57:02 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 05 21:18:46 2019 -0700
tree aed1c9f09db15a57e06fe09fa54bfb2fc7245f11
parent b9bdd05751401b849ac4e19d4e3cd0475b7dc589

gfe-relnote: Cleanup stateless reject related stuff from QuicCryptoServerConfig::ProcessClientHello and  QuicCryptoServerHandshaker::GenerateConnectionIdForReject. No behavior change, not protected.

PiperOrigin-RevId: 251620239
Change-Id: I0a3ca150a34ba687a5818d564175cbf077437ca3

quic/core/quic_crypto_server_handshaker.cc

diff --git a/quic/core/quic_crypto_server_handshaker.cc b/quic/core/quic_crypto_server_handshaker.cc
index f345a14..5ccc109 100644
--- a/quic/core/quic_crypto_server_handshaker.cc
+++ b/quic/core/quic_crypto_server_handshaker.cc
@@ -405,13 +405,10 @@
   previous_source_address_tokens_ = result->info.source_address_tokens;
 
   QuicConnection* connection = session()->connection();
-  const QuicConnectionId server_designated_connection_id =
-      GenerateConnectionIdForReject(/*use_stateless_rejects=*/false);
   crypto_config_->ProcessClientHello(
       result, /*reject_only=*/false, connection->connection_id(),
       connection->self_address(), GetClientAddress(), connection->version(),
-      session()->supported_versions(), /*use_stateless_rejects=*/false,
-      server_designated_connection_id, connection->clock(),
+      session()->supported_versions(), connection->clock(),
       connection->random_generator(), compressed_certs_cache_,
       crypto_negotiated_params_, signed_config_,
       QuicCryptoStream::CryptoMessageFramingOverhead(
@@ -439,15 +436,6 @@
   }
 }
 
-QuicConnectionId QuicCryptoServerHandshaker::GenerateConnectionIdForReject(
-    bool use_stateless_rejects) {
-  if (!use_stateless_rejects) {
-    return EmptyQuicConnectionId();
-  }
-  return helper_->GenerateConnectionIdForReject(
-      transport_version(), session()->connection()->connection_id());
-}
-
 const QuicSocketAddress QuicCryptoServerHandshaker::GetClientAddress() {
   return session()->connection()->peer_address();
 }