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

Side by Side Diff: net/quic/quic_crypto_client_stream.cc

Issue 868993002: Land Recent QUIC Changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merging with TOT Created 5 years, 11 months 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
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_framer_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/quic_crypto_client_stream.h" 5 #include "net/quic/quic_crypto_client_stream.h"
6 6
7 #include "base/metrics/histogram.h" 7 #include "base/metrics/histogram.h"
8 #include "base/profiler/scoped_tracker.h" 8 #include "base/profiler/scoped_tracker.h"
9 #include "net/quic/crypto/crypto_protocol.h" 9 #include "net/quic/crypto/crypto_protocol.h"
10 #include "net/quic/crypto/crypto_utils.h" 10 #include "net/quic/crypto/crypto_utils.h"
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 438
439 void QuicCryptoClientStream::DoVerifyProofComplete( 439 void QuicCryptoClientStream::DoVerifyProofComplete(
440 QuicCryptoClientConfig::CachedState* cached) { 440 QuicCryptoClientConfig::CachedState* cached) {
441 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed. 441 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
442 tracked_objects::ScopedTracker tracking_profile( 442 tracked_objects::ScopedTracker tracking_profile(
443 FROM_HERE_WITH_EXPLICIT_FUNCTION( 443 FROM_HERE_WITH_EXPLICIT_FUNCTION(
444 "422516 QuicCryptoClientStream::DoVerifyProofComplete")); 444 "422516 QuicCryptoClientStream::DoVerifyProofComplete"));
445 445
446 if (!verify_ok_) { 446 if (!verify_ok_) {
447 next_state_ = STATE_NONE; 447 next_state_ = STATE_NONE;
448 if (verify_details_) { 448 if (verify_details_.get()) {
449 client_session()->OnProofVerifyDetailsAvailable(*verify_details_); 449 client_session()->OnProofVerifyDetailsAvailable(*verify_details_);
450 } 450 }
451 UMA_HISTOGRAM_BOOLEAN("Net.QuicVerifyProofFailed.HandshakeConfirmed", 451 UMA_HISTOGRAM_BOOLEAN("Net.QuicVerifyProofFailed.HandshakeConfirmed",
452 handshake_confirmed()); 452 handshake_confirmed());
453 CloseConnectionWithDetails( 453 CloseConnectionWithDetails(
454 QUIC_PROOF_INVALID, "Proof invalid: " + verify_error_details_); 454 QUIC_PROOF_INVALID, "Proof invalid: " + verify_error_details_);
455 return; 455 return;
456 } 456 }
457 457
458 // Check if generation_counter has changed between STATE_VERIFY_PROOF and 458 // Check if generation_counter has changed between STATE_VERIFY_PROOF and
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 } 653 }
654 } 654 }
655 return false; 655 return false;
656 } 656 }
657 657
658 QuicClientSessionBase* QuicCryptoClientStream::client_session() { 658 QuicClientSessionBase* QuicCryptoClientStream::client_session() {
659 return reinterpret_cast<QuicClientSessionBase*>(session()); 659 return reinterpret_cast<QuicClientSessionBase*>(session());
660 } 660 }
661 661
662 } // namespace net 662 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_connection_test.cc ('k') | net/quic/quic_framer_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698