Refs #22056: Apply review suggestions

cferreiragonz · cferreiragonz · commit 0077886050c8 · 2024-11-12T08:41:40.000+01:00
Signed-off-by: cferreiragonz &lt;carlosferreira@eprosima.com&gt;
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;

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ ParticipantProxyData::ParticipantProxyData(`
`81`	`81`	`const ParticipantProxyData& pdata)`
`82`	`82`	`: m_protocolVersion(pdata.m_protocolVersion)`
`83`	`83`	`, m_guid(pdata.m_guid)`
`84`		`- , m_host_id(pdata.m_host_id)`
	`84`	`+ , machine_id(pdata.machine_id)`
`85`	`85`	`, m_VendorId(pdata.m_VendorId)`
`86`	`86`	`, product_version(pdata.product_version)`
`87`	`87`	`, m_domain_id(pdata.m_domain_id)`
`@@ -176,11 +176,11 @@ uint32_t ParticipantProxyData::get_serialized_size(`
`176`	`176`	`// PID_NETWORK_CONFIGURATION_SET`
`177`	`177`	`ret_val += 4 + PARAMETER_NETWORKCONFIGSET_LENGTH;`
`178`	`178`
`179`		`- if (m_host_id.size() > 0)`
	`179`	`+ if (machine_id.size() > 0)`
`180`	`180`	`{`
`181`		`- // PID_HOST_ID`
	`181`	`+ // PID_MACHINE_ID`
`182`	`182`	`ret_val +=`
`183`		`- fastdds::dds::ParameterSerializer<Parameter_t>::cdr_serialized_size(m_host_id);`
	`183`	`+ fastdds::dds::ParameterSerializer<Parameter_t>::cdr_serialized_size(machine_id);`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// PID_METATRAFFIC_MULTICAST_LOCATOR`
`@@ -331,9 +331,9 @@ bool ParticipantProxyData::writeToCDRMessage(`
`331`	`331`	`return false;`
`332`	`332`	`}`
`333`	`333`	`}`
`334`		`- if (m_host_id.size() > 0)`
	`334`	`+ if (machine_id.size() > 0)`
`335`	`335`	`{`
`336`		`- ParameterString_t p(fastdds::dds::PID_HOST_ID, 0, m_host_id);`
	`336`	`+ ParameterString_t p(fastdds::dds::PID_MACHINE_ID, 0, machine_id);`
`337`	`337`	`if (!fastdds::dds::ParameterSerializer<ParameterString_t>::add_to_cdr_message(p, msg))`
`338`	`338`	`{`
`339`	`339`	`return false;`
`@@ -606,7 +606,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`606`	`606`	`m_networkConfiguration = p.netconfigSet;`
`607`	`607`	`break;`
`608`	`608`	`}`
`609`		`- case fastdds::dds::PID_HOST_ID:`
	`609`	`+ case fastdds::dds::PID_MACHINE_ID:`
`610`	`610`	`{`
`611`	`611`	`// Ignore custom PID when coming from other vendors`
`612`	`612`	`if (c_VendorId_eProsima != m_VendorId)`
`@@ -625,7 +625,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`625`	`625`	`return false;`
`626`	`626`	`}`
`627`	`627`
`628`		`- m_host_id = p.getName();`
	`628`	`+ machine_id = p.getName();`
`629`	`629`	`break;`
`630`	`630`	`}`
`631`	`631`	`case fastdds::dds::PID_METATRAFFIC_MULTICAST_LOCATOR:`
`@@ -647,7 +647,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`647`	`647`	`Locator_t temp_locator;`
`648`	`648`	`if (network.transform_remote_locator(`
`649`	`649`	`p.locator, temp_locator, m_networkConfiguration,`
`650`		`- check_same_host()))`
	`650`	`+ is_from_this_host()))`
`651`	`651`	`{`
`652`	`652`	`ProxyDataFilters::filter_locators(`
`653`	`653`	`network,`
`@@ -677,7 +677,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`677`	`677`	`Locator_t temp_locator;`
`678`	`678`	`if (network.transform_remote_locator(`
`679`	`679`	`p.locator, temp_locator, m_networkConfiguration,`
`680`		`- check_same_host()))`
	`680`	`+ is_from_this_host()))`
`681`	`681`	`{`
`682`	`682`	`ProxyDataFilters::filter_locators(`
`683`	`683`	`network,`
`@@ -707,7 +707,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`707`	`707`	`Locator_t temp_locator;`
`708`	`708`	`if (network.transform_remote_locator(`
`709`	`709`	`p.locator, temp_locator, m_networkConfiguration,`
`710`		`- check_same_host()))`
	`710`	`+ is_from_this_host()))`
`711`	`711`	`{`
`712`	`712`	`ProxyDataFilters::filter_locators(`
`713`	`713`	`network,`
`@@ -737,7 +737,7 @@ bool ParticipantProxyData::readFromCDRMessage(`
`737`	`737`	`Locator_t temp_locator;`
`738`	`738`	`if (network.transform_remote_locator(`
`739`	`739`	`p.locator, temp_locator, m_networkConfiguration,`
`740`		`- check_same_host()))`
	`740`	`+ is_from_this_host()))`
`741`	`741`	`{`
`742`	`742`	`ProxyDataFilters::filter_locators(`
`743`	`743`	`network,`
`@@ -893,12 +893,12 @@ bool ParticipantProxyData::readFromCDRMessage(`
`893`	`893`	`}`
`894`	`894`	`}`
`895`	`895`
`896`		`-bool ParticipantProxyData::check_same_host()`
	`896`	`+bool ParticipantProxyData::is_from_this_host() const`
`897`	`897`	`{`
`898`	`898`	`bool same_host = false;`
`899`		`- if (m_host_id.size() > 0)`
	`899`	`+ if (machine_id.size() > 0)`
`900`	`900`	`{`
`901`		`- same_host = m_host_id == SystemInfo::instance().machine_id();`
	`901`	`+ same_host = machine_id == SystemInfo::instance().machine_id();`
`902`	`902`	`}`
`903`	`903`	`else`
`904`	`904`	`{`
`@@ -911,7 +911,7 @@ void ParticipantProxyData::clear()`
`911`	`911`	`{`
`912`	`912`	`m_protocolVersion = ProtocolVersion_t();`
`913`	`913`	`m_guid = GUID_t();`
`914`		`- m_host_id = "";`
	`914`	`+ machine_id = "";`
`915`	`915`	`//set_VendorId_Unknown(m_VendorId);`
`916`	`916`	`m_VendorId = c_VendorId_Unknown;`
`917`	`917`	`product_version = {};`
`@@ -945,7 +945,7 @@ void ParticipantProxyData::copy(`
`945`	`945`	`{`
`946`	`946`	`m_protocolVersion = pdata.m_protocolVersion;`
`947`	`947`	`m_guid = pdata.m_guid;`
`948`		`- m_host_id = pdata.m_host_id;`
	`948`	`+ machine_id = pdata.machine_id;`
`949`	`949`	`m_VendorId[0] = pdata.m_VendorId[0];`
`950`	`950`	`m_VendorId[1] = pdata.m_VendorId[1];`
`951`	`951`	`product_version = pdata.product_version;`
Original file line number	Diff line number	Diff line change
`@@ -1193,12 +1193,12 @@ bool ReaderProxyData::readFromCDRMessage(`
`1193`	`1193`	`return false;`
`1194`	`1194`	`}`
`1195`	`1195`
`1196`		`-bool ReaderProxyData::check_same_host()`
	`1196`	`+bool ReaderProxyData::is_from_this_host()`
`1197`	`1197`	`{`
`1198`	`1198`	`bool same_host = false;`
`1199`		`- if (m_host_id.size() > 0)`
	`1199`	`+ if (machine_id.size() > 0)`
`1200`	`1200`	`{`
`1201`		`- same_host = m_host_id == SystemInfo::instance().machine_id();`
	`1201`	`+ same_host = machine_id == SystemInfo::instance().machine_id();`
`1202`	`1202`	`}`
`1203`	`1203`	`else`
`1204`	`1204`	`{`
`@@ -1215,7 +1215,7 @@ void ReaderProxyData::clear()`
`1215`	`1215`	`plugin_security_attributes_ = 0UL;`
`1216`	`1216`	`#endif // if HAVE_SECURITY`
`1217`	`1217`	`m_guid = c_Guid_Unknown;`
`1218`		`- m_host_id = "";`
	`1218`	`+ machine_id = "";`
`1219`	`1219`	`m_networkConfiguration = 0;`
`1220`	`1220`	`remote_locators_.unicast.clear();`
`1221`	`1221`	`remote_locators_.multicast.clear();`
`@@ -1280,7 +1280,7 @@ void ReaderProxyData::copy(`
`1280`	`1280`	`ReaderProxyData* rdata)`
`1281`	`1281`	`{`
`1282`	`1282`	`m_guid = rdata->m_guid;`
`1283`		`- m_host_id = rdata->m_host_id;`
	`1283`	`+ machine_id = rdata->machine_id;`
`1284`	`1284`	`m_networkConfiguration = rdata->m_networkConfiguration;`
`1285`	`1285`	`remote_locators_ = rdata->remote_locators_;`
`1286`	`1286`	`m_key = rdata->m_key;`
`@@ -1349,7 +1349,7 @@ void ReaderProxyData::set_remote_unicast_locators(`
`1349`	`1349`	`remote_locators_.unicast.clear();`
`1350`	`1350`	`for (const Locator_t& locator : locators)`
`1351`	`1351`	`{`
`1352`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1352`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1353`	`1353`	`{`
`1354`	`1354`	`remote_locators_.add_unicast_locator(locator);`
`1355`	`1355`	`}`
`@@ -1369,7 +1369,7 @@ void ReaderProxyData::set_multicast_locators(`
`1369`	`1369`	`remote_locators_.multicast.clear();`
`1370`	`1370`	`for (const Locator_t& locator : locators)`
`1371`	`1371`	`{`
`1372`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1372`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1373`	`1373`	`{`
`1374`	`1374`	`remote_locators_.add_multicast_locator(locator);`
`1375`	`1375`	`}`
`@@ -1392,7 +1392,7 @@ void ReaderProxyData::set_remote_locators(`
`1392`	`1392`
`1393`	`1393`	`for (const Locator_t& locator : locators.unicast)`
`1394`	`1394`	`{`
`1395`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1395`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1396`	`1396`	`{`
`1397`	`1397`	`remote_locators_.add_unicast_locator(locator);`
`1398`	`1398`	`}`
`@@ -1402,7 +1402,7 @@ void ReaderProxyData::set_remote_locators(`
`1402`	`1402`	`{`
`1403`	`1403`	`for (const Locator_t& locator : locators.multicast)`
`1404`	`1404`	`{`
`1405`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1405`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1406`	`1406`	`{`
`1407`	`1407`	`remote_locators_.add_multicast_locator(locator);`
`1408`	`1408`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1137,9 +1137,9 @@ bool WriterProxyData::readFromCDRMessage(`
`1137`	`1137`	`bool WriterProxyData::check_same_host()`
`1138`	`1138`	`{`
`1139`	`1139`	`bool same_host = false;`
`1140`		`- if (m_host_id.size() > 0)`
	`1140`	`+ if (machine_id.size() > 0)`
`1141`	`1141`	`{`
`1142`		`- same_host = m_host_id == SystemInfo::instance().machine_id();`
	`1142`	`+ same_host = machine_id == SystemInfo::instance().machine_id();`
`1143`	`1143`	`}`
`1144`	`1144`	`else`
`1145`	`1145`	`{`
`@@ -1155,7 +1155,7 @@ void WriterProxyData::clear()`
`1155`	`1155`	`plugin_security_attributes_ = 0UL;`
`1156`	`1156`	`#endif // if HAVE_SECURITY`
`1157`	`1157`	`m_guid = c_Guid_Unknown;`
`1158`		`- m_host_id = "";`
	`1158`	`+ machine_id = "";`
`1159`	`1159`	`m_networkConfiguration = 0;`
`1160`	`1160`	`remote_locators_.unicast.clear();`
`1161`	`1161`	`remote_locators_.multicast.clear();`
`@@ -1189,7 +1189,7 @@ void WriterProxyData::copy(`
`1189`	`1189`	`WriterProxyData* wdata)`
`1190`	`1190`	`{`
`1191`	`1191`	`m_guid = wdata->m_guid;`
`1192`		`- m_host_id = wdata->m_host_id;`
	`1192`	`+ machine_id = wdata->machine_id;`
`1193`	`1193`	`m_networkConfiguration = wdata->m_networkConfiguration;`
`1194`	`1194`	`remote_locators_ = wdata->remote_locators_;`
`1195`	`1195`	`m_key = wdata->m_key;`
`@@ -1283,7 +1283,7 @@ void WriterProxyData::set_remote_unicast_locators(`
`1283`	`1283`	`remote_locators_.unicast.clear();`
`1284`	`1284`	`for (const Locator_t& locator : locators)`
`1285`	`1285`	`{`
`1286`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1286`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1287`	`1287`	`{`
`1288`	`1288`	`remote_locators_.add_unicast_locator(locator);`
`1289`	`1289`	`}`
`@@ -1303,7 +1303,7 @@ void WriterProxyData::set_multicast_locators(`
`1303`	`1303`	`remote_locators_.multicast.clear();`
`1304`	`1304`	`for (const Locator_t& locator : locators)`
`1305`	`1305`	`{`
`1306`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1306`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1307`	`1307`	`{`
`1308`	`1308`	`remote_locators_.add_multicast_locator(locator);`
`1309`	`1309`	`}`
`@@ -1326,7 +1326,7 @@ void WriterProxyData::set_remote_locators(`
`1326`	`1326`
`1327`	`1327`	`for (const Locator_t& locator : locators.unicast)`
`1328`	`1328`	`{`
`1329`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1329`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1330`	`1330`	`{`
`1331`	`1331`	`remote_locators_.add_unicast_locator(locator);`
`1332`	`1332`	`}`
`@@ -1336,7 +1336,7 @@ void WriterProxyData::set_remote_locators(`
`1336`	`1336`	`{`
`1337`	`1337`	`for (const Locator_t& locator : locators.multicast)`
`1338`	`1338`	`{`
`1339`		`- if (network.is_locator_remote_or_allowed(locator, check_same_host()))`
	`1339`	`+ if (network.is_locator_remote_or_allowed(locator, is_from_this_host()))`
`1340`	`1340`	`{`
`1341`	`1341`	`remote_locators_.add_multicast_locator(locator);`
`1342`	`1342`	`}`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,6 @@ class Host`
`145`	`145`	`if (machine_id_ == "")`
`146`	`146`	`{`
`147`	`147`	`EPROSIMA_LOG_WARNING(UTILS, "Cannot get machine id. Failing back to IP based ID");`
`148`		`- machine_id_ = "";`
`149`	`148`	`}`
`150`	`149`	`}`
`151`	`150`
Original file line number	Diff line number	Diff line change
`@@ -572,7 +572,7 @@ int fastdds_discovery_server(`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`fastdds::rtps::GuidPrefix_t guid_prefix = participantQos.wire_protocol().prefix;`
`575`		`- participantQos.transport().use_builtin_transports = true ? udp_server_initialized : false;`
	`575`	`+ participantQos.transport().use_builtin_transports = udp_server_initialized;`
`576`	`576`
`577`	`577`	`// Create the server`
`578`	`578`	`int return_value = 0;`