Merge branch 'master' into xtypes

OpenDDS · Oct 17, 2020 · cf6bd79 · cf6bd79
2 parents a60589c + 5227b96
commit cf6bd79
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dds/DCPS/LinuxNetworkConfigMonitor.cpp b/dds/DCPS/LinuxNetworkConfigMonitor.cpp
@@ -225,7 +225,7 @@ void LinuxNetworkConfigMonitor::process_message(const nlmsghdr* header)
       }
 
       remove_interface(msg->ifi_index);
-      add_interface(NetworkInterface(msg->ifi_index, name, msg->ifi_flags & IFF_MULTICAST));
+      add_interface(NetworkInterface(msg->ifi_index, name, msg->ifi_flags & (IFF_MULTICAST | IFF_LOOPBACK)));
     }
     break;
   case RTM_DELLINK:

diff --git a/dds/DCPS/RTPS/RtpsDiscovery.cpp b/dds/DCPS/RTPS/RtpsDiscovery.cpp
@@ -126,6 +126,10 @@ RtpsDiscovery::Config::discovery_config(ACE_Configuration_Heap& cf)
       // spdpaddr defaults to DCPSDefaultAddress if set
       if (TheServiceParticipant->default_address() != ACE_INET_Addr()) {
         config->spdp_local_address(TheServiceParticipant->default_address());
+        ACE_TCHAR buff[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1];
+        TheServiceParticipant->default_address().addr_to_string(static_cast<ACE_TCHAR*>(buff), ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 1);
+        OPENDDS_STRING addr_str(ACE_TEXT_ALWAYS_CHAR(static_cast<const ACE_TCHAR*>(buff)));
+        config->multicast_interface(addr_str.substr(0, addr_str.find_first_of(':')));
       }
 
       DCPS::ValueMap values;