Revert "Fixed ICE-6707 - default interface for discovery is now Ice.Default.Host if it is set"

This reverts commit 406e393f2be3a29830a7758e58e4e674afc5e21e.

1 files changed, 0 insertions, 23 deletions

diff --git a/cpp/src/IceLocatorDiscovery/PluginI.cpp b/cpp/src/IceLocatorDiscovery/PluginI.cpp
index 65844d39c3f..bf30aa4cf8e 100644
--- a/cpp/src/IceLocatorDiscovery/PluginI.cpp
+++ b/cpp/src/IceLocatorDiscovery/PluginI.cpp
@@ -13,8 +13,6 @@
 #include <IceLocatorDiscovery/PluginI.h>
 #include <IceLocatorDiscovery/IceLocatorDiscovery.h>
 
-#include <Ice/Network.h>
-
 using namespace std;
 using namespace IceLocatorDiscovery;
 
@@ -204,27 +202,6 @@ PluginI::initialize()
     }
     int port = properties->getPropertyAsIntWithDefault("IceLocatorDiscovery.Port", 4061);
     string intf = properties->getProperty("IceLocatorDiscovery.Interface");
-    string defaultHost = properties->getProperty("Ice.Default.Host");
-    if(intf.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))
-            {
-                intf = IceInternal::inetAddrToString(address);
-            }
-        }
-        catch(const Ice::LocalException&)
-        {
-            // Ignore
-        }
-    }
 
     if(properties->getProperty("IceLocatorDiscovery.Reply.Endpoints").empty())
     {