Index: net/quic/core/quic_crypto_server_stream.cc |
diff --git a/net/quic/core/quic_crypto_server_stream.cc b/net/quic/core/quic_crypto_server_stream.cc |
index 49894819aa420964a646eefe214d591859864c49..613692a765026dc09823c6674d4e3a982b0d42f6 100644 |
--- a/net/quic/core/quic_crypto_server_stream.cc |
+++ b/net/quic/core/quic_crypto_server_stream.cc |
@@ -284,55 +284,27 @@ void QuicCryptoServerStream::SendServerConfigUpdate( |
return; |
} |
- if (FLAGS_quic_reloadable_flag_enable_async_get_proof) { |
- if (send_server_config_update_cb_ != nullptr) { |
- QUIC_DVLOG(1) |
- << "Skipped server config update since one is already in progress"; |
- return; |
- } |
- |
- std::unique_ptr<SendServerConfigUpdateCallback> cb( |
- new SendServerConfigUpdateCallback(this)); |
- send_server_config_update_cb_ = cb.get(); |
- |
- crypto_config_->BuildServerConfigUpdateMessage( |
- session()->connection()->version(), chlo_hash_, |
- previous_source_address_tokens_, |
- session()->connection()->self_address(), |
- session()->connection()->peer_address().host(), |
- session()->connection()->clock(), |
- session()->connection()->random_generator(), compressed_certs_cache_, |
- *crypto_negotiated_params_, cached_network_params, |
- (session()->config()->HasReceivedConnectionOptions() |
- ? session()->config()->ReceivedConnectionOptions() |
- : QuicTagVector()), |
- std::move(cb)); |
- return; |
- } |
- |
- CryptoHandshakeMessage server_config_update_message; |
- if (!crypto_config_->BuildServerConfigUpdateMessage( |
- session()->connection()->version(), chlo_hash_, |
- previous_source_address_tokens_, |
- session()->connection()->self_address(), |
- session()->connection()->peer_address().host(), |
- session()->connection()->clock(), |
- session()->connection()->random_generator(), compressed_certs_cache_, |
- *crypto_negotiated_params_, cached_network_params, |
- (session()->config()->HasReceivedConnectionOptions() |
- ? session()->config()->ReceivedConnectionOptions() |
- : QuicTagVector()), |
- &server_config_update_message)) { |
- QUIC_DVLOG(1) << "Server: Failed to build server config update (SCUP)!"; |
+ if (send_server_config_update_cb_ != nullptr) { |
+ QUIC_DVLOG(1) |
+ << "Skipped server config update since one is already in progress"; |
return; |
} |
- QUIC_DVLOG(1) << "Server: Sending server config update: " |
- << server_config_update_message.DebugString(); |
- const QuicData& data = server_config_update_message.GetSerialized(); |
- WriteOrBufferData(StringPiece(data.data(), data.length()), false, nullptr); |
- |
- ++num_server_config_update_messages_sent_; |
+ std::unique_ptr<SendServerConfigUpdateCallback> cb( |
+ new SendServerConfigUpdateCallback(this)); |
+ send_server_config_update_cb_ = cb.get(); |
+ |
+ crypto_config_->BuildServerConfigUpdateMessage( |
+ session()->connection()->version(), chlo_hash_, |
+ previous_source_address_tokens_, session()->connection()->self_address(), |
+ session()->connection()->peer_address().host(), |
+ session()->connection()->clock(), |
+ session()->connection()->random_generator(), compressed_certs_cache_, |
+ *crypto_negotiated_params_, cached_network_params, |
+ (session()->config()->HasReceivedConnectionOptions() |
+ ? session()->config()->ReceivedConnectionOptions() |
+ : QuicTagVector()), |
+ std::move(cb)); |
} |
QuicCryptoServerStream::SendServerConfigUpdateCallback:: |