| OLD | NEW |
| 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/socket/client_socket_pool_manager_impl.h" | 5 #include "net/socket/client_socket_pool_manager_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 } // namespace | 38 } // namespace |
| 39 | 39 |
| 40 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( | 40 ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl( |
| 41 NetLog* net_log, | 41 NetLog* net_log, |
| 42 ClientSocketFactory* socket_factory, | 42 ClientSocketFactory* socket_factory, |
| 43 HostResolver* host_resolver, | 43 HostResolver* host_resolver, |
| 44 CertVerifier* cert_verifier, | 44 CertVerifier* cert_verifier, |
| 45 ChannelIDService* channel_id_service, | 45 ChannelIDService* channel_id_service, |
| 46 TransportSecurityState* transport_security_state, | 46 TransportSecurityState* transport_security_state, |
| 47 CTVerifier* cert_transparency_verifier, | 47 CTVerifier* cert_transparency_verifier, |
| 48 CertPolicyEnforcer* cert_policy_enforcer, | 48 CTPolicyEnforcer* ct_policy_enforcer, |
| 49 const std::string& ssl_session_cache_shard, | 49 const std::string& ssl_session_cache_shard, |
| 50 SSLConfigService* ssl_config_service, | 50 SSLConfigService* ssl_config_service, |
| 51 HttpNetworkSession::SocketPoolType pool_type) | 51 HttpNetworkSession::SocketPoolType pool_type) |
| 52 : net_log_(net_log), | 52 : net_log_(net_log), |
| 53 socket_factory_(socket_factory), | 53 socket_factory_(socket_factory), |
| 54 host_resolver_(host_resolver), | 54 host_resolver_(host_resolver), |
| 55 cert_verifier_(cert_verifier), | 55 cert_verifier_(cert_verifier), |
| 56 channel_id_service_(channel_id_service), | 56 channel_id_service_(channel_id_service), |
| 57 transport_security_state_(transport_security_state), | 57 transport_security_state_(transport_security_state), |
| 58 cert_transparency_verifier_(cert_transparency_verifier), | 58 cert_transparency_verifier_(cert_transparency_verifier), |
| 59 cert_policy_enforcer_(cert_policy_enforcer), | 59 ct_policy_enforcer_(ct_policy_enforcer), |
| 60 ssl_session_cache_shard_(ssl_session_cache_shard), | 60 ssl_session_cache_shard_(ssl_session_cache_shard), |
| 61 ssl_config_service_(ssl_config_service), | 61 ssl_config_service_(ssl_config_service), |
| 62 pool_type_(pool_type), | 62 pool_type_(pool_type), |
| 63 transport_socket_pool_( | 63 transport_socket_pool_( |
| 64 pool_type == HttpNetworkSession::WEBSOCKET_SOCKET_POOL | 64 pool_type == HttpNetworkSession::WEBSOCKET_SOCKET_POOL |
| 65 ? new WebSocketTransportClientSocketPool( | 65 ? new WebSocketTransportClientSocketPool( |
| 66 max_sockets_per_pool(pool_type), | 66 max_sockets_per_pool(pool_type), |
| 67 max_sockets_per_group(pool_type), | 67 max_sockets_per_group(pool_type), |
| 68 host_resolver, | 68 host_resolver, |
| 69 socket_factory_, | 69 socket_factory_, |
| 70 net_log) | 70 net_log) |
| 71 : new TransportClientSocketPool(max_sockets_per_pool(pool_type), | 71 : new TransportClientSocketPool(max_sockets_per_pool(pool_type), |
| 72 max_sockets_per_group(pool_type), | 72 max_sockets_per_group(pool_type), |
| 73 host_resolver, | 73 host_resolver, |
| 74 socket_factory_, | 74 socket_factory_, |
| 75 net_log)), | 75 net_log)), |
| 76 ssl_socket_pool_(new SSLClientSocketPool(max_sockets_per_pool(pool_type), | 76 ssl_socket_pool_(new SSLClientSocketPool(max_sockets_per_pool(pool_type), |
| 77 max_sockets_per_group(pool_type), | 77 max_sockets_per_group(pool_type), |
| 78 cert_verifier, | 78 cert_verifier, |
| 79 channel_id_service, | 79 channel_id_service, |
| 80 transport_security_state, | 80 transport_security_state, |
| 81 cert_transparency_verifier, | 81 cert_transparency_verifier, |
| 82 cert_policy_enforcer, | 82 ct_policy_enforcer, |
| 83 ssl_session_cache_shard, | 83 ssl_session_cache_shard, |
| 84 socket_factory, | 84 socket_factory, |
| 85 transport_socket_pool_.get(), | 85 transport_socket_pool_.get(), |
| 86 NULL /* no socks proxy */, | 86 NULL /* no socks proxy */, |
| 87 NULL /* no http proxy */, | 87 NULL /* no http proxy */, |
| 88 ssl_config_service, | 88 ssl_config_service, |
| 89 net_log)) { | 89 net_log)) { |
| 90 CertDatabase::GetInstance()->AddObserver(this); | 90 CertDatabase::GetInstance()->AddObserver(this); |
| 91 } | 91 } |
| 92 | 92 |
| (...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 278 new TransportClientSocketPool( | 278 new TransportClientSocketPool( |
| 279 sockets_per_proxy_server, | 279 sockets_per_proxy_server, |
| 280 sockets_per_group, | 280 sockets_per_group, |
| 281 host_resolver_, | 281 host_resolver_, |
| 282 socket_factory_, | 282 socket_factory_, |
| 283 net_log_))); | 283 net_log_))); |
| 284 DCHECK(tcp_https_ret.second); | 284 DCHECK(tcp_https_ret.second); |
| 285 | 285 |
| 286 std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret = | 286 std::pair<SSLSocketPoolMap::iterator, bool> ssl_https_ret = |
| 287 ssl_socket_pools_for_https_proxies_.insert(std::make_pair( | 287 ssl_socket_pools_for_https_proxies_.insert(std::make_pair( |
| 288 http_proxy, new SSLClientSocketPool( | 288 http_proxy, |
| 289 sockets_per_proxy_server, | 289 new SSLClientSocketPool( |
| 290 sockets_per_group, cert_verifier_, | 290 sockets_per_proxy_server, sockets_per_group, cert_verifier_, |
| 291 channel_id_service_, transport_security_state_, | 291 channel_id_service_, transport_security_state_, |
| 292 cert_transparency_verifier_, cert_policy_enforcer_, | 292 cert_transparency_verifier_, ct_policy_enforcer_, |
| 293 ssl_session_cache_shard_, socket_factory_, | 293 ssl_session_cache_shard_, socket_factory_, |
| 294 tcp_https_ret.first->second /* https proxy */, | 294 tcp_https_ret.first->second /* https proxy */, |
| 295 NULL /* no socks proxy */, NULL /* no http proxy */, | 295 NULL /* no socks proxy */, NULL /* no http proxy */, |
| 296 ssl_config_service_.get(), net_log_))); | 296 ssl_config_service_.get(), net_log_))); |
| 297 DCHECK(tcp_https_ret.second); | 297 DCHECK(tcp_https_ret.second); |
| 298 | 298 |
| 299 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = | 299 std::pair<HTTPProxySocketPoolMap::iterator, bool> ret = |
| 300 http_proxy_socket_pools_.insert( | 300 http_proxy_socket_pools_.insert( |
| 301 std::make_pair( | 301 std::make_pair( |
| 302 http_proxy, | 302 http_proxy, |
| 303 new HttpProxyClientSocketPool( | 303 new HttpProxyClientSocketPool( |
| 304 sockets_per_proxy_server, | 304 sockets_per_proxy_server, |
| 305 sockets_per_group, | 305 sockets_per_group, |
| 306 tcp_http_ret.first->second, | 306 tcp_http_ret.first->second, |
| 307 ssl_https_ret.first->second, | 307 ssl_https_ret.first->second, |
| 308 net_log_))); | 308 net_log_))); |
| 309 | 309 |
| 310 return ret.first->second; | 310 return ret.first->second; |
| 311 } | 311 } |
| 312 | 312 |
| 313 SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy( | 313 SSLClientSocketPool* ClientSocketPoolManagerImpl::GetSocketPoolForSSLWithProxy( |
| 314 const HostPortPair& proxy_server) { | 314 const HostPortPair& proxy_server) { |
| 315 SSLSocketPoolMap::const_iterator it = | 315 SSLSocketPoolMap::const_iterator it = |
| 316 ssl_socket_pools_for_proxies_.find(proxy_server); | 316 ssl_socket_pools_for_proxies_.find(proxy_server); |
| 317 if (it != ssl_socket_pools_for_proxies_.end()) | 317 if (it != ssl_socket_pools_for_proxies_.end()) |
| 318 return it->second; | 318 return it->second; |
| 319 | 319 |
| 320 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_); | 320 int sockets_per_proxy_server = max_sockets_per_proxy_server(pool_type_); |
| 321 int sockets_per_group = std::min(sockets_per_proxy_server, | 321 int sockets_per_group = std::min(sockets_per_proxy_server, |
| 322 max_sockets_per_group(pool_type_)); | 322 max_sockets_per_group(pool_type_)); |
| 323 | 323 |
| 324 SSLClientSocketPool* new_pool = new SSLClientSocketPool( | 324 SSLClientSocketPool* new_pool = new SSLClientSocketPool( |
| 325 sockets_per_proxy_server, | 325 sockets_per_proxy_server, sockets_per_group, cert_verifier_, |
| 326 sockets_per_group, cert_verifier_, channel_id_service_, | 326 channel_id_service_, transport_security_state_, |
| 327 transport_security_state_, cert_transparency_verifier_, | 327 cert_transparency_verifier_, ct_policy_enforcer_, |
| 328 cert_policy_enforcer_, ssl_session_cache_shard_, socket_factory_, | 328 ssl_session_cache_shard_, socket_factory_, |
| 329 NULL, /* no tcp pool, we always go through a proxy */ | 329 NULL, /* no tcp pool, we always go through a proxy */ |
| 330 GetSocketPoolForSOCKSProxy(proxy_server), | 330 GetSocketPoolForSOCKSProxy(proxy_server), |
| 331 GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_.get(), | 331 GetSocketPoolForHTTPProxy(proxy_server), ssl_config_service_.get(), |
| 332 net_log_); | 332 net_log_); |
| 333 | 333 |
| 334 std::pair<SSLSocketPoolMap::iterator, bool> ret = | 334 std::pair<SSLSocketPoolMap::iterator, bool> ret = |
| 335 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, | 335 ssl_socket_pools_for_proxies_.insert(std::make_pair(proxy_server, |
| 336 new_pool)); | 336 new_pool)); |
| 337 | 337 |
| 338 return ret.first->second; | 338 return ret.first->second; |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 // We should not flush the socket pools if we added trust to a | 375 // We should not flush the socket pools if we added trust to a |
| 376 // cert. | 376 // cert. |
| 377 // | 377 // |
| 378 // Since the OnCACertChanged method doesn't tell us what | 378 // Since the OnCACertChanged method doesn't tell us what |
| 379 // kind of change it is, we have to flush the socket | 379 // kind of change it is, we have to flush the socket |
| 380 // pools to be safe. | 380 // pools to be safe. |
| 381 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED); | 381 FlushSocketPoolsWithError(ERR_NETWORK_CHANGED); |
| 382 } | 382 } |
| 383 | 383 |
| 384 } // namespace net | 384 } // namespace net |
| OLD | NEW |