diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-27 19:11:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-27 19:11:20 +0100 |
| commit | 8c701618a42fc6c08456e53154bac1a1d40f9534 (patch) | |
| tree | c6683dbbd27d9d85aa9d9b139ca0e2bd175ef54d /cpp/src | |
| parent | ICE-5781: UDP test failure with IPv6 on OS X (diff) | |
| download | ice-8c701618a42fc6c08456e53154bac1a1d40f9534.tar.bz2 ice-8c701618a42fc6c08456e53154bac1a1d40f9534.tar.xz ice-8c701618a42fc6c08456e53154bac1a1d40f9534.zip | |
Fixed IceDiscovery and IceGridDiscovery to check for Ice.PreferIPv6Address to configure UDP
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceDiscovery/PluginI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Client.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/IceGridLib/DiscoveryPluginI.cpp | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/IceDiscovery/PluginI.cpp b/cpp/src/IceDiscovery/PluginI.cpp index 88c2bb91ba5..60bdf42e9a4 100644 --- a/cpp/src/IceDiscovery/PluginI.cpp +++ b/cpp/src/IceDiscovery/PluginI.cpp @@ -41,8 +41,9 @@ PluginI::initialize() Ice::PropertiesPtr properties = _communicator->getProperties(); bool ipv4 = properties->getPropertyAsIntWithDefault("Ice.IPv4", 1) > 0; + bool preferIPv6 = properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0; string address; - if(ipv4) + if(ipv4 && !preferIPv6) { address = properties->getPropertyWithDefault("IceDiscovery.Address", "239.255.0.1"); } diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp index 6e9b51388e2..20e8fe7cdc4 100644 --- a/cpp/src/IceGrid/Client.cpp +++ b/cpp/src/IceGrid/Client.cpp @@ -551,7 +551,8 @@ Client::run(StringSeq& originalArgs) { bool ipv4 = properties->getPropertyAsIntWithDefault("Ice.IPv4", 1) > 0; string address; - if(ipv4) + bool preferIPv6 = properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0; + if(ipv4 && !preferIPv6) { address = properties->getPropertyWithDefault("IceGridAdmin.Discovery.Address", "239.255.0.1"); } diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp index 843b8b15cfa..e49f0cf49bf 100644 --- a/cpp/src/IceGrid/RegistryI.cpp +++ b/cpp/src/IceGrid/RegistryI.cpp @@ -577,8 +577,9 @@ RegistryI::startImpl() if(properties->getPropertyAsIntWithDefault("IceGrid.Registry.Discovery.Enabled", 1) > 0) { bool ipv4 = properties->getPropertyAsIntWithDefault("Ice.IPv4", 1) > 0; + bool preferIPv6 = properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0; string address; - if(ipv4) + if(ipv4 && !preferIPv6) { address = properties->getPropertyWithDefault("IceGrid.Registry.Discovery.Address", "239.255.0.1"); } diff --git a/cpp/src/IceGridLib/DiscoveryPluginI.cpp b/cpp/src/IceGridLib/DiscoveryPluginI.cpp index b6c587d6c09..c9803cdf3e5 100644 --- a/cpp/src/IceGridLib/DiscoveryPluginI.cpp +++ b/cpp/src/IceGridLib/DiscoveryPluginI.cpp @@ -179,8 +179,9 @@ DiscoveryPluginI::initialize() Ice::PropertiesPtr properties = _communicator->getProperties(); bool ipv4 = properties->getPropertyAsIntWithDefault("Ice.IPv4", 1) > 0; + bool preferIPv6 = properties->getPropertyAsInt("Ice.PreferIPv6Address") > 0; string address; - if(ipv4) + if(ipv4 && !preferIPv6) { address = properties->getPropertyWithDefault("IceGridDiscovery.Address", "239.255.0.1"); } |