diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-01-23 15:39:06 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-01-23 15:39:06 +0100 |
| commit | 91bdb2c1b221a5ddcb6d9ec28e41ee1beffd5508 (patch) | |
| tree | 021d4d7f93712e5ea29542f88470401a4955ba27 /cpp/src/Ice/UdpTransceiver.cpp | |
| parent | Fixed ICE-7517 - Objective-C build failure (diff) | |
| download | ice-91bdb2c1b221a5ddcb6d9ec28e41ee1beffd5508.tar.bz2 ice-91bdb2c1b221a5ddcb6d9ec28e41ee1beffd5508.tar.xz ice-91bdb2c1b221a5ddcb6d9ec28e41ee1beffd5508.zip | |
Fixed multicast to also listen on link-locap IPv6 addressees
Diffstat (limited to 'cpp/src/Ice/UdpTransceiver.cpp')
| -rwxr-xr-x | cpp/src/Ice/UdpTransceiver.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp index b4f5520c184..9d32c38938e 100755 --- a/cpp/src/Ice/UdpTransceiver.cpp +++ b/cpp/src/Ice/UdpTransceiver.cpp @@ -771,11 +771,14 @@ IceInternal::UdpTransceiver::toDetailedString() const { ostringstream os; os << toString(); - string addr = isAddressValid(_mcastAddr) ? _mcastInterface : inetAddrToString(_addr); - vector<string> intfs = getHostsForEndpointExpand(addr, _instance->protocolSupport(), true); - if(isAddressValid(_mcastAddr) && intfs.empty()) + vector<string> intfs; + if(isAddressValid(_mcastAddr)) + { + intfs = getInterfacesForMulticast(_mcastInterface, _mcastAddr); + } + else { - intfs.push_back(_mcastInterface); + intfs = getHostsForEndpointExpand(inetAddrToString(_addr), _instance->protocolSupport(), true); } if(!intfs.empty()) { |