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

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

Issue 330333006: Land Recent QUIC Changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linus_tsan error - reverted the change to ConnectionMigrationClientPortChanged unitttest Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « net/quic/quic_config_test.cc ('k') | net/quic/quic_crypto_server_stream.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 "net/quic/crypto/channel_id.h" 7 #include "net/quic/crypto/channel_id.h"
8 #include "net/quic/crypto/crypto_protocol.h" 8 #include "net/quic/crypto/crypto_protocol.h"
9 #include "net/quic/crypto/crypto_utils.h" 9 #include "net/quic/crypto/crypto_utils.h"
10 #include "net/quic/crypto/null_encrypter.h" 10 #include "net/quic/crypto/null_encrypter.h"
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 CloseConnectionWithDetails(QUIC_INVALID_CHANNEL_ID_SIGNATURE, 178 CloseConnectionWithDetails(QUIC_INVALID_CHANNEL_ID_SIGNATURE,
179 "Channel ID lookup failed"); 179 "Channel ID lookup failed");
180 return; 180 return;
181 } 181 }
182 } 182 }
183 183
184 error = crypto_config_->FillClientHello( 184 error = crypto_config_->FillClientHello(
185 server_id_, 185 server_id_,
186 session()->connection()->connection_id(), 186 session()->connection()->connection_id(),
187 session()->connection()->supported_versions().front(), 187 session()->connection()->supported_versions().front(),
188 session()->max_flow_control_receive_window_bytes(),
189 cached, 188 cached,
190 session()->connection()->clock()->WallNow(), 189 session()->connection()->clock()->WallNow(),
191 session()->connection()->random_generator(), 190 session()->connection()->random_generator(),
192 channel_id_key.get(), 191 channel_id_key.get(),
193 &crypto_negotiated_params_, 192 &crypto_negotiated_params_,
194 &out, 193 &out,
195 &error_details); 194 &error_details);
196 if (error != QUIC_NO_ERROR) { 195 if (error != QUIC_NO_ERROR) {
197 // Flush the cached config so that, if it's bad, the server has a 196 // Flush the cached config so that, if it's bad, the server has a
198 // chance to send us another in the future. 197 // chance to send us another in the future.
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 QuicCryptoClientConfig::CachedState* cached) { 388 QuicCryptoClientConfig::CachedState* cached) {
390 cached->SetProofValid(); 389 cached->SetProofValid();
391 client_session()->OnProofValid(*cached); 390 client_session()->OnProofValid(*cached);
392 } 391 }
393 392
394 QuicClientSessionBase* QuicCryptoClientStream::client_session() { 393 QuicClientSessionBase* QuicCryptoClientStream::client_session() {
395 return reinterpret_cast<QuicClientSessionBase*>(session()); 394 return reinterpret_cast<QuicClientSessionBase*>(session());
396 } 395 }
397 396
398 } // namespace net 397 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/quic_config_test.cc ('k') | net/quic/quic_crypto_server_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698