From 6c051ae17be16a9c8ec026b079acfa2178c84e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ricardo=20Gonz=C3=A1lez?= Date: Thu, 4 Jul 2024 10:51:48 +0200 Subject: [PATCH] Setting vendor_id on received CacheChange_t (#4978) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refs #21213. Setting vendor_id on received CacheChange_t Signed-off-by: Ricardo González Moreno * Refs #21213. Add info to versions.md Signed-off-by: Ricardo González Moreno * Refs #21213. Restore submodule Signed-off-by: Ricardo González Moreno --------- Signed-off-by: Ricardo González Moreno --- src/cpp/rtps/messages/MessageReceiver.cpp | 6 ++++++ versions.md | 1 + 2 files changed, 7 insertions(+) diff --git a/src/cpp/rtps/messages/MessageReceiver.cpp b/src/cpp/rtps/messages/MessageReceiver.cpp index 9ac7af0e1e5..af58956cb6a 100644 --- a/src/cpp/rtps/messages/MessageReceiver.cpp +++ b/src/cpp/rtps/messages/MessageReceiver.cpp @@ -811,6 +811,9 @@ bool MessageReceiver::proc_Submsg_Data( return false; } + // Get the vendor id + ch.vendor_id = source_vendor_id_; + //Jump ahead if more parameters are before inlineQos (not in this version, maybe if further minor versions.) if (octetsToInlineQos > RTPSMESSAGE_OCTETSTOINLINEQOS_DATASUBMSG) { @@ -987,6 +990,9 @@ bool MessageReceiver::proc_Submsg_DataFrag( return false; } + // Get the vendor id + ch.vendor_id = source_vendor_id_; + // READ FRAGMENT NUMBER uint32_t fragmentStartingNum; valid &= CDRMessage::readUInt32(msg, &fragmentStartingNum); diff --git a/versions.md b/versions.md index c2300f5be08..059c87acef2 100644 --- a/versions.md +++ b/versions.md @@ -78,6 +78,7 @@ Forthcoming * Remote Discovery servers connection list can now be updated and modified at runtime without restrictions. * Fast DDS CLI has been updated to allow the creation of servers without GUID. * Refactor in XML Parser to return DynamicTypeBuilder instead of DynamicType +* Setting vendor_id in the received CacheChange_t for Data and DataFrag. Version 2.14.0 --------------