From 91bdb2c1b221a5ddcb6d9ec28e41ee1beffd5508 Mon Sep 17 00:00:00 2001
From: Benoit Foucher <benoit@zeroc.com>
Date: Mon, 23 Jan 2017 15:39:06 +0100
Subject: Fixed multicast to also listen on link-locap IPv6 addressees

---
 cpp/src/Ice/UdpTransceiver.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/UdpTransceiver.cpp')

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())
     {
-- 
cgit v1.2.3