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

ivanpauno · web-flow · commit fd5e56a0e633 · 2020-07-20T10:38:49.000-03:00
Signed-off-by: Ivan Santiago Paunovic &lt;ivanpauno@ekumenlabs.com&gt;
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;
 

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,9 @@ rcl_init(`
`152`	`152`	`goto fail;`
`153`	`153`	`}`
`154`	`154`	`}`
	`155`	`+ if (RMW_DEFAULT_DOMAIN_ID == *domain_id) {`
	`156`	`+ *domain_id = 0u;`
	`157`	`+ }`
`155`	`158`
`156`	`159`	`rmw_localhost_only_t * localhost_only =`
`157`	`160`	`&context->impl->init_options.impl->rmw_init_options.localhost_only;`
Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,9 @@ rcl_node_init(`
`260`	`260`	`goto fail;`
`261`	`261`	`}`
`262`	`262`	`}`
	`263`	`+ if (RMW_DEFAULT_DOMAIN_ID == domain_id) {`
	`264`	`+ domain_id = 0u;`
	`265`	`+ }`
`263`	`266`	`RCUTILS_LOG_DEBUG_NAMED(ROS_PACKAGE_NAME, "Using domain ID of '%zu'", domain_id);`
`264`	`267`	`node->impl->actual_domain_id = domain_id;`
`265`	`268`