Skip to content

Commit

Permalink
Setting vendor_id on received CacheChange_t (#4978)
Browse files Browse the repository at this point in the history
* Refs #21213. Setting vendor_id on received CacheChange_t

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21213. Add info to versions.md

Signed-off-by: Ricardo González Moreno <[email protected]>

* Refs #21213. Restore submodule

Signed-off-by: Ricardo González Moreno <[email protected]>

---------

Signed-off-by: Ricardo González Moreno <[email protected]>
(cherry picked from commit 6c051ae)

Signed-off-by: eduponz <[email protected]>
  • Loading branch information
richiware authored and eduponz committed Jul 9, 2024
1 parent a78316b commit c280137
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/cpp/rtps/messages/MessageReceiver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------
Expand Down

0 comments on commit c280137

Please sign in to comment.