Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(72)

Side by Side Diff: net/quic/core/quic_crypto_server_stream.cc

Issue 2461333003: Add connection_options argument to ProofSource::GetProof (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/quic/core/quic_crypto_server_stream.h" 5 #include "net/quic/core/quic_crypto_server_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "crypto/secure_hash.h" 10 #include "crypto/secure_hash.h"
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 if (FLAGS_enable_async_get_proof) { 283 if (FLAGS_enable_async_get_proof) {
284 if (send_server_config_update_cb_ != nullptr) { 284 if (send_server_config_update_cb_ != nullptr) {
285 DVLOG(1) 285 DVLOG(1)
286 << "Skipped server config update since one is already in progress"; 286 << "Skipped server config update since one is already in progress";
287 return; 287 return;
288 } 288 }
289 289
290 std::unique_ptr<SendServerConfigUpdateCallback> cb( 290 std::unique_ptr<SendServerConfigUpdateCallback> cb(
291 new SendServerConfigUpdateCallback(this)); 291 new SendServerConfigUpdateCallback(this));
292 send_server_config_update_cb_ = cb.get(); 292 send_server_config_update_cb_ = cb.get();
293
293 crypto_config_->BuildServerConfigUpdateMessage( 294 crypto_config_->BuildServerConfigUpdateMessage(
294 session()->connection()->version(), chlo_hash_, 295 session()->connection()->version(), chlo_hash_,
295 previous_source_address_tokens_, 296 previous_source_address_tokens_,
296 session()->connection()->self_address().address(), 297 session()->connection()->self_address().address(),
297 session()->connection()->peer_address().address(), 298 session()->connection()->peer_address().address(),
298 session()->connection()->clock(), 299 session()->connection()->clock(),
299 session()->connection()->random_generator(), compressed_certs_cache_, 300 session()->connection()->random_generator(), compressed_certs_cache_,
300 *crypto_negotiated_params_, cached_network_params, std::move(cb)); 301 *crypto_negotiated_params_, cached_network_params,
302 (session()->config()->HasReceivedConnectionOptions()
303 ? session()->config()->ReceivedConnectionOptions()
304 : QuicTagVector()),
305 std::move(cb));
301 return; 306 return;
302 } 307 }
303 308
304 CryptoHandshakeMessage server_config_update_message; 309 CryptoHandshakeMessage server_config_update_message;
305 if (!crypto_config_->BuildServerConfigUpdateMessage( 310 if (!crypto_config_->BuildServerConfigUpdateMessage(
306 session()->connection()->version(), chlo_hash_, 311 session()->connection()->version(), chlo_hash_,
307 previous_source_address_tokens_, 312 previous_source_address_tokens_,
308 session()->connection()->self_address().address(), 313 session()->connection()->self_address().address(),
309 session()->connection()->peer_address().address(), 314 session()->connection()->peer_address().address(),
310 session()->connection()->clock(), 315 session()->connection()->clock(),
311 session()->connection()->random_generator(), compressed_certs_cache_, 316 session()->connection()->random_generator(), compressed_certs_cache_,
312 *crypto_negotiated_params_, cached_network_params, 317 *crypto_negotiated_params_, cached_network_params,
318 (session()->config()->HasReceivedConnectionOptions()
319 ? session()->config()->ReceivedConnectionOptions()
320 : QuicTagVector()),
313 &server_config_update_message)) { 321 &server_config_update_message)) {
314 DVLOG(1) << "Server: Failed to build server config update (SCUP)!"; 322 DVLOG(1) << "Server: Failed to build server config update (SCUP)!";
315 return; 323 return;
316 } 324 }
317 325
318 DVLOG(1) << "Server: Sending server config update: " 326 DVLOG(1) << "Server: Sending server config update: "
319 << server_config_update_message.DebugString(); 327 << server_config_update_message.DebugString();
320 const QuicData& data = server_config_update_message.GetSerialized(); 328 const QuicData& data = server_config_update_message.GetSerialized();
321 WriteOrBufferData(StringPiece(data.data(), data.length()), false, nullptr); 329 WriteOrBufferData(StringPiece(data.data(), data.length()), false, nullptr);
322 330
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject( 499 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject(
492 bool use_stateless_rejects) { 500 bool use_stateless_rejects) {
493 if (!use_stateless_rejects) { 501 if (!use_stateless_rejects) {
494 return 0; 502 return 0;
495 } 503 }
496 return helper_->GenerateConnectionIdForReject( 504 return helper_->GenerateConnectionIdForReject(
497 session()->connection()->connection_id()); 505 session()->connection()->connection_id());
498 } 506 }
499 507
500 } // namespace net 508 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/core/crypto/quic_crypto_server_config.cc ('k') | net/quic/core/quic_crypto_server_stream_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698