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

Side by Side Diff: net/socket/client_socket_pool_manager_impl.cc

Issue 8692012: net: replace DnsRRResoler with TransportSecurityState in plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 9 years 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/socket/client_socket_pool_manager_impl.h ('k') | net/socket/ssl_client_socket.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/socket/client_socket_pool_manager_impl.h" 5 #include "net/socket/client_socket_pool_manager_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "net/base/ssl_config_service.h" 9 #include "net/base/ssl_config_service.h"
10 #include "net/http/http_proxy_client_socket_pool.h" 10 #include "net/http/http_proxy_client_socket_pool.h"
(...skipping 20 matching lines...) Expand all
31 } 31 }
32 32
33 } // namespace 33 } // namespace
34 34
35 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( 35 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
36 NetLog* net_log, 36 NetLog* net_log,
37 ClientSocketFactory* socket_factory, 37 ClientSocketFactory* socket_factory,
38 HostResolver* host_resolver, 38 HostResolver* host_resolver,
39 CertVerifier* cert_verifier, 39 CertVerifier* cert_verifier,
40 OriginBoundCertService* origin_bound_cert_service, 40 OriginBoundCertService* origin_bound_cert_service,
41 DnsRRResolver* dnsrr_resolver, 41 TransportSecurityState* transport_security_state,
42 DnsCertProvenanceChecker* dns_cert_checker, 42 DnsCertProvenanceChecker* dns_cert_checker,
43 SSLHostInfoFactory* ssl_host_info_factory, 43 SSLHostInfoFactory* ssl_host_info_factory,
44 ProxyService* proxy_service, 44 ProxyService* proxy_service,
45 SSLConfigService* ssl_config_service) 45 SSLConfigService* ssl_config_service)
46 : net_log_(net_log), 46 : net_log_(net_log),
47 socket_factory_(socket_factory), 47 socket_factory_(socket_factory),
48 host_resolver_(host_resolver), 48 host_resolver_(host_resolver),
49 cert_verifier_(cert_verifier), 49 cert_verifier_(cert_verifier),
50 origin_bound_cert_service_(origin_bound_cert_service), 50 origin_bound_cert_service_(origin_bound_cert_service),
51 dnsrr_resolver_(dnsrr_resolver), 51 transport_security_state_(transport_security_state),
52 dns_cert_checker_(dns_cert_checker), 52 dns_cert_checker_(dns_cert_checker),
53 ssl_host_info_factory_(ssl_host_info_factory), 53 ssl_host_info_factory_(ssl_host_info_factory),
54 proxy_service_(proxy_service), 54 proxy_service_(proxy_service),
55 ssl_config_service_(ssl_config_service), 55 ssl_config_service_(ssl_config_service),
56 transport_pool_histograms_("TCP"), 56 transport_pool_histograms_("TCP"),
57 transport_socket_pool_(new TransportClientSocketPool( 57 transport_socket_pool_(new TransportClientSocketPool(
58 max_sockets_per_pool(), max_sockets_per_group(), 58 max_sockets_per_pool(), max_sockets_per_group(),
59 &transport_pool_histograms_, 59 &transport_pool_histograms_,
60 host_resolver, 60 host_resolver,
61 socket_factory_, 61 socket_factory_,
62 net_log)), 62 net_log)),
63 ssl_pool_histograms_("SSL2"), 63 ssl_pool_histograms_("SSL2"),
64 ssl_socket_pool_(new SSLClientSocketPool( 64 ssl_socket_pool_(new SSLClientSocketPool(
65 max_sockets_per_pool(), max_sockets_per_group(), 65 max_sockets_per_pool(), max_sockets_per_group(),
66 &ssl_pool_histograms_, 66 &ssl_pool_histograms_,
67 host_resolver, 67 host_resolver,
68 cert_verifier, 68 cert_verifier,
69 origin_bound_cert_service, 69 origin_bound_cert_service,
70 dnsrr_resolver, 70 transport_security_state,
71 dns_cert_checker, 71 dns_cert_checker,
72 ssl_host_info_factory, 72 ssl_host_info_factory,
73 socket_factory, 73 socket_factory,
74 transport_socket_pool_.get(), 74 transport_socket_pool_.get(),
75 NULL /* no socks proxy */, 75 NULL /* no socks proxy */,
76 NULL /* no http proxy */, 76 NULL /* no http proxy */,
77 ssl_config_service, 77 ssl_config_service,
78 net_log)), 78 net_log)),
79 transport_for_socks_pool_histograms_("TCPforSOCKS"), 79 transport_for_socks_pool_histograms_("TCPforSOCKS"),
80 socks_pool_histograms_("SOCK"), 80 socks_pool_histograms_("SOCK"),
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 ssl_socket_pools_for_https_proxies_.insert( 280 ssl_socket_pools_for_https_proxies_.insert(
281 std::make_pair( 281 std::make_pair(
282 http_proxy, 282 http_proxy,
283 new SSLClientSocketPool( 283 new SSLClientSocketPool(
284 max_sockets_per_proxy_server(), 284 max_sockets_per_proxy_server(),
285 max_sockets_per_group(), 285 max_sockets_per_group(),
286 &ssl_for_https_proxy_pool_histograms_, 286 &ssl_for_https_proxy_pool_histograms_,
287 host_resolver_, 287 host_resolver_,
288 cert_verifier_, 288 cert_verifier_,
289 origin_bound_cert_service_, 289 origin_bound_cert_service_,
290 dnsrr_resolver_, 290 transport_security_state_,
291 dns_cert_checker_, 291 dns_cert_checker_,
292 ssl_host_info_factory_, 292 ssl_host_info_factory_,
293 socket_factory_, 293 socket_factory_,
294 tcp_https_ret.first->second /* https proxy */, 294 tcp_https_ret.first->second /* https proxy */,
295 NULL /* no socks proxy */, 295 NULL /* no socks proxy */,
296 NULL /* no http proxy */, 296 NULL /* no http proxy */,
297 ssl_config_service_, net_log_))); 297 ssl_config_service_, net_log_)));
298 DCHECK(tcp_https_ret.second); 298 DCHECK(tcp_https_ret.second);
299 299
300 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = 300 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret =
(...skipping 18 matching lines...) Expand all
319 ssl_socket_pools_for_proxies_.find(proxy_server); 319 ssl_socket_pools_for_proxies_.find(proxy_server);
320 if (it != ssl_socket_pools_for_proxies_.end()) 320 if (it != ssl_socket_pools_for_proxies_.end())
321 return it->second; 321 return it->second;
322 322
323 SSLClientSocketPool* new_pool = new SSLClientSocketPool( 323 SSLClientSocketPool* new_pool = new SSLClientSocketPool(
324 max_sockets_per_proxy_server(), max_sockets_per_group(), 324 max_sockets_per_proxy_server(), max_sockets_per_group(),
325 &ssl_pool_histograms_, 325 &ssl_pool_histograms_,
326 host_resolver_, 326 host_resolver_,
327 cert_verifier_, 327 cert_verifier_,
328 origin_bound_cert_service_, 328 origin_bound_cert_service_,
329 dnsrr_resolver_, 329 transport_security_state_,
330 dns_cert_checker_, 330 dns_cert_checker_,
331 ssl_host_info_factory_, 331 ssl_host_info_factory_,
332 socket_factory_, 332 socket_factory_,
333 NULL, /* no tcp pool, we always go through a proxy */ 333 NULL, /* no tcp pool, we always go through a proxy */
334 GetSocketPoolForSOCKSProxy(proxy_server), 334 GetSocketPoolForSOCKSProxy(proxy_server),
335 GetSocketPoolForHTTPProxy(proxy_server), 335 GetSocketPoolForHTTPProxy(proxy_server),
336 ssl_config_service_, 336 ssl_config_service_,
337 net_log_); 337 net_log_);
338 338
339 std::pair<SSLSocketPoolMap::iterator, bool> ret = 339 std::pair<SSLSocketPoolMap::iterator, bool> ret =
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 // We should not flush the socket pools if we added trust to a 385 // We should not flush the socket pools if we added trust to a
386 // cert. 386 // cert.
387 // 387 //
388 // Since the OnCertTrustChanged method doesn't tell us what 388 // Since the OnCertTrustChanged method doesn't tell us what
389 // kind of trust change it is, we have to flush the socket 389 // kind of trust change it is, we have to flush the socket
390 // pools to be safe. 390 // pools to be safe.
391 FlushSocketPools(); 391 FlushSocketPools();
392 } 392 }
393 393
394 } // namespace net 394 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/ssl_client_socket.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698