From 13f3003f5b561699e959c2dfa95724cd9af70765 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 10 Jul 2024 07:06:31 +0200 Subject: [PATCH] Setting vendor_id on received CacheChange_t (#4978) (#5030) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Refs #21213. Setting vendor_id on received CacheChange_t * Refs #21213. Add info to versions.md * Refs #21213. Restore submodule --------- (cherry picked from commit 6c051ae17be16a9c8ec026b079acfa2178c84e62) Signed-off-by: eduponz Co-authored-by: Ricardo González --- 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 c04d3d5b4f0..5439693a071 100644 --- a/src/cpp/rtps/messages/MessageReceiver.cpp +++ b/src/cpp/rtps/messages/MessageReceiver.cpp @@ -812,6 +812,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) { @@ -988,6 +991,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 1d23a92d97d..bc8f2bfeb91 100644 --- a/versions.md +++ b/versions.md @@ -2,6 +2,7 @@ Forthcoming ----------- * Added new `flow_controller_descriptor_list` XML configuration. +* Setting vendor_id in the received CacheChange_t for Data and DataFrag. Version 2.14.0 --------------