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

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

Issue 1714713002: Landing Recent QUIC changes until 2/12/2016 21:32 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/crypto/quic_crypto_server_config_test.cc ('k') | net/quic/quic_connection.h » ('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_chromium_client_session.h" 5 #include "net/quic/quic_chromium_client_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/callback_helpers.h" 9 #include "base/callback_helpers.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 sockets_.push_back(std::move(socket)); 203 sockets_.push_back(std::move(socket));
204 packet_readers_.push_back(make_scoped_ptr(new QuicChromiumPacketReader( 204 packet_readers_.push_back(make_scoped_ptr(new QuicChromiumPacketReader(
205 sockets_.back().get(), clock, this, yield_after_packets, 205 sockets_.back().get(), clock, this, yield_after_packets,
206 yield_after_duration, net_log_))); 206 yield_after_duration, net_log_)));
207 crypto_stream_.reset( 207 crypto_stream_.reset(
208 crypto_client_stream_factory->CreateQuicCryptoClientStream( 208 crypto_client_stream_factory->CreateQuicCryptoClientStream(
209 server_id, this, make_scoped_ptr(new ProofVerifyContextChromium( 209 server_id, this, make_scoped_ptr(new ProofVerifyContextChromium(
210 cert_verify_flags, net_log_)), 210 cert_verify_flags, net_log_)),
211 crypto_config)); 211 crypto_config));
212 connection->set_debug_visitor(logger_.get()); 212 connection->set_debug_visitor(logger_.get());
213 connection->set_creator_debug_delegate(logger_.get());
213 net_log_.BeginEvent(NetLog::TYPE_QUIC_SESSION, 214 net_log_.BeginEvent(NetLog::TYPE_QUIC_SESSION,
214 base::Bind(NetLogQuicClientSessionCallback, &server_id, 215 base::Bind(NetLogQuicClientSessionCallback, &server_id,
215 cert_verify_flags, require_confirmation_)); 216 cert_verify_flags, require_confirmation_));
216 IPEndPoint address; 217 IPEndPoint address;
217 if (socket && socket->GetLocalAddress(&address) == OK && 218 if (socket && socket->GetLocalAddress(&address) == OK &&
218 address.GetFamily() == ADDRESS_FAMILY_IPV6) { 219 address.GetFamily() == ADDRESS_FAMILY_IPV6) {
219 connection->SetMaxPacketLength(connection->max_packet_length() - 220 connection->SetMaxPacketLength(connection->max_packet_length() -
220 kAdditionalOverheadForIPv6); 221 kAdditionalOverheadForIPv6);
221 } 222 }
222 } 223 }
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1029 DCHECK(sockets_.back().get() != nullptr); 1030 DCHECK(sockets_.back().get() != nullptr);
1030 // The most recently added socket is the currently active one. 1031 // The most recently added socket is the currently active one.
1031 return sockets_.back().get(); 1032 return sockets_.back().get();
1032 } 1033 }
1033 1034
1034 bool QuicChromiumClientSession::IsAuthorized(const std::string& hostname) { 1035 bool QuicChromiumClientSession::IsAuthorized(const std::string& hostname) {
1035 return CanPool(hostname, server_id_.privacy_mode()); 1036 return CanPool(hostname, server_id_.privacy_mode());
1036 } 1037 }
1037 1038
1038 } // namespace net 1039 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/quic_crypto_server_config_test.cc ('k') | net/quic/quic_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698