10 ➡️ 11 (main) (#260)

Signed-off-by: Louise Poubel <louise@openrobotics.org>

CMakeLists.txt

@@ -9,7 +9,7 @@ project(ignition-transport11 VERSION 11.0.0)
 # Find ignition-cmake
 #============================================================================
 # If you get an error at this line, you need to install ignition-cmake
-find_package(ignition-cmake2 2.3 REQUIRED)
+find_package(ignition-cmake2 2.8.0 REQUIRED)
 set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
 
 #============================================================================

Changelog.md

@@ -32,6 +32,26 @@
 
 ### Ignition Transport 9.X.X
 
+### Ignition Transport 9.1.1 (2021-01-05)
+
+1. Add errno output for discovery.
+   * [Github pull request 254](https://github.com/ignitionrobotics/ign-transport/pull/254)
+
+1. Consider all network interfaces when checking HOST option.
+   * [Github pull request 245](https://github.com/ignitionrobotics/ign-transport/pull/245)
+
+1. Remove tools/code_check and update codecov. 
+   * [Github pull request 246](https://github.com/ignitionrobotics/ign-transport/pull/246)
+
+1. Remove deprecated test.
+   * [Github pull request 239](https://github.com/ignitionrobotics/ign-transport/pull/239)
+
+1. Master branch updates.
+   * [Github pull request 224](https://github.com/ignitionrobotics/ign-transport/pull/224)
+
+1. Add windows installation.
+   * [Github pull request 214](https://github.com/ignitionrobotics/ign-transport/pull/214)
+
 ### Ignition Transport 9.1.0 (2021-01-05)
 
 1. All changes up to version 8.2.0.

include/ignition/transport/Discovery.hh

@@ -901,6 +901,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;
@@ -926,7 +930,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;
             }
@@ -979,7 +983,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;
               }
@@ -1051,7 +1055,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;
             }
@@ -1169,6 +1173,7 @@ namespace ignition
           // Send the discovery message to the unicast relays.
           for (const auto &sockAddr : this->relayAddrs)
           {
+            errno = 0;
             auto sent = sendto(this->sockets.at(0),
               reinterpret_cast<const raw_type *>(
                 reinterpret_cast<const unsigned char*>(buffer)),
@@ -1178,7 +1183,9 @@ namespace ignition
 
             if (sent != totalSize)
             {
-              std::cerr << "Exception sending a unicast message" << std::endl;
+              std::cerr << "Exception sending a unicast message:" << std::endl;
+              std::cerr << "  Return value: " << sent << std::endl;
+              std::cerr << "  Error code: " << strerror(errno) << std::endl;
               break;
             }
           }

test/regression/CMakeLists.txt

@@ -4,13 +4,3 @@ ign_get_sources(tests)
 
 ign_build_tests(TYPE REGRESSION SOURCES ${tests}
   LIB_DEPS ${EXTRA_TEST_LIB_DEPS})
-
-if(TARGET REGRESSION_deprecated)
-  # Turn off deprecation warnings specifically for the test of deprecated
-  # functions.
-  if(UNIX)
-    target_compile_options(REGRESSION_deprecated PRIVATE -Wno-deprecated-declarations)
-  elseif(MSVC)
-    target_compile_options(REGRESSION_deprecated PRIVATE /wd4996)
-  endif()
-endif()