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 <ricardo@richiware.dev>

* Refs #21213. Add info to versions.md

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

* Refs #21213. Restore submodule

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

---------

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
(cherry picked from commit 6c051ae)

# Conflicts:
#	versions.md
  • Loading branch information
richiware authored and mergify[bot] committed Jul 4, 2024
1 parent a78316b commit 495ea92
Show file tree
Hide file tree
Showing 2 changed files with 87 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
81 changes: 81 additions & 0 deletions versions.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,88 @@
Forthcoming
-----------

<<<<<<< HEAD
* Added new `flow_controller_descriptor_list` XML configuration.
=======
* Rename project to `fastdds`.
* Rename environment variable to `FASTDDS_DEFAULT_PROFILES_FILE` and rename default XML profiles file to `FASTDDS_DEFAULT_PROFILES`.
* Remove API marked as deprecated.
* Removed deprecated FastRTPS API tests.
* Removed no longer supported `FASTRTPS_API_TESTS` CMake options.
* RTPS layer APIs refactor:
* RTPSReader, ReaderListener, ReaderAttributes:
* Several methods that were meant for internal use have been removed from public API
* All public methods now have `snake_case` names
* All public attributes now have `snake_case` names
* RTPSWriter, WriterHistory:
* The responsibility of managing both the `CacheChange` and `Payload` pools has been moved to the `WriterHistory`.
* Public API that is no longer public:
* XML Parser API no longer public.
* ParticipantAttributes
* ReplierAttributes
* RequesterAttributes
* PublisherAttributes
* SubscriberAttributes
* All discovery implementation related API
* ProxyPool
* Semaphore
* MessageReceiver
* BuiltinProtocols
* Liveliness implementation related API
* shared_mutex
* StringMatching
* TimeConversion
* TypeLookupService
* DBQueue
* UnitsParser
* ReaderLocator
* ReaderProxy
* ChangeForReader
* ServerAttributes
* Public API headers .h have been renamed to .hpp
* Added create participant methods that use environment XML profile for participant configuration.
* New TypeObjectRegistry class to register/query TypeObjects/TypeIdentifiers.
* New TypeObjectUtils class providing API to build and register TypeObjects/TypeIdentifiers.
* Refactor Dynamic Language Binding API according to OMG XTypes v1.3 specification.
* Refactor ReturnCode complying with OMG DDS specification.
* Calling `DataReader::return_loan` returns `ReturnCode_t::RETCODE_OK` both for empty sequences and for sequences that were not loaned.
* Refactor examples:
* Hello world example with wait-sets and environment XML profiles.
* Configuration example that condenses multiple QoS examples. Multiple configurations allowed through argument parsing.
* Custom payload pool example that uses a user-defined payload pool instead of the default
* X-Types example with dynamic type discovery and Hello world example compatibility.
* Custom Content filter example
* Delivery mechanisms example with SHM, UDP, TCP, data-sharing and intra-process mechanisms.
* Discovery server example.
* Removed `TypeConsistencyQos` from DataReader, and included `TypeConsistencyEnforcementQosPolicy` and `DataRepresentationQosPolicy`
* Added new `flow_controller_descriptor_list` XML configuration, remove `ThroughtputController`.
* Migrate `#define`s within `BuiltinEndpoints.hpp` to namespaced `constexpr` variables.
* Make `StdoutErrConsumer` the default log consumer.
* IPayloadPool refactor:
* `payload_owner` moved from `CacheChange_t` to `SerializedPayload_t`.
* `SerializedPayload_t` copies are now forbidden.
* Refactor of `get_payload` methods.
* Use `PID_DOMAIN_ID` during PDP.
* Creation of RTPS messages refactor:
* New Gather-send method is now used by default, avoiding an extra copy during the creation of the RTPS message.
* New attribute in `SendBuffersAllocationAttributes` to configure allocation of `NetworkBuffer` vector.
* `SenderResource` and Transport APIs now receive a collection of `NetworkBuffer` on their `send` method.
* Migrate fastrtps namespace to fastdds
* Migrate fastrtps `ResourceManagement` API from `rtps/resources` to `rtps/attributes`.
* `const` qualify all data related inputs in DataWriter APIs
* New `DomainParticipantExtendedQos` that includes both `DomainId` and `DomainParticipantQos` (extends `DomainParticipantFactory` API).
* Make Blackbox tests not include any private API.
* Remove all the private API include from Blackbox tests.
* Discovery Server refactor:
* Clients and Servers no longer need a known GUID to connect between them.
* Servers are now configured specifying a LocatorList, instead of a RemoteServerAttributes list.
* Servers connect through a mesh topology. For a new server to join the topology, it must be connected to any server in it.
* Servers only redirect discovery information of their direct clients.
* 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.
>>>>>>> 6c051ae17 (Setting vendor_id on received CacheChange_t (#4978))
Version 2.14.0
--------------
Expand Down

0 comments on commit 495ea92

Please sign in to comment.