Merge pull request OpenDDS#4718 from iguessthislldo/igtd/relay-multi-ip

Allow RtpsRelay Clients With Multiple IP Addresses
iguessthislldo · Jul 3, 2024 · 3092ae7 · 3092ae7
2 parents 58625a1 + 80dc3bd
commit 3092ae7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/docs/news.d/relay-multi-ip.rst b/docs/news.d/relay-multi-ip.rst
@@ -0,0 +1,5 @@
+.. news-prs: 4718
+
+.. news-start-section: Fixes
+- RtpsRelay: Recognize clients that are using different IP addresses for SPDP and SEDP.
+.. news-end-section
diff --git a/tools/rtpsrelay/GuidAddrSet.cpp b/tools/rtpsrelay/GuidAddrSet.cpp
@@ -208,7 +208,7 @@ bool GuidAddrSet::ignore_rtps(bool from_application_participant,
     pos->second.allow_rtps = true;
 
     if (config_.log_activity()) {
-      ACE_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) INFO: GuidAddrSet::record_activity ")
+      ACE_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) INFO: GuidAddrSet::ignore_rtps ")
                  ACE_TEXT("%C was admitted %C into session\n"),
                  guid_to_string(guid).c_str(),
                  pos->second.get_session_time(now).sec_str().c_str()));
@@ -246,7 +246,7 @@ bool GuidAddrSet::ignore_rtps(bool from_application_participant,
   admitted = true;
 
   if (config_.log_activity()) {
-    ACE_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) INFO: GuidAddrSet::record_activity ")
+    ACE_DEBUG((LM_INFO, ACE_TEXT("(%P|%t) INFO: GuidAddrSet::ignore_rtps ")
                ACE_TEXT("%C was admitted %C into session\n"),
                guid_to_string(guid).c_str(),
                pos->second.get_session_time(now).sec_str().c_str()));

diff --git a/tools/rtpsrelay/GuidAddrSet.h b/tools/rtpsrelay/GuidAddrSet.h
@@ -163,8 +163,12 @@ struct AddrSetStats {
 
   bool has_discovery_addrs() const
   {
+    bool spdp = false;
+    bool sedp = false;
     for (const auto& ip : ip_to_ports) {
-      if (!ip.second.spdp_ports.empty() && !ip.second.sedp_ports.empty()) {
+      spdp = spdp || !ip.second.spdp_ports.empty();
+      sedp = sedp || !ip.second.sedp_ports.empty();
+      if (spdp && sedp) {
         return true;
       }
     }