diff options
| author | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2013-04-04 16:02:42 -0700 |
| commit | 9cb665138c7d2422739e32b40a249c64fd3b6cd5 (patch) | |
| tree | 94759d916599ca08761b98580185a230744ac67a /cpp/src/IceSSL/EndpointI.cpp | |
| parent | x64 VC10 icexml35d.dll was linked to wrong file (diff) | |
| download | ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.bz2 ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.tar.xz ice-9cb665138c7d2422739e32b40a249c64fd3b6cd5.zip | |
* SOCKS support for C++
* Minor cleanup in C#
* Unity fixes
Diffstat (limited to 'cpp/src/IceSSL/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/EndpointI.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp index ce55f30a306..1c71eb560ab 100644 --- a/cpp/src/IceSSL/EndpointI.cpp +++ b/cpp/src/IceSSL/EndpointI.cpp @@ -411,6 +411,18 @@ IceSSL::EndpointI::equivalent(const IceInternal::EndpointIPtr& endpoint) const return sslEndpointI->_host == _host && sslEndpointI->_port == _port; } +vector<IceInternal::ConnectorPtr> +IceSSL::EndpointI::connectors(const vector<IceInternal::Address>& addresses, + const IceInternal::NetworkProxyPtr& proxy) const +{ + vector<IceInternal::ConnectorPtr> connectors; + for(unsigned int i = 0; i < addresses.size(); ++i) + { + connectors.push_back(new ConnectorI(_instance, _host, addresses[i], proxy, _timeout, _connectionId)); + } + return connectors; +} + bool IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const { @@ -533,17 +545,6 @@ IceSSL::EndpointI::hashInit() const return h; } -vector<IceInternal::ConnectorPtr> -IceSSL::EndpointI::connectors(const vector<IceInternal::Address>& addresses) const -{ - vector<IceInternal::ConnectorPtr> connectors; - for(unsigned int i = 0; i < addresses.size(); ++i) - { - connectors.push_back(new ConnectorI(_instance, _host, addresses[i], _timeout, _connectionId)); - } - return connectors; -} - IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance) { |