Remove an unused asynchronous jump
QuicCryptoServerConfig::EvaluateClientHello has a bunch of infrastructure to allow it to asynchronously call GetProof and then continue afterwards. Problem is, it doesn't call GetProof, nor does it do any asynchronous work. This CL rips out all of the async jump infrastructure and merges the "before GetProof" and "after GetProof" methods.
Also update comments and remove unused arguments.
gfe-relnote: No-op refactoring. No functional change intended, not flag-protected.
PiperOrigin-RevId: 238640596
Change-Id: I769b55aa41ac4bd67e6726be1271b5a8fd5d0a03
diff --git a/quic/core/crypto/quic_crypto_server_config.h b/quic/core/crypto/quic_crypto_server_config.h
index fc05fb3..0d7037f 100644
--- a/quic/core/crypto/quic_crypto_server_config.h
+++ b/quic/core/crypto/quic_crypto_server_config.h
@@ -524,36 +524,14 @@
void SelectNewPrimaryConfig(QuicWallTime now) const
EXCLUSIVE_LOCKS_REQUIRED(configs_lock_);
- // EvaluateClientHello checks |client_hello| for gross errors and determines
- // whether it can be shown to be fresh (i.e. not a replay). The results are
- // written to |info|.
+ // EvaluateClientHello checks |client_hello_state->client_hello| for gross
+ // errors and determines whether it is fresh (i.e. not a replay). The results
+ // are written to |client_hello_state->info|.
void EvaluateClientHello(
const QuicSocketAddress& server_address,
QuicTransportVersion version,
QuicReferenceCountedPointer<Config> requested_config,
QuicReferenceCountedPointer<Config> primary_config,
- QuicReferenceCountedPointer<QuicSignedServerConfig> crypto_proof,
- QuicReferenceCountedPointer<ValidateClientHelloResultCallback::Result>
- client_hello_state,
- std::unique_ptr<ValidateClientHelloResultCallback> done_cb) const;
-
- // Callback class for bridging between EvaluateClientHello and
- // EvaluateClientHelloAfterGetProof.
- class EvaluateClientHelloCallback;
- friend class EvaluateClientHelloCallback;
-
- // Continuation of EvaluateClientHello after the call to
- // ProofSource::GetProof. |get_proof_failed| indicates whether GetProof
- // failed. If GetProof was not run, then |get_proof_failed| will be
- // set to false.
- void EvaluateClientHelloAfterGetProof(
- const QuicIpAddress& server_ip,
- QuicTransportVersion version,
- QuicReferenceCountedPointer<Config> requested_config,
- QuicReferenceCountedPointer<Config> primary_config,
- QuicReferenceCountedPointer<QuicSignedServerConfig> crypto_proof,
- std::unique_ptr<ProofSource::Details> proof_source_details,
- bool get_proof_failed,
QuicReferenceCountedPointer<ValidateClientHelloResultCallback::Result>
client_hello_state,
std::unique_ptr<ValidateClientHelloResultCallback> done_cb) const;
