diff options
Diffstat (limited to 'cpp/src/IceGridLib/DiscoveryPluginI.cpp')
| -rw-r--r-- | cpp/src/IceGridLib/DiscoveryPluginI.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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"); } |