From c43a6f7c01a56c921deb85fe795e38f685f60891 Mon Sep 17 00:00:00 2001
From: Irene Bandera <irenebandera@eprosima.com>
Date: Fri, 30 Aug 2024 11:42:50 +0200
Subject: [PATCH] Remove unnecessary whitelist and listener port

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
---
 .../src/cpp/participant/dds/CommonParticipant.cpp           | 2 +-
 .../src/cpp/participant/dds/DiscoveryServerParticipant.cpp  | 6 ------
 .../src/cpp/participant/dds/InitialPeersParticipant.cpp     | 6 ------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp b/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp
index 7f90376a..a4b9b495 100644
--- a/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp
+++ b/ddspipe_participants/src/cpp/participant/dds/CommonParticipant.cpp
@@ -499,7 +499,7 @@ CommonParticipant::reckon_participant_qos_(
 
 fastdds::dds::DomainParticipant* CommonParticipant::create_dds_participant_()
 {
-    // Set listener mask so reader read its own messages TODO Irene: check if this is needed
+    // Set listener mask so reader read its own messages
     fastdds::dds::StatusMask mask;
     mask << fastdds::dds::StatusMask::publication_matched();
     mask << fastdds::dds::StatusMask::subscription_matched();
diff --git a/ddspipe_participants/src/cpp/participant/dds/DiscoveryServerParticipant.cpp b/ddspipe_participants/src/cpp/participant/dds/DiscoveryServerParticipant.cpp
index 6ee6e9fe..8963ade5 100644
--- a/ddspipe_participants/src/cpp/participant/dds/DiscoveryServerParticipant.cpp
+++ b/ddspipe_participants/src/cpp/participant/dds/DiscoveryServerParticipant.cpp
@@ -254,7 +254,6 @@ DiscoveryServerParticipant::reckon_participant_qos_(
                         auto descriptor_tmp =
                                 create_descriptor<eprosima::fastdds::rtps::UDPv4TransportDescriptor>(
                             participant_configuration->whitelist);
-                        // descriptor_tmp->interfaceWhiteList.push_back(address.ip());
                         descriptor = descriptor_tmp;
                     }
 
@@ -271,7 +270,6 @@ DiscoveryServerParticipant::reckon_participant_qos_(
                         auto descriptor_tmp =
                                 create_descriptor<eprosima::fastdds::rtps::UDPv6TransportDescriptor>(
                             participant_configuration->whitelist);
-                        // descriptor_tmp->interfaceWhiteList.push_back(address.ip());
                         descriptor = descriptor_tmp;
                     }
 
@@ -288,8 +286,6 @@ DiscoveryServerParticipant::reckon_participant_qos_(
                         auto descriptor_tmp =
                                 create_descriptor<eprosima::fastdds::rtps::TCPv4TransportDescriptor>(
                             participant_configuration->whitelist);
-                        descriptor_tmp->add_listener_port(0);
-                        // descriptor_tmp->interfaceWhiteList.push_back(address.ip());
 
                         // Enable TLS
                         if (tls_config.is_active())
@@ -314,8 +310,6 @@ DiscoveryServerParticipant::reckon_participant_qos_(
                         auto descriptor_tmp =
                                 create_descriptor<eprosima::fastdds::rtps::TCPv6TransportDescriptor>(
                             participant_configuration->whitelist);
-                        // descriptor_tmp->add_listener_port(0);
-                        descriptor_tmp->interfaceWhiteList.push_back(address.ip());
 
                         // Enable TLS
                         if (tls_config.is_active())
diff --git a/ddspipe_participants/src/cpp/participant/dds/InitialPeersParticipant.cpp b/ddspipe_participants/src/cpp/participant/dds/InitialPeersParticipant.cpp
index 16ac4455..e936a08a 100644
--- a/ddspipe_participants/src/cpp/participant/dds/InitialPeersParticipant.cpp
+++ b/ddspipe_participants/src/cpp/participant/dds/InitialPeersParticipant.cpp
@@ -234,7 +234,6 @@ InitialPeersParticipant::reckon_participant_qos_(
                     auto descriptor_tmp =
                             create_descriptor<eprosima::fastdds::rtps::UDPv4TransportDescriptor>(
                         participant_configuration->whitelist);
-                    // descriptor_tmp->interfaceWhiteList.push_back(connection_address.ip());
                     descriptor = descriptor_tmp;
 
                     // To avoid creating a multicast transport in UDP when non listening addresses
@@ -257,7 +256,6 @@ InitialPeersParticipant::reckon_participant_qos_(
                     auto descriptor_tmp =
                             create_descriptor<eprosima::fastdds::rtps::UDPv6TransportDescriptor>(
                         participant_configuration->whitelist);
-                    // descriptor_tmp->interfaceWhiteList.push_back(connection_address.ip());
                     descriptor = descriptor_tmp;
 
                     // To avoid creating a multicast transport in UDP when non listening addresses
@@ -280,8 +278,6 @@ InitialPeersParticipant::reckon_participant_qos_(
                     auto descriptor_tmp =
                             create_descriptor<eprosima::fastdds::rtps::TCPv4TransportDescriptor>(
                         participant_configuration->whitelist);
-                    descriptor_tmp->add_listener_port(0);
-                    // descriptor_tmp->interfaceWhiteList.push_back(address.ip());
 
                     // Enable TLS
                     if (tls_config.is_active())
@@ -306,8 +302,6 @@ InitialPeersParticipant::reckon_participant_qos_(
                     auto descriptor_tmp =
                             create_descriptor<eprosima::fastdds::rtps::TCPv6TransportDescriptor>(
                         participant_configuration->whitelist);
-                    // descriptor_tmp->add_listener_port(0);
-                    descriptor_tmp->interfaceWhiteList.push_back(connection_address.ip());
 
                     // Enable TLS
                     if (tls_config.is_active())