Consider all network interfaces when checking HOST option. (#245)

* Consider all network interfaces when checking HOST option. Signed-off-by: Carlos Agüero <[email protected]> * Update localhost address. Signed-off-by: Carlos Agüero <[email protected]>
gazebosim · May 17, 2021 · f083307 · f083307
1 parent b58e30c
commit f083307
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/include/ignition/transport/Discovery.hh b/include/ignition/transport/Discovery.hh
@@ -898,6 +898,10 @@ namespace ignition
           this->SendUnicast(msg);
         }
 
+        bool isSenderLocal = (std::find(this->hostInterfaces.begin(),
+          this->hostInterfaces.end(), _fromIp) != this->hostInterfaces.end()) ||
+          (_fromIp.find("127.") == 0);
+
         // Update timestamp and cache the callbacks.
         DiscoveryCallback<Pub> connectCb;
         DiscoveryCallback<Pub> disconnectCb;
@@ -923,7 +927,7 @@ namespace ignition
             // Check scope of the topic.
             if ((publisher.Options().Scope() == Scope_t::PROCESS) ||
                 (publisher.Options().Scope() == Scope_t::HOST &&
-                 _fromIp != this->hostAddr))
+                 !isSenderLocal))
             {
               return;
             }
@@ -976,7 +980,7 @@ namespace ignition
               // Check scope of the topic.
               if ((nodeInfo.Options().Scope() == Scope_t::PROCESS) ||
                   (nodeInfo.Options().Scope() == Scope_t::HOST &&
-                   _fromIp != this->hostAddr))
+                   !isSenderLocal))
               {
                 continue;
               }
@@ -1048,7 +1052,7 @@ namespace ignition
             // Check scope of the topic.
             if ((publisher.Options().Scope() == Scope_t::PROCESS) ||
                 (publisher.Options().Scope() == Scope_t::HOST &&
-                 _fromIp != this->hostAddr))
+                 !isSenderLocal))
             {
               return;
             }