Set domain id to 0 if it is RMW_DEFAULT_DOMAIN_ID (#719)

Signed-off-by: Ivan Santiago Paunovic <[email protected]>
ros2 · Jul 20, 2020 · fd5e56a · fd5e56a
1 parent f172071
commit fd5e56a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/rcl/src/rcl/init.c b/rcl/src/rcl/init.c
@@ -152,6 +152,9 @@ rcl_init(
       goto fail;
     }
   }
+  if (RMW_DEFAULT_DOMAIN_ID == *domain_id) {
+    *domain_id = 0u;
+  }
 
   rmw_localhost_only_t * localhost_only =
     &context->impl->init_options.impl->rmw_init_options.localhost_only;

diff --git a/rcl/src/rcl/node.c b/rcl/src/rcl/node.c
@@ -260,6 +260,9 @@ rcl_node_init(
       goto fail;
     }
   }
+  if (RMW_DEFAULT_DOMAIN_ID == domain_id) {
+    domain_id = 0u;
+  }
   RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Using domain ID of '%zu'", domain_id);
   node->impl->actual_domain_id = domain_id;