diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-11-27 10:06:39 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-27 10:06:39 +0100 |
commit | b64a3edb27b114253ac72ba413776d232b6c2e12 (patch) | |
tree | 16ba704e8c358f4cae3e3e70581be412429c91e6 /cpp/src/Ice/IPEndpointI.cpp | |
parent | ICE-6003 - Ice-3.6b.zip contains Makefile's in js dir (diff) | |
download | ice-b64a3edb27b114253ac72ba413776d232b6c2e12.tar.bz2 ice-b64a3edb27b114253ac72ba413776d232b6c2e12.tar.xz ice-b64a3edb27b114253ac72ba413776d232b6c2e12.zip |
Removed dead code (sync. connection establishment code)
Diffstat (limited to 'cpp/src/Ice/IPEndpointI.cpp')
-rw-r--r-- | cpp/src/Ice/IPEndpointI.cpp | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index b8df1f4da07..306f975c879 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -123,12 +123,6 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const } } -vector<ConnectorPtr> -IceInternal::IPEndpointI::connectors(Ice::EndpointSelectionType selType) const -{ - return _instance->resolve(_host, _port, selType, const_cast<IPEndpointI*>(this)); -} - const std::string& IceInternal::IPEndpointI::host() const { @@ -531,53 +525,6 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta __setNoDelete(false); } -vector<ConnectorPtr> -IceInternal::EndpointHostResolver::resolve(const string& host, int port, Ice::EndpointSelectionType selType, - const IPEndpointIPtr& endpoint) -{ - // - // Try to get the addresses without DNS lookup. If this doesn't - // work, we retry with DNS lookup (and observer). - // - NetworkProxyPtr networkProxy = _instance->networkProxy(); - if(!networkProxy) - { - vector<Address> addrs = getAddresses(host, port, _protocol, selType, _preferIPv6, false); - if(!addrs.empty()) - { - return endpoint->connectors(addrs, 0); - } - } - - ObserverHelperT<> observer; - const CommunicatorObserverPtr& obsv = _instance->initializationData().observer; - if(obsv) - { - observer.attach(obsv->getEndpointLookupObserver(endpoint)); - } - - vector<ConnectorPtr> connectors; - try - { - ProtocolSupport protocol = _protocol; - if(networkProxy) - { - networkProxy = networkProxy->resolveHost(_protocol); - if(networkProxy) - { - protocol = networkProxy->getProtocolSupport(); - } - } - connectors = endpoint->connectors(getAddresses(host, port, protocol, selType, _preferIPv6, true), networkProxy); - } - catch(const Ice::LocalException& ex) - { - observer.failed(ex.ice_name()); - throw; - } - return connectors; -} - void IceInternal::EndpointHostResolver::resolve(const string& host, int port, Ice::EndpointSelectionType selType, const IPEndpointIPtr& endpoint, const EndpointI_connectorsPtr& callback) |