summaryrefslogtreecommitdiff
path: root/cpp/src/IceDiscovery/PluginI.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-08-14 07:19:13 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-08-14 07:19:13 +0200
commitb0f0bc95d4db337fa4250dd8c320d921908f55a2 (patch)
tree477644c3b5b3822f4d12a5a269406d2928aebf2e /cpp/src/IceDiscovery/PluginI.cpp
parentAnother minor fix for Expect.py script (diff)
downloadice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.bz2
ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.xz
ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.zip
Revert "Fixed ICE-6707 - default interface for discovery is now Ice.Default.Host if it is set"
This reverts commit 406e393f2be3a29830a7758e58e4e674afc5e21e.
Diffstat (limited to 'cpp/src/IceDiscovery/PluginI.cpp')
-rw-r--r--cpp/src/IceDiscovery/PluginI.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp
index cbc9a22c5f0..e0e1a7f9849 100644
--- a/cpp/src/IceDiscovery/PluginI.cpp
+++ b/cpp/src/IceDiscovery/PluginI.cpp
@@ -14,8 +14,6 @@
#include <IceDiscovery/LocatorI.h>
#include <IceDiscovery/LookupI.h>
-#include <Ice/Network.h>
-
using namespace std;
using namespace IceDiscovery;
@@ -74,27 +72,6 @@ PluginI::initialize()
}
int port = properties->getPropertyAsIntWithDefault("IceDiscovery.Port", 4061);
string interface = properties->getProperty("IceDiscovery.Interface");
- string defaultHost = properties->getProperty("Ice.Default.Host");
- if(interface.empty() && !defaultHost.empty())
- {
- //
- // Make sure the interface is an IP address, the UDP --interface option
- // doesn't support DNS names.
- //
- IceInternal::ProtocolSupport protocol = ipv4 && !preferIPv6 ? IceInternal::EnableIPv4 : IceInternal::EnableIPv6;
- try
- {
- IceInternal::Address address = IceInternal::getAddressForServer(defaultHost, 0, protocol, preferIPv6);
- if(IceInternal::isAddressValid(address))
- {
- interface = IceInternal::inetAddrToString(address);
- }
- }
- catch(const Ice::LocalException&)
- {
- // Ignore
- }
- }
if(properties->getProperty("IceDiscovery.Multicast.Endpoints").empty())
{