diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-08-21 13:11:48 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-08-21 13:11:48 +0000 |
| commit | 88454251d3356793b4f1cc6d3f07929280a012bd (patch) | |
| tree | 84a663bceb5ecd363c294418ccd5fe6ef3d977c3 /cppe/src | |
| parent | Try loopback in client when no -h (diff) | |
| download | ice-88454251d3356793b4f1cc6d3f07929280a012bd.tar.bz2 ice-88454251d3356793b4f1cc6d3f07929280a012bd.tar.xz ice-88454251d3356793b4f1cc6d3f07929280a012bd.zip | |
Try loopback in client if no -h
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Endpoint.h | 2 | ||||
| -rw-r--r-- | cppe/src/IceE/ObjectAdapter.cpp | 2 | ||||
| -rw-r--r-- | cppe/src/IceE/ReferenceFactory.cpp | 2 | ||||
| -rw-r--r-- | cppe/src/IceE/UnknownEndpoint.cpp | 2 | ||||
| -rw-r--r-- | cppe/src/IceE/UnknownEndpoint.h | 2 | ||||
| -rw-r--r-- | cppe/src/TcpTransport/TcpEndpoint.cpp | 9 | ||||
| -rw-r--r-- | cppe/src/TcpTransport/TcpEndpoint.h | 2 |
7 files changed, 9 insertions, 12 deletions
diff --git a/cppe/src/IceE/Endpoint.h b/cppe/src/IceE/Endpoint.h index ea30844b7d3..77b5820d695 100644 --- a/cppe/src/IceE/Endpoint.h +++ b/cppe/src/IceE/Endpoint.h @@ -85,7 +85,7 @@ public: // Expand endpoint out in to separate endpoints for each local // host if endpoint was configured with no host set. // - virtual std::vector<EndpointPtr> expand(bool) const = 0; + virtual std::vector<EndpointPtr> expand() const = 0; // // Return whether the endpoint should be published in proxies diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp index e9b6a88e774..5676bb3f248 100644 --- a/cppe/src/IceE/ObjectAdapter.cpp +++ b/cppe/src/IceE/ObjectAdapter.cpp @@ -870,7 +870,7 @@ Ice::ObjectAdapter::parseEndpoints(const string& str) const ex.str = s; throw ex; } - vector<EndpointPtr> endps = endp->expand(true); + vector<EndpointPtr> endps = endp->expand(); endpoints.insert(endpoints.end(), endps.begin(), endps.end()); ++end; diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp index 1c07371db19..2bd51400b97 100644 --- a/cppe/src/IceE/ReferenceFactory.cpp +++ b/cppe/src/IceE/ReferenceFactory.cpp @@ -476,7 +476,7 @@ IceInternal::ReferenceFactory::create(const string& str) EndpointPtr endp = _instance->endpointFactory()->create(es); if(endp != 0) { - vector<EndpointPtr> endps = endp->expand(false); + vector<EndpointPtr> endps = endp->expand(); endpoints.insert(endpoints.end(), endps.begin(), endps.end()); } else diff --git a/cppe/src/IceE/UnknownEndpoint.cpp b/cppe/src/IceE/UnknownEndpoint.cpp index 93a770607e7..5b699583e4f 100644 --- a/cppe/src/IceE/UnknownEndpoint.cpp +++ b/cppe/src/IceE/UnknownEndpoint.cpp @@ -88,7 +88,7 @@ IceInternal::UnknownEndpoint::publish() const #endif vector<EndpointPtr> -IceInternal::UnknownEndpoint::expand(bool includeLoopback) const +IceInternal::UnknownEndpoint::expand() const { assert(false); vector<EndpointPtr> ret; diff --git a/cppe/src/IceE/UnknownEndpoint.h b/cppe/src/IceE/UnknownEndpoint.h index 931624c4d3b..00719078187 100644 --- a/cppe/src/IceE/UnknownEndpoint.h +++ b/cppe/src/IceE/UnknownEndpoint.h @@ -32,7 +32,7 @@ public: virtual AcceptorPtr acceptor(EndpointPtr&) const; virtual bool publish() const; #endif - virtual std::vector<EndpointPtr> expand(bool) const; + virtual std::vector<EndpointPtr> expand() const; virtual bool operator==(const Endpoint&) const; virtual bool operator!=(const Endpoint&) const; diff --git a/cppe/src/TcpTransport/TcpEndpoint.cpp b/cppe/src/TcpTransport/TcpEndpoint.cpp index feba1a5daab..50adcb6a6e0 100644 --- a/cppe/src/TcpTransport/TcpEndpoint.cpp +++ b/cppe/src/TcpTransport/TcpEndpoint.cpp @@ -349,7 +349,7 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const } vector<EndpointPtr> -IceInternal::TcpEndpoint::expand(bool includeLoopback) const +IceInternal::TcpEndpoint::expand() const { vector<EndpointPtr> endps; if(_host == "0.0.0.0") @@ -357,11 +357,8 @@ IceInternal::TcpEndpoint::expand(bool includeLoopback) const vector<string> hosts = getLocalHosts(); for(unsigned int i = 0; i < hosts.size(); ++i) { - if(includeLoopback || hosts.size() == 1 || hosts[i] != "127.0.0.1") - { - endps.push_back(new TcpEndpoint(_instance, hosts[i], _port, _timeout, - hosts.size() == 1 || hosts[i] != "127.0.0.1")); - } + endps.push_back(new TcpEndpoint(_instance, hosts[i], _port, _timeout, + hosts.size() == 1 || hosts[i] != "127.0.0.1")); } } else diff --git a/cppe/src/TcpTransport/TcpEndpoint.h b/cppe/src/TcpTransport/TcpEndpoint.h index 56b0806fd90..46fe760aa9f 100644 --- a/cppe/src/TcpTransport/TcpEndpoint.h +++ b/cppe/src/TcpTransport/TcpEndpoint.h @@ -36,7 +36,7 @@ public: virtual AcceptorPtr acceptor(EndpointPtr&) const; virtual bool publish() const; #endif - virtual std::vector<EndpointPtr> expand(bool) const; + virtual std::vector<EndpointPtr> expand() const; virtual bool operator==(const Endpoint&) const; virtual bool operator!=(const Endpoint&) const; |