| OLD | NEW |
| 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/ssl_client_socket_pool.h" | 5 #include "net/socket/ssl_client_socket_pool.h" |
| 6 | 6 |
| 7 #include "base/metrics/field_trial.h" | 7 #include "base/metrics/field_trial.h" |
| 8 #include "base/metrics/histogram.h" | 8 #include "base/metrics/histogram.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "net/base/net_errors.h" | 10 #include "net/base/net_errors.h" |
| (...skipping 458 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 SSLClientSocketContext( | 469 SSLClientSocketContext( |
| 470 cert_verifier, | 470 cert_verifier, |
| 471 origin_bound_cert_service, | 471 origin_bound_cert_service, |
| 472 dnsrr_resolver, | 472 dnsrr_resolver, |
| 473 dns_cert_checker, | 473 dns_cert_checker, |
| 474 ssl_host_info_factory), | 474 ssl_host_info_factory), |
| 475 net_log)), | 475 net_log)), |
| 476 ssl_config_service_(ssl_config_service) { | 476 ssl_config_service_(ssl_config_service) { |
| 477 if (ssl_config_service_) | 477 if (ssl_config_service_) |
| 478 ssl_config_service_->AddObserver(this); | 478 ssl_config_service_->AddObserver(this); |
| 479 if (transport_pool_) |
| 480 transport_pool_->AddLayeredPool(this); |
| 481 if (socks_pool_) |
| 482 socks_pool_->AddLayeredPool(this); |
| 483 if (http_proxy_pool_) |
| 484 http_proxy_pool_->AddLayeredPool(this); |
| 479 } | 485 } |
| 480 | 486 |
| 481 SSLClientSocketPool::~SSLClientSocketPool() { | 487 SSLClientSocketPool::~SSLClientSocketPool() { |
| 488 if (http_proxy_pool_) |
| 489 http_proxy_pool_->RemoveLayeredPool(this); |
| 490 if (socks_pool_) |
| 491 socks_pool_->RemoveLayeredPool(this); |
| 492 if (transport_pool_) |
| 493 transport_pool_->RemoveLayeredPool(this); |
| 482 if (ssl_config_service_) | 494 if (ssl_config_service_) |
| 483 ssl_config_service_->RemoveObserver(this); | 495 ssl_config_service_->RemoveObserver(this); |
| 484 } | 496 } |
| 485 | 497 |
| 486 ConnectJob* SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob( | 498 ConnectJob* SSLClientSocketPool::SSLConnectJobFactory::NewConnectJob( |
| 487 const std::string& group_name, | 499 const std::string& group_name, |
| 488 const PoolBase::Request& request, | 500 const PoolBase::Request& request, |
| 489 ConnectJob::Delegate* delegate) const { | 501 ConnectJob::Delegate* delegate) const { |
| 490 return new SSLConnectJob(group_name, request.params(), ConnectionTimeout(), | 502 return new SSLConnectJob(group_name, request.params(), ConnectionTimeout(), |
| 491 transport_pool_, socks_pool_, http_proxy_pool_, | 503 transport_pool_, socks_pool_, http_proxy_pool_, |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 524 | 536 |
| 525 void SSLClientSocketPool::ReleaseSocket(const std::string& group_name, | 537 void SSLClientSocketPool::ReleaseSocket(const std::string& group_name, |
| 526 StreamSocket* socket, int id) { | 538 StreamSocket* socket, int id) { |
| 527 base_.ReleaseSocket(group_name, socket, id); | 539 base_.ReleaseSocket(group_name, socket, id); |
| 528 } | 540 } |
| 529 | 541 |
| 530 void SSLClientSocketPool::Flush() { | 542 void SSLClientSocketPool::Flush() { |
| 531 base_.Flush(); | 543 base_.Flush(); |
| 532 } | 544 } |
| 533 | 545 |
| 546 bool SSLClientSocketPool::IsStalled() const { |
| 547 return base_.IsStalled() || |
| 548 (transport_pool_ && transport_pool_->IsStalled()) || |
| 549 (socks_pool_ && socks_pool_->IsStalled()) || |
| 550 (http_proxy_pool_ && http_proxy_pool_->IsStalled()); |
| 551 } |
| 552 |
| 534 void SSLClientSocketPool::CloseIdleSockets() { | 553 void SSLClientSocketPool::CloseIdleSockets() { |
| 535 base_.CloseIdleSockets(); | 554 base_.CloseIdleSockets(); |
| 536 } | 555 } |
| 537 | 556 |
| 538 int SSLClientSocketPool::IdleSocketCount() const { | 557 int SSLClientSocketPool::IdleSocketCount() const { |
| 539 return base_.idle_socket_count(); | 558 return base_.idle_socket_count(); |
| 540 } | 559 } |
| 541 | 560 |
| 542 int SSLClientSocketPool::IdleSocketCountInGroup( | 561 int SSLClientSocketPool::IdleSocketCountInGroup( |
| 543 const std::string& group_name) const { | 562 const std::string& group_name) const { |
| 544 return base_.IdleSocketCountInGroup(group_name); | 563 return base_.IdleSocketCountInGroup(group_name); |
| 545 } | 564 } |
| 546 | 565 |
| 547 LoadState SSLClientSocketPool::GetLoadState( | 566 LoadState SSLClientSocketPool::GetLoadState( |
| 548 const std::string& group_name, const ClientSocketHandle* handle) const { | 567 const std::string& group_name, const ClientSocketHandle* handle) const { |
| 549 return base_.GetLoadState(group_name, handle); | 568 return base_.GetLoadState(group_name, handle); |
| 550 } | 569 } |
| 551 | 570 |
| 571 void SSLClientSocketPool::AddLayeredPool(LayeredPool* layered_pool) { |
| 572 base_.AddLayeredPool(layered_pool); |
| 573 } |
| 574 |
| 575 void SSLClientSocketPool::RemoveLayeredPool(LayeredPool* layered_pool) { |
| 576 base_.RemoveLayeredPool(layered_pool); |
| 577 } |
| 578 |
| 552 DictionaryValue* SSLClientSocketPool::GetInfoAsValue( | 579 DictionaryValue* SSLClientSocketPool::GetInfoAsValue( |
| 553 const std::string& name, | 580 const std::string& name, |
| 554 const std::string& type, | 581 const std::string& type, |
| 555 bool include_nested_pools) const { | 582 bool include_nested_pools) const { |
| 556 DictionaryValue* dict = base_.GetInfoAsValue(name, type); | 583 DictionaryValue* dict = base_.GetInfoAsValue(name, type); |
| 557 if (include_nested_pools) { | 584 if (include_nested_pools) { |
| 558 ListValue* list = new ListValue(); | 585 ListValue* list = new ListValue(); |
| 559 if (transport_pool_) { | 586 if (transport_pool_) { |
| 560 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool", | 587 list->Append(transport_pool_->GetInfoAsValue("transport_socket_pool", |
| 561 "transport_socket_pool", | 588 "transport_socket_pool", |
| (...skipping 19 matching lines...) Expand all Loading... |
| 581 } | 608 } |
| 582 | 609 |
| 583 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { | 610 ClientSocketPoolHistograms* SSLClientSocketPool::histograms() const { |
| 584 return base_.histograms(); | 611 return base_.histograms(); |
| 585 } | 612 } |
| 586 | 613 |
| 587 void SSLClientSocketPool::OnSSLConfigChanged() { | 614 void SSLClientSocketPool::OnSSLConfigChanged() { |
| 588 Flush(); | 615 Flush(); |
| 589 } | 616 } |
| 590 | 617 |
| 618 bool SSLClientSocketPool::CloseOneIdleConnection() { |
| 619 if (base_.CloseOneIdleSocket()) |
| 620 return true; |
| 621 return base_.CloseOneIdleConnectionInLayeredPool(); |
| 622 } |
| 623 |
| 591 } // namespace net | 624 } // namespace net |
| OLD | NEW |