diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
| commit | b0f0bc95d4db337fa4250dd8c320d921908f55a2 (patch) | |
| tree | 477644c3b5b3822f4d12a5a269406d2928aebf2e /csharp/src | |
| parent | Another minor fix for Expect.py script (diff) | |
| download | ice-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 'csharp/src')
| -rw-r--r-- | csharp/src/IceDiscovery/PluginI.cs | 22 | ||||
| -rw-r--r-- | csharp/src/IceLocatorDiscovery/PluginI.cs | 22 |
2 files changed, 0 insertions, 44 deletions
diff --git a/csharp/src/IceDiscovery/PluginI.cs b/csharp/src/IceDiscovery/PluginI.cs index 0c09c4884a7..69e3a6c0667 100644 --- a/csharp/src/IceDiscovery/PluginI.cs +++ b/csharp/src/IceDiscovery/PluginI.cs @@ -12,7 +12,6 @@ namespace IceDiscovery using System; using System.Text; using System.Collections.Generic; - using System.Net; public sealed class PluginFactory : Ice.PluginFactory { @@ -48,27 +47,6 @@ namespace IceDiscovery } int port = properties.getPropertyAsIntWithDefault("IceDiscovery.Port", 4061); string intf = properties.getProperty("IceDiscovery.Interface"); - string defaultHost = properties.getProperty("Ice.Default.Host"); - if(intf.Length == 0 && defaultHost.Length > 0) - { - // - // Make sure the interface is an IP address, the UDP --interface option - // doesn't support DNS names. - // - int protocol = ipv4 && !preferIPv6 ? IceInternal.Network.EnableIPv4 : IceInternal.Network.EnableIPv6; - try - { - EndPoint addr = IceInternal.Network.getAddressForServer(defaultHost, 0, protocol, preferIPv6); - if(addr != null) - { - intf = IceInternal.Network.endpointAddressToString(addr); - } - } - catch(Ice.LocalException) - { - // Ignore - } - } if(properties.getProperty("IceDiscovery.Multicast.Endpoints").Length == 0) { diff --git a/csharp/src/IceLocatorDiscovery/PluginI.cs b/csharp/src/IceLocatorDiscovery/PluginI.cs index 3c9f9b3628f..ccf9b266850 100644 --- a/csharp/src/IceLocatorDiscovery/PluginI.cs +++ b/csharp/src/IceLocatorDiscovery/PluginI.cs @@ -13,7 +13,6 @@ namespace IceLocatorDiscovery using System.Collections.Generic; using System.Diagnostics; using System.Text; - using System.Net; public sealed class PluginFactory : Ice.PluginFactory { @@ -374,27 +373,6 @@ namespace IceLocatorDiscovery } int port = properties.getPropertyAsIntWithDefault("IceLocatorDiscovery.Port", 4061); string intf = properties.getProperty("IceLocatorDiscovery.Interface"); - string defaultHost = properties.getProperty("Ice.Default.Host"); - if(intf.Length == 0 && defaultHost.Length > 0) - { - // - // Make sure the interface is an IP address, the UDP --interface option - // doesn't support DNS names. - // - int protocol = ipv4 && !preferIPv6 ? IceInternal.Network.EnableIPv4 : IceInternal.Network.EnableIPv6; - try - { - EndPoint addr = IceInternal.Network.getAddressForServer(defaultHost, 0, protocol, preferIPv6); - if(addr != null) - { - intf = IceInternal.Network.endpointAddressToString(addr); - } - } - catch(Ice.LocalException) - { - // Ignore - } - } if(properties.getProperty("IceLocatorDiscovery.Reply.Endpoints").Length == 0) { |