From 0cfbf33b8060c249214e141162a386cd1c5ed7df Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:17:17 +0200 Subject: [PATCH] Set DataSharing in Writer|ReaderProxyData (#4761) (#4801) * Set DataSharing in Writer|ReaderProxyData (#4761) * Refs #20933: Set datasharing on when pid is found Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20933: Set datasharing off after the clear Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20933: Add tests Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20933: Fix other_vendor_parameter_list_with_custom_pids test Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20933: Change implementation to fix failing tests Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> * Refs #20933: Apply suggestions Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> --------- Signed-off-by: elianalf <62831776+elianalf@users.noreply.github.com> (cherry picked from commit 904c5230296cb64821b982419a870724b2ba12e8) # Conflicts: # test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp * Refs #20933: Fix conflicts Signed-off-by: eduponz --------- Signed-off-by: eduponz Co-authored-by: elianalf <62831776+elianalf@users.noreply.github.com> Co-authored-by: eduponz --- .../core/policy/QosPoliciesSerializer.hpp | 2 +- src/cpp/rtps/builtin/data/ReaderProxyData.cpp | 2 + src/cpp/rtps/builtin/data/WriterProxyData.cpp | 1 + .../builtin/BuiltinDataSerializationTests.cpp | 83 ++++++++++++++++++- 4 files changed, 85 insertions(+), 3 deletions(-) diff --git a/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp b/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp index dd48cbb4d75..cafef98e48a 100644 --- a/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp +++ b/src/cpp/fastdds/core/policy/QosPoliciesSerializer.hpp @@ -855,7 +855,7 @@ inline bool QosPoliciesSerializer::read_content_from_cdr_m uint32_t pos_ref = cdr_message->pos; // If the parameter is sent, the remote endpoint is datasharing compatible - qos_policy.automatic(); + qos_policy.on("."); uint32_t num_domains = 0; bool valid = fastrtps::rtps::CDRMessage::readUInt32(cdr_message, &num_domains); diff --git a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp index 20415b6d1ae..39d79649cd3 100644 --- a/src/cpp/rtps/builtin/data/ReaderProxyData.cpp +++ b/src/cpp/rtps/builtin/data/ReaderProxyData.cpp @@ -1089,6 +1089,7 @@ bool ReaderProxyData::readFromCDRMessage( "Received with error."); return false; } + break; } @@ -1103,6 +1104,7 @@ bool ReaderProxyData::readFromCDRMessage( uint32_t qos_size; clear(); + m_qos.data_sharing.off(); try { if (ParameterList::readParameterListfromCDRMsg(*msg, param_process, true, qos_size)) diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.cpp b/src/cpp/rtps/builtin/data/WriterProxyData.cpp index 5fd05d08bda..ef50d937fcb 100644 --- a/src/cpp/rtps/builtin/data/WriterProxyData.cpp +++ b/src/cpp/rtps/builtin/data/WriterProxyData.cpp @@ -1095,6 +1095,7 @@ bool WriterProxyData::readFromCDRMessage( uint32_t qos_size; clear(); + m_qos.data_sharing.off(); try { if (ParameterList::readParameterListfromCDRMsg(*msg, param_process, true, qos_size)) diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp index ae7274f243a..e1a24da2b49 100644 --- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp +++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp @@ -140,6 +140,85 @@ TEST(BuiltinDataSerializationTests, ok_with_defaults) } } +TEST(BuiltinDataSerializationTests, msg_without_datasharing) +{ + { + uint8_t data_r_buffer[] = + { + // Encapsulation + 0x00, 0x03, 0x00, 0x00 + }; + + CDRMessage_t msg(0); + msg.init(data_r_buffer, static_cast(sizeof(data_r_buffer))); + msg.length = msg.max_size; + + ReaderProxyData out(max_unicast_locators, max_multicast_locators); + out.readFromCDRMessage(&msg, network, false, true); + ASSERT_EQ(out.m_qos.data_sharing.kind(), OFF); + } + + { + uint8_t data_w_buffer[] = + { + // Encapsulation + 0x00, 0x03, 0x00, 0x00 + + }; + + CDRMessage_t msg(0); + msg.init(data_w_buffer, static_cast(sizeof(data_w_buffer))); + msg.length = msg.max_size; + + ReaderProxyData out(max_unicast_locators, max_multicast_locators); + out.readFromCDRMessage(&msg, network, false, true); + ASSERT_EQ(out.m_qos.data_sharing.kind(), OFF); + } +} + +TEST(BuiltinDataSerializationTests, msg_with_datasharing) +{ + { + uint8_t data_r_buffer[] = + { + // Encapsulation + 0x00, 0x03, 0x00, 0x00, + //Data Sharing + 0x06, 0x80, 0x0c, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x9b, 0xf9, 0xbe, 0x1c, 0xb8 + + }; + + CDRMessage_t msg(0); + msg.init(data_r_buffer, static_cast(sizeof(data_r_buffer))); + msg.length = msg.max_size; + + ReaderProxyData out(max_unicast_locators, max_multicast_locators); + out.readFromCDRMessage(&msg, network, false, true); + ASSERT_EQ(out.m_qos.data_sharing.kind(), ON); + } + + { + uint8_t data_w_buffer[] = + { + // Encapsulation + 0x00, 0x03, 0x00, 0x00, + //Data Sharing + 0x06, 0x80, 0x0c, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6c, 0x9b, 0xf9, 0xbe, 0x1c, 0xb8 + + }; + + CDRMessage_t msg(0); + msg.init(data_w_buffer, static_cast(sizeof(data_w_buffer))); + msg.length = msg.max_size; + + ReaderProxyData out(max_unicast_locators, max_multicast_locators); + out.readFromCDRMessage(&msg, network, false, true); + ASSERT_EQ(out.m_qos.data_sharing.kind(), ON); + } +} + // Regression test for redmine issue #10547 TEST(BuiltinDataSerializationTests, ignore_unsupported_type_info) { @@ -617,7 +696,7 @@ TEST(BuiltinDataSerializationTests, other_vendor_parameter_list_with_custom_pids writer_pdata.m_qos.data_sharing.off(); writer_pdata.m_qos.data_sharing.set_max_domains(0); writer_read(data_buffer, buffer_length, writer_pdata); - ASSERT_EQ(writer_pdata.m_qos.data_sharing, DataSharingQosPolicy()); + ASSERT_EQ(writer_pdata.m_qos.data_sharing.kind(), OFF); // ReaderProxyData check ReaderProxyData reader_pdata(max_unicast_locators, max_multicast_locators); @@ -625,7 +704,7 @@ TEST(BuiltinDataSerializationTests, other_vendor_parameter_list_with_custom_pids reader_pdata.m_qos.data_sharing.set_max_domains(0); reader_pdata.m_qos.m_disablePositiveACKs.enabled = false; reader_read(data_buffer, buffer_length, reader_pdata); - ASSERT_EQ(reader_pdata.m_qos.data_sharing, DataSharingQosPolicy()); + ASSERT_EQ(reader_pdata.m_qos.data_sharing.kind(), OFF); // CacheChange_t check CacheChange_t change;