From 1755a3149f1a95008ad14bc118e5ad61947f192d Mon Sep 17 00:00:00 2001
From: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
Date: Mon, 6 Jul 2020 16:20:58 -0300
Subject: [PATCH] Delete domain_id and localhost_only from node API

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
---
 rmw_connext_cpp/src/rmw_node.cpp              |  6 ++----
 .../include/rmw_connext_shared_cpp/node.hpp   |  4 +---
 rmw_connext_shared_cpp/src/node.cpp           | 21 ++++++++++---------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/rmw_connext_cpp/src/rmw_node.cpp b/rmw_connext_cpp/src/rmw_node.cpp
index 5c60aa24..61de1e2a 100644
--- a/rmw_connext_cpp/src/rmw_node.cpp
+++ b/rmw_connext_cpp/src/rmw_node.cpp
@@ -26,12 +26,10 @@ rmw_node_t *
 rmw_create_node(
   rmw_context_t * context,
   const char * name,
-  const char * namespace_,
-  size_t domain_id,
-  bool localhost_only)
+  const char * namespace_)
 {
   return create_node(
-    rti_connext_identifier, context, name, namespace_, domain_id, localhost_only);
+    rti_connext_identifier, context, name, namespace_);
 }
 
 rmw_ret_t
diff --git a/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/node.hpp b/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/node.hpp
index 2e6facb8..8e877766 100644
--- a/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/node.hpp
+++ b/rmw_connext_shared_cpp/include/rmw_connext_shared_cpp/node.hpp
@@ -25,9 +25,7 @@ create_node(
   const char * implementation_identifier,
   rmw_context_t * context,
   const char * name,
-  const char * namespace_,
-  size_t domain_id,
-  bool localhost_only);
+  const char * namespace_);
 
 RMW_CONNEXT_SHARED_CPP_PUBLIC
 rmw_ret_t
diff --git a/rmw_connext_shared_cpp/src/node.cpp b/rmw_connext_shared_cpp/src/node.cpp
index 2567d840..d2b6e68e 100644
--- a/rmw_connext_shared_cpp/src/node.cpp
+++ b/rmw_connext_shared_cpp/src/node.cpp
@@ -32,9 +32,7 @@ create_node(
   const char * implementation_identifier,
   rmw_context_t * context,
   const char * name,
-  const char * namespace_,
-  size_t domain_id,
-  bool localhost_only)
+  const char * namespace_)
 {
   RCUTILS_CHECK_ARGUMENT_FOR_NULL(context, NULL);
   RMW_CHECK_TYPE_IDENTIFIERS_MATCH(
@@ -57,7 +55,7 @@ create_node(
     return NULL;
   }
 
-  if (localhost_only) {
+  if (context->options.localhost_only == RMW_LOCALHOST_ONLY_ENABLED) {
     status = DDS::PropertyQosPolicyHelper::add_property(
       participant_qos.property,
       "dds.transport.UDPv4.builtin.parent.allow_interfaces",
@@ -275,12 +273,15 @@ create_node(
   }
 
   // No custom handling of RMW_DEFAULT_DOMAIN_ID. Simply use a reasonable domain id.
-  participant = dpf_->create_participant(
-    static_cast<DDS::DomainId_t>(
-      domain_id != RMW_DEFAULT_DOMAIN_ID ? domain_id : 0u),
-    participant_qos,
-    NULL,
-    DDS::STATUS_MASK_NONE);
+  {
+    size_t domain_id = context->options.domain_id;
+    participant = dpf_->create_participant(
+      static_cast<DDS::DomainId_t>(
+        domain_id != RMW_DEFAULT_DOMAIN_ID ? domain_id : 0u),
+      participant_qos,
+      NULL,
+      DDS::STATUS_MASK_NONE);
+  }
   if (!participant) {
     RMW_SET_ERROR_MSG("failed to create participant");
     goto fail;