Apply review suggestions

Signed-off-by: cferreiragonz <[email protected]>
eProsima · Nov 12, 2024 · 4a9fb4e · 4a9fb4e
1 parent c627744
commit 4a9fb4e
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 59 deletions.
diff --git a/include/fastdds/dds/core/policy/ParameterTypes.hpp b/include/fastdds/dds/core/policy/ParameterTypes.hpp
@@ -168,7 +168,7 @@ enum ParameterId_t : uint16_t
     /* eProsima Fast DDS extensions */
     PID_PRODUCT_VERSION                     = 0x8000,
     PID_PERSISTENCE_GUID                    = 0x8002,
-    PID_HOST_ID                             = 0x8003,
+    PID_MACHINE_ID                          = 0x8003,
     PID_DISABLE_POSITIVE_ACKS               = 0x8005,
     PID_DATASHARING                         = 0x8006,
     PID_NETWORK_CONFIGURATION_SET           = 0x8007,

diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp
@@ -81,7 +81,7 @@ ParticipantProxyData::ParticipantProxyData(
         const ParticipantProxyData& pdata)
     : m_protocolVersion(pdata.m_protocolVersion)
     , m_guid(pdata.m_guid)
-    , m_host_id(pdata.m_host_id)
+    , machine_id(pdata.machine_id)
     , m_VendorId(pdata.m_VendorId)
     , product_version(pdata.product_version)
     , m_domain_id(pdata.m_domain_id)
@@ -176,11 +176,11 @@ uint32_t ParticipantProxyData::get_serialized_size(
     // PID_NETWORK_CONFIGURATION_SET
     ret_val += 4 + PARAMETER_NETWORKCONFIGSET_LENGTH;
 
-    if (m_host_id.size() > 0)
+    if (machine_id.size() > 0)
     {
-        // PID_HOST_ID
+        // PID_MACHINE_ID
         ret_val +=
-                fastdds::dds::ParameterSerializer<Parameter_t>::cdr_serialized_size(m_host_id);
+                fastdds::dds::ParameterSerializer<Parameter_t>::cdr_serialized_size(machine_id);
     }
 
     // PID_METATRAFFIC_MULTICAST_LOCATOR
@@ -331,9 +331,9 @@ bool ParticipantProxyData::writeToCDRMessage(
             return false;
         }
     }
-    if (m_host_id.size() > 0)
+    if (machine_id.size() > 0)
     {
-        ParameterString_t p(fastdds::dds::PID_HOST_ID, 0, m_host_id);
+        ParameterString_t p(fastdds::dds::PID_MACHINE_ID, 0, machine_id);
         if (!fastdds::dds::ParameterSerializer<ParameterString_t>::add_to_cdr_message(p, msg))
         {
             return false;
@@ -606,7 +606,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                         m_networkConfiguration = p.netconfigSet;
                         break;
                     }
-                    case fastdds::dds::PID_HOST_ID:
+                    case fastdds::dds::PID_MACHINE_ID:
                     {
                         // Ignore custom PID when coming from other vendors
                         if (c_VendorId_eProsima != m_VendorId)
@@ -625,7 +625,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                             return false;
                         }
 
-                        m_host_id = p.getName();
+                        machine_id = p.getName();
                         break;
                     }
                     case fastdds::dds::PID_METATRAFFIC_MULTICAST_LOCATOR:
@@ -647,7 +647,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                             Locator_t temp_locator;
                             if (network.transform_remote_locator(
                                         p.locator, temp_locator, m_networkConfiguration,
-                                        check_same_host()))
+                                        is_from_this_host()))
                             {
                                 ProxyDataFilters::filter_locators(
                                     network,
@@ -677,7 +677,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                             Locator_t temp_locator;
                             if (network.transform_remote_locator(
                                         p.locator, temp_locator, m_networkConfiguration,
-                                        check_same_host()))
+                                        is_from_this_host()))
                             {
                                 ProxyDataFilters::filter_locators(
                                     network,
@@ -707,7 +707,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                             Locator_t temp_locator;
                             if (network.transform_remote_locator(
                                         p.locator, temp_locator, m_networkConfiguration,
-                                        check_same_host()))
+                                        is_from_this_host()))
                             {
                                 ProxyDataFilters::filter_locators(
                                     network,
@@ -737,7 +737,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                             Locator_t temp_locator;
                             if (network.transform_remote_locator(
                                         p.locator, temp_locator, m_networkConfiguration,
-                                        check_same_host()))
+                                        is_from_this_host()))
                             {
                                 ProxyDataFilters::filter_locators(
                                     network,
@@ -893,12 +893,12 @@ bool ParticipantProxyData::readFromCDRMessage(
     }
 }
 
-bool ParticipantProxyData::check_same_host()
+bool ParticipantProxyData::is_from_this_host() const
 {
     bool same_host = false;
-    if (m_host_id.size() > 0)
+    if (machine_id.size() > 0)
     {
-        same_host = m_host_id == SystemInfo::instance().machine_id();
+        same_host = machine_id == SystemInfo::instance().machine_id();
     }
     else
     {
@@ -911,7 +911,7 @@ void ParticipantProxyData::clear()
 {
     m_protocolVersion = ProtocolVersion_t();
     m_guid = GUID_t();
-    m_host_id = "";
+    machine_id = "";
     //set_VendorId_Unknown(m_VendorId);
     m_VendorId = c_VendorId_Unknown;
     product_version = {};
@@ -945,7 +945,7 @@ void ParticipantProxyData::copy(
 {
     m_protocolVersion = pdata.m_protocolVersion;
     m_guid = pdata.m_guid;
-    m_host_id = pdata.m_host_id;
+    machine_id = pdata.machine_id;
     m_VendorId[0] = pdata.m_VendorId[0];
     m_VendorId[1] = pdata.m_VendorId[1];
     product_version = pdata.product_version;

diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp
@@ -77,8 +77,8 @@ class ParticipantProxyData
     ProtocolVersion_t m_protocolVersion;
     //!GUID
     GUID_t m_guid;
-    //!HOST ID
-    fastcdr::string_255 m_host_id;
+    //!Machine ID
+    fastcdr::string_255 machine_id;
     //!Vendor ID
     fastdds::rtps::VendorId_t m_VendorId;
     //! Product version
@@ -166,11 +166,11 @@ class ParticipantProxyData
             fastdds::rtps::VendorId_t source_vendor_id = c_VendorId_eProsima);
 
     /**
-     * Check if the host is the same as the one that sent the data.
-     * It tries to use the m_host_id. If it is not available, it will compare GUIDs.
+     * Check if the host where the current process is running is the same as the one that sent the data.
+     * It tries to use the machine_id. If it is not available, it will compare GUIDs.
      * @return True if the host is the same
      */
-    bool check_same_host();
+    bool is_from_this_host() const;
 
     //! Clear the data (restore to default state).
     void clear();

diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp
@@ -1193,12 +1193,12 @@ bool ReaderProxyData::readFromCDRMessage(
     return false;
 }
 
-bool ReaderProxyData::check_same_host()
+bool ReaderProxyData::is_from_this_host()
 {
     bool same_host = false;
-    if (m_host_id.size() > 0)
+    if (machine_id.size() > 0)
     {
-        same_host = m_host_id == SystemInfo::instance().machine_id();
+        same_host = machine_id == SystemInfo::instance().machine_id();
     }
     else
     {
@@ -1215,7 +1215,7 @@ void ReaderProxyData::clear()
     plugin_security_attributes_ = 0UL;
 #endif // if HAVE_SECURITY
     m_guid = c_Guid_Unknown;
-    m_host_id = "";
+    machine_id = "";
     m_networkConfiguration = 0;
     remote_locators_.unicast.clear();
     remote_locators_.multicast.clear();
@@ -1280,7 +1280,7 @@ void ReaderProxyData::copy(
         ReaderProxyData* rdata)
 {
     m_guid = rdata->m_guid;
-    m_host_id = rdata->m_host_id;
+    machine_id = rdata->machine_id;
     m_networkConfiguration = rdata->m_networkConfiguration;
     remote_locators_ = rdata->remote_locators_;
     m_key = rdata->m_key;
@@ -1349,7 +1349,7 @@ void ReaderProxyData::set_remote_unicast_locators(
     remote_locators_.unicast.clear();
     for (const Locator_t& locator : locators)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_unicast_locator(locator);
         }
@@ -1369,7 +1369,7 @@ void ReaderProxyData::set_multicast_locators(
     remote_locators_.multicast.clear();
     for (const Locator_t& locator : locators)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_multicast_locator(locator);
         }
@@ -1392,7 +1392,7 @@ void ReaderProxyData::set_remote_locators(
 
     for (const Locator_t& locator : locators.unicast)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_unicast_locator(locator);
         }
@@ -1402,7 +1402,7 @@ void ReaderProxyData::set_remote_locators(
     {
         for (const Locator_t& locator : locators.multicast)
         {
-            if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+            if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
             {
                 remote_locators_.add_multicast_locator(locator);
             }

diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.hpp b/src/cpp/rtps/builtin/data/ReaderProxyData.hpp
@@ -436,10 +436,10 @@ class ReaderProxyData
 
     /**
      * Check if the host is the same as the one that sent the data.
-     * It tries to use the m_host_id. If it is not available, it will compare GUIDs.
+     * It tries to use the machine_id. If it is not available, it will compare GUIDs.
      * @return True if the host is the same
      */
-    bool check_same_host();
+    bool is_from_this_host();
 
     //!
     bool m_expectsInlineQos;
@@ -486,7 +486,7 @@ class ReaderProxyData
     //!GUID
     GUID_t m_guid;
     //!HOST ID
-    fastcdr::string_255 m_host_id;
+    fastcdr::string_255 machine_id;
     //!Network configuration
     NetworkConfigSet_t m_networkConfiguration;
     //!Holds locator information

diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.cpp b/src/cpp/rtps/builtin/data/WriterProxyData.cpp
@@ -1137,9 +1137,9 @@ bool WriterProxyData::readFromCDRMessage(
 bool WriterProxyData::check_same_host()
 {
     bool same_host = false;
-    if (m_host_id.size() > 0)
+    if (machine_id.size() > 0)
     {
-        same_host = m_host_id == SystemInfo::instance().machine_id();
+        same_host = machine_id == SystemInfo::instance().machine_id();
     }
     else
     {
@@ -1155,7 +1155,7 @@ void WriterProxyData::clear()
     plugin_security_attributes_ = 0UL;
 #endif // if HAVE_SECURITY
     m_guid = c_Guid_Unknown;
-    m_host_id = "";
+    machine_id = "";
     m_networkConfiguration = 0;
     remote_locators_.unicast.clear();
     remote_locators_.multicast.clear();
@@ -1189,7 +1189,7 @@ void WriterProxyData::copy(
         WriterProxyData* wdata)
 {
     m_guid = wdata->m_guid;
-    m_host_id = wdata->m_host_id;
+    machine_id = wdata->machine_id;
     m_networkConfiguration = wdata->m_networkConfiguration;
     remote_locators_ = wdata->remote_locators_;
     m_key = wdata->m_key;
@@ -1283,7 +1283,7 @@ void WriterProxyData::set_remote_unicast_locators(
     remote_locators_.unicast.clear();
     for (const Locator_t& locator : locators)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_unicast_locator(locator);
         }
@@ -1303,7 +1303,7 @@ void WriterProxyData::set_multicast_locators(
     remote_locators_.multicast.clear();
     for (const Locator_t& locator : locators)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_multicast_locator(locator);
         }
@@ -1326,7 +1326,7 @@ void WriterProxyData::set_remote_locators(
 
     for (const Locator_t& locator : locators.unicast)
     {
-        if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+        if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
         {
             remote_locators_.add_unicast_locator(locator);
         }
@@ -1336,7 +1336,7 @@ void WriterProxyData::set_remote_locators(
     {
         for (const Locator_t& locator : locators.multicast)
         {
-            if (network.is_locator_remote_or_allowed(locator, check_same_host()))
+            if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))
             {
                 remote_locators_.add_multicast_locator(locator);
             }

diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.hpp b/src/cpp/rtps/builtin/data/WriterProxyData.hpp
@@ -457,18 +457,18 @@ class WriterProxyData
 
     /**
      * Check if the host is the same as the one that sent the data.
-     * It tries to use the m_host_id. If it is not available, it will compare GUIDs.
+     * It tries to use the machine_id. If it is not available, it will compare GUIDs.
      * @return True if the host is the same
      */
-    bool check_same_host();
+    bool is_from_this_host();
 
 private:
 
     //!GUID
     GUID_t m_guid;
 
     //!HOST ID
-    fastcdr::string_255 m_host_id;
+    fastcdr::string_255 machine_id;
 
     //!Network configuration
     NetworkConfigSet_t m_networkConfiguration;

diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp
@@ -313,7 +313,7 @@ void PDP::initializeParticipantProxyData(
     participant_data->product_version.major = FASTDDS_VERSION_MAJOR;
     participant_data->product_version.minor = FASTDDS_VERSION_MINOR;
     participant_data->product_version.patch = FASTDDS_VERSION_MICRO;
-    participant_data->m_host_id = SystemInfo::instance().machine_id();
+    participant_data->machine_id = SystemInfo::instance().machine_id();
 
     // TODO: participant_data->m_availableBuiltinEndpoints |= mp_builtin->available_builtin_endpoints();
 

diff --git a/src/cpp/utils/Host.hpp b/src/cpp/utils/Host.hpp
@@ -145,7 +145,6 @@ class Host
         if (machine_id_ == "")
         {
             EPROSIMA_LOG_WARNING(UTILS, "Cannot get machine id. Failing back to IP based ID");
-            machine_id_ = "";
         }
     }
 

diff --git a/src/cpp/utils/SystemInfo.hpp b/src/cpp/utils/SystemInfo.hpp
@@ -87,16 +87,6 @@ class SystemInfo
         return Host::instance().machine_id();
     }
 
-    /**
-     * Get the identifier of the current machine.
-     *
-     * @return the identifier of the current host.
-     */
-    inline fastcdr::string_255 check_machine_id() const
-    {
-        return Host::instance().machine_id();
-    }
-
     /**
      * Get a reference to the singleton instance.
      *

diff --git a/tools/fds/server.cpp b/tools/fds/server.cpp
@@ -572,7 +572,7 @@ int fastdds_discovery_server(
     }
 
     fastdds::rtps::GuidPrefix_t guid_prefix = participantQos.wire_protocol().prefix;
-    participantQos.transport().use_builtin_transports = true ? udp_server_initialized : false;
+    participantQos.transport().use_builtin_transports = udp_server_initialized;
 
     // Create the server
     int return_value = 0;