Refs #21197. Apply suggestions

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

Author: richiware

include/fastdds/rtps/common/ProductVersion_t.hpp

@@ -16,8 +16,8 @@
  * @file ProductVersion_t.hpp
  */
 
-#ifndef _FASTDDS_RTPS_COMMON_PRODUCTVERSIONT_HPP_
-#define _FASTDDS_RTPS_COMMON_PRODUCTVERSIONT_HPP_
+#ifndef FASTDDS_RTPS_COMMON__PRODUCTVERSION_T_HPP
+#define FASTDDS_RTPS_COMMON__PRODUCTVERSION_T_HPP
 
 #include <cstdint>
 #include <iomanip>
@@ -40,10 +40,10 @@ struct ProductVersion_t
 } // namespace eprosima
 
 /**
- * @brief ostream operator<< for VendorId_t
+ * @brief ostream operator<< for ProductVersion_t
  *
  * @param output: the output stream
- * @param vendor_id: the vendor id to append to the output stream
+ * @param product_version: the product version to append to the output stream
  */
 inline std::ostream& operator <<(
         std::ostream& output,
@@ -56,4 +56,4 @@ inline std::ostream& operator <<(
     return output;
 }
 
-#endif /* _FASTDDS_RTPS_COMMON_PRODUCTVERSIONT_HPP_ */
+#endif /* FASTDDS_RTPS_COMMON__PRODUCTVERSION_T_HPP */

src/cpp/rtps/builtin/data/ParticipantProxyData.cpp

@@ -25,6 +25,7 @@
 #include <fastdds/core/policy/ParameterList.hpp>
 #include <fastdds/core/policy/QosPoliciesSerializer.hpp>
 #include <fastdds/dds/log/Log.hpp>
+#include <fastdds/rtps/common/ProductVersion_t.hpp>
 #include <fastdds/rtps/common/VendorId_t.hpp>
 
 #include <rtps/builtin/BuiltinProtocols.h>
@@ -472,11 +473,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                     }
                     case fastdds::dds::PID_PRODUCT_VERSION:
                     {
-                        VendorId_t local_vendor_id = source_vendor_id;
-                        if (c_VendorId_Unknown == local_vendor_id)
-                        {
-                            local_vendor_id = ((c_VendorId_Unknown == m_VendorId) ? c_VendorId_eProsima : m_VendorId);
-                        }
+                        VendorId_t local_vendor_id {select_vendor_id(source_vendor_id)};
 
                         // Ignore custom PID when coming from other vendors
                         if (c_VendorId_eProsima != local_vendor_id)
@@ -533,11 +530,7 @@ bool ParticipantProxyData::readFromCDRMessage(
                     }
                     case fastdds::dds::PID_NETWORK_CONFIGURATION_SET:
                     {
-                        VendorId_t local_vendor_id = source_vendor_id;
-                        if (c_VendorId_Unknown == local_vendor_id)
-                        {
-                            local_vendor_id = ((c_VendorId_Unknown == m_VendorId) ? c_VendorId_eProsima : m_VendorId);
-                        }
+                        VendorId_t local_vendor_id {select_vendor_id(source_vendor_id)};
 
                         // Ignore custom PID when coming from other vendors
                         if (c_VendorId_eProsima != local_vendor_id)
@@ -992,6 +985,17 @@ void ParticipantProxyData::assert_liveliness()
     last_received_message_tm_ = std::chrono::steady_clock::now();
 }
 
+VendorId_t ParticipantProxyData::select_vendor_id(
+        const VendorId_t source_vendor_id)
+{
+    VendorId_t ret_vendor_id {source_vendor_id};
+    if (c_VendorId_Unknown == ret_vendor_id)
+    {
+        ret_vendor_id = ((c_VendorId_Unknown == m_VendorId) ? c_VendorId_eProsima : m_VendorId);
+    }
+    return ret_vendor_id;
+}
+
 } /* namespace rtps */
 } /* namespace fastdds */
 } /* namespace eprosima */

src/cpp/rtps/builtin/data/ParticipantProxyData.hpp

@@ -223,6 +223,9 @@ class ParticipantProxyData
         return lease_duration_;
     }
 
+    VendorId_t select_vendor_id(
+            const VendorId_t source_vendor_id);
+
 private:
 
     //! Store the last timestamp it was received a RTPS message from the remote participant.