diff --git a/examples/cpp/discovery_server/ServerApp.cpp b/examples/cpp/discovery_server/ServerApp.cpp index 3df45a1ba5c..04e10d1e1e0 100644 --- a/examples/cpp/discovery_server/ServerApp.cpp +++ b/examples/cpp/discovery_server/ServerApp.cpp @@ -210,19 +210,20 @@ ServerApp::~ServerApp() void ServerApp::on_participant_discovery( DomainParticipant*, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(should_be_ignored); - if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { - std::cout << "Discovered Participant with GUID " << info.info.m_guid << std::endl; + std::cout << "Discovered Participant with GUID " << info.guid << std::endl; ++matched_; } - else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT || - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT || + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { - std::cout << "Dropped Participant with GUID " << info.info.m_guid << std::endl; + std::cout << "Dropped Participant with GUID " << info.guid << std::endl; --matched_; } } diff --git a/examples/cpp/discovery_server/ServerApp.hpp b/examples/cpp/discovery_server/ServerApp.hpp index 7e738cd06e7..2d009c62e66 100644 --- a/examples/cpp/discovery_server/ServerApp.hpp +++ b/examples/cpp/discovery_server/ServerApp.hpp @@ -22,6 +22,7 @@ #include +#include #include #include #include @@ -49,7 +50,8 @@ class ServerApp : public Application, public DomainParticipantListener //! Publisher matched method void on_participant_discovery( DomainParticipant* participant, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus status, + const fastdds::rtps::ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; //! Run publisher diff --git a/examples/cpp/request_reply/ClientApp.cpp b/examples/cpp/request_reply/ClientApp.cpp index aa17ec00021..28c5e798706 100644 --- a/examples/cpp/request_reply/ClientApp.cpp +++ b/examples/cpp/request_reply/ClientApp.cpp @@ -143,17 +143,18 @@ void ClientApp::stop() void ClientApp::on_participant_discovery( DomainParticipant* /* participant */, - rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { std::lock_guard lock(mtx_); should_be_ignored = false; - rtps::GuidPrefix_t remote_participant_guid_prefix = info.info.m_guid.guidPrefix; - std::string status_str = TypeConverter::to_string(info.status); + rtps::GuidPrefix_t remote_participant_guid_prefix = info.guid.guidPrefix; + std::string status_str = TypeConverter::to_string(status); - if (info.info.m_userData.data_vec().size() != 1) + if (info.user_data.data_vec().size() != 1) { should_be_ignored = true; request_reply_debug("ClientApp", "Ignoring participant with invalid user data: " @@ -162,7 +163,7 @@ void ClientApp::on_participant_discovery( if (!should_be_ignored) { - CLIParser::EntityKind entity_kind = static_cast(info.info.m_userData.data_vec()[0]); + CLIParser::EntityKind entity_kind = static_cast(info.user_data.data_vec()[0]); if (CLIParser::EntityKind::SERVER != entity_kind) { should_be_ignored = true; @@ -176,12 +177,12 @@ void ClientApp::on_participant_discovery( { std::string server_str = CLIParser::parse_entity_kind(CLIParser::EntityKind::SERVER); - if (info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT) + if (status == rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { request_reply_debug("ClientApp", server_str << " " << status_str << ": " << remote_participant_guid_prefix); } - else if (info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::REMOVED_PARTICIPANT || - info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DROPPED_PARTICIPANT) + else if (status == rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { request_reply_debug("ClientApp", server_str << " " << status_str << ": " << remote_participant_guid_prefix); } diff --git a/examples/cpp/request_reply/ClientApp.hpp b/examples/cpp/request_reply/ClientApp.hpp index 84624520800..3a6fb0fa56c 100644 --- a/examples/cpp/request_reply/ClientApp.hpp +++ b/examples/cpp/request_reply/ClientApp.hpp @@ -71,7 +71,8 @@ class ClientApp : public Application, public DomainParticipantListener //! Participant discovery method void on_participant_discovery( DomainParticipant* participant, - rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; //! Publication matched method diff --git a/examples/cpp/request_reply/ServerApp.cpp b/examples/cpp/request_reply/ServerApp.cpp index b3ee98b9f08..fe85a7c7555 100644 --- a/examples/cpp/request_reply/ServerApp.cpp +++ b/examples/cpp/request_reply/ServerApp.cpp @@ -130,17 +130,18 @@ void ServerApp::stop() void ServerApp::on_participant_discovery( DomainParticipant* /* participant */, - rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { std::lock_guard lock(mtx_); should_be_ignored = false; - rtps::GuidPrefix_t remote_participant_guid_prefix = info.info.m_guid.guidPrefix; - std::string status_str = TypeConverter::to_string(info.status); + rtps::GuidPrefix_t remote_participant_guid_prefix = info.guid.guidPrefix; + std::string status_str = TypeConverter::to_string(status); - if (info.info.m_userData.data_vec().size() != 1) + if (info.user_data.data_vec().size() != 1) { should_be_ignored = true; request_reply_debug("ServerApp", "Ignoring participant with invalid user data: " @@ -149,7 +150,7 @@ void ServerApp::on_participant_discovery( if (!should_be_ignored) { - CLIParser::EntityKind entity_kind = static_cast(info.info.m_userData.data_vec()[0]); + CLIParser::EntityKind entity_kind = static_cast(info.user_data.data_vec()[0]); if (CLIParser::EntityKind::CLIENT != entity_kind) { should_be_ignored = true; @@ -163,12 +164,12 @@ void ServerApp::on_participant_discovery( { std::string client_str = CLIParser::parse_entity_kind(CLIParser::EntityKind::CLIENT); - if (info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT) + if (status == rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { request_reply_debug("ServerApp", client_str << " " << status_str << ": " << remote_participant_guid_prefix); } - else if (info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::REMOVED_PARTICIPANT || - info.status == rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DROPPED_PARTICIPANT) + else if (status == rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { client_matched_status_.match_reply_reader(remote_participant_guid_prefix, false); client_matched_status_.match_request_writer(remote_participant_guid_prefix, false); diff --git a/examples/cpp/request_reply/ServerApp.hpp b/examples/cpp/request_reply/ServerApp.hpp index a195b8164ff..3c09d62ad13 100644 --- a/examples/cpp/request_reply/ServerApp.hpp +++ b/examples/cpp/request_reply/ServerApp.hpp @@ -68,7 +68,8 @@ class ServerApp : public Application, public DomainParticipantListener //! Participant discovery method void on_participant_discovery( DomainParticipant* participant, - rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; //! Publication matched method diff --git a/examples/cpp/request_reply/app_utils.hpp b/examples/cpp/request_reply/app_utils.hpp index 65633406cbb..61dc73abceb 100644 --- a/examples/cpp/request_reply/app_utils.hpp +++ b/examples/cpp/request_reply/app_utils.hpp @@ -225,25 +225,25 @@ struct TypeConverter } static std::string to_string( - const rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS& info) + const rtps::ParticipantDiscoveryStatus& info) { std::string info_str = "Unknown"; switch (info) { - case rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT: + case rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT: info_str = "discovered"; break; - case rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::CHANGED_QOS_PARTICIPANT: + case rtps::ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT: info_str = "changed QoS"; break; - case rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::REMOVED_PARTICIPANT: + case rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT: info_str = "removed"; break; - case rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DROPPED_PARTICIPANT: + case rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT: info_str = "dropped"; break; - case rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::IGNORED_PARTICIPANT: + case rtps::ParticipantDiscoveryStatus::IGNORED_PARTICIPANT: info_str = "ignored"; break; default: diff --git a/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp b/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp index 8df2b567168..2832c9c6011 100644 --- a/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp +++ b/include/fastdds/dds/builtin/topic/ParticipantBuiltinTopicData.hpp @@ -20,24 +20,14 @@ #ifndef FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP #define FASTDDS_DDS_BUILTIN_TOPIC__PARTICIPANTBUILTINTOPICDATA_HPP -#include -#include +#include namespace eprosima { namespace fastdds { namespace dds { -namespace builtin { -struct ParticipantBuiltinTopicData -{ - //! Builtin topic Key - BuiltinTopicKey_t key; +using ParticipantBuiltinTopicData = rtps::ParticipantBuiltinTopicData; - //! UserData QoS - UserDataQosPolicy user_data; -}; - -} // builtin } // dds } // fastdds } // eprosima diff --git a/include/fastdds/dds/domain/DomainParticipant.hpp b/include/fastdds/dds/domain/DomainParticipant.hpp index d53b07bdfeb..5fae640695d 100644 --- a/include/fastdds/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/dds/domain/DomainParticipant.hpp @@ -698,7 +698,7 @@ class DomainParticipant : public Entity * @warning Not supported yet. Currently returns RETCODE_UNSUPPORTED */ FASTDDS_EXPORTED_API ReturnCode_t get_discovered_participant_data( - builtin::ParticipantBuiltinTopicData& participant_data, + ParticipantBuiltinTopicData& participant_data, const InstanceHandle_t& participant_handle) const; /** diff --git a/include/fastdds/dds/domain/DomainParticipantListener.hpp b/include/fastdds/dds/domain/DomainParticipantListener.hpp index da4163eb920..f6df4149fc7 100644 --- a/include/fastdds/dds/domain/DomainParticipantListener.hpp +++ b/include/fastdds/dds/domain/DomainParticipantListener.hpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -34,6 +35,7 @@ namespace fastdds { namespace dds { class DomainParticipant; +class ParticipantProxyData; /** * Class DomainParticipantListener, overrides behaviour towards certain events. @@ -66,16 +68,20 @@ class DomainParticipantListener : * its QOS or is removed. * * @param [out] participant Pointer to the Participant which discovered the remote participant. + * @param [out] reason Reason of the change in the status of the discovered participant. * @param [out] info Remote participant information. User can take ownership of the object. * @param [out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant. */ virtual void on_participant_discovery( DomainParticipant* participant, - rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus reason, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(participant); + static_cast(reason); static_cast(info); + should_be_ignored = false; } diff --git a/include/fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp b/include/fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp new file mode 100644 index 00000000000..479490fb4d7 --- /dev/null +++ b/include/fastdds/rtps/builtin/data/ParticipantBuiltinTopicData.hpp @@ -0,0 +1,68 @@ +// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +/** + * @file ParticipantBuiltinTopicData.hpp + * + */ + +#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTBUILTINTOPICDATA_HPP +#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTBUILTINTOPICDATA_HPP + +#include +#include +#include + +namespace eprosima { +namespace fastdds { +namespace rtps { + +struct ParticipantBuiltinTopicData +{ + /// Builtin topic Key + BuiltinTopicKey_t key; + + /// UserData QoS + dds::UserDataQosPolicy user_data; + + /// Participant GUID + GUID_t guid; + + /// Properties + dds::ParameterPropertyList_t properties; + + /// Participant name + fastcdr::string_255 participant_name; + + /// Metatraffic locators + RemoteLocatorList metatraffic_locators; + + /// Default locators + RemoteLocatorList default_locators; + + /// Lease Duration + dds::Duration_t lease_duration; + + /// Vendor id + VendorId_t vendor_id; + + /// Participant domain id + dds::DomainId_t domain_id; +}; + +} // rtps +} // fastdds +} // eprosima + +#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTBUILTINTOPICDATA_HPP diff --git a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp index 7cc875e6a4f..6ee4eaa48bc 100644 --- a/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp +++ b/include/fastdds/rtps/participant/ParticipantDiscoveryInfo.hpp @@ -21,58 +21,28 @@ #define FASTDDS_RTPS_PARTICIPANT__PARTICIPANTDISCOVERYINFO_HPP #include -#include - +#include namespace eprosima { namespace fastdds { namespace rtps { -/** - * Class ParticipantDiscoveryInfo with discovery information of the Participant. - * @ingroup RTPS_MODULE - */ -struct ParticipantDiscoveryInfo -{ - //!Enum DISCOVERY_STATUS, four different status for discovered participants. - //!@ingroup RTPS_MODULE - // *INDENT-OFF* eduponz: Does not understand the #if correctly and ends up removing the ; - // at the end of the enum, which does not build. +//!Enum ParticipantDiscoveryStatus, four different status for discovered participants. +//!@ingroup RTPS_MODULE +// *INDENT-OFF* eduponz: Does not understand the #if correctly and ends up removing the ; +// at the end of the enum, which does not build. #if defined(_WIN32) - enum FASTDDS_EXPORTED_API DISCOVERY_STATUS +enum class FASTDDS_EXPORTED_API ParticipantDiscoveryStatus #else - enum DISCOVERY_STATUS +enum class ParticipantDiscoveryStatus #endif // if defined(_WIN32) - { - DISCOVERED_PARTICIPANT, - CHANGED_QOS_PARTICIPANT, - REMOVED_PARTICIPANT, - DROPPED_PARTICIPANT, - IGNORED_PARTICIPANT - }; - // *INDENT-ON* - - ParticipantDiscoveryInfo( - const ParticipantProxyData& data) - : status(DISCOVERED_PARTICIPANT) - , info(data) - { - } - - virtual ~ParticipantDiscoveryInfo() - { - } - - //! Status - DISCOVERY_STATUS status; - - /** - * @brief Participant discovery info - * - * @todo This is a reference to an object that could be deleted, thus it should not be a reference - * (intraprocess case -> BlackboxTests_DDS_PIM.DDSDiscovery.ParticipantProxyPhysicalData). - */ - const ParticipantProxyData& info; +{ + DISCOVERED_PARTICIPANT, + CHANGED_QOS_PARTICIPANT, + REMOVED_PARTICIPANT, + DROPPED_PARTICIPANT, + IGNORED_PARTICIPANT }; +// *INDENT-ON* #if HAVE_SECURITY struct ParticipantAuthenticationInfo diff --git a/include/fastdds/rtps/participant/RTPSParticipant.hpp b/include/fastdds/rtps/participant/RTPSParticipant.hpp index 9292ab50240..0ed76b8ecd8 100644 --- a/include/fastdds/rtps/participant/RTPSParticipant.hpp +++ b/include/fastdds/rtps/participant/RTPSParticipant.hpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -396,7 +396,7 @@ class FASTDDS_EXPORTED_API RTPSParticipant bool disable_monitor_service() const; /** - * fills in the ParticipantProxyData from a MonitorService Message + * fills in the ParticipantBuiltinTopicData from a MonitorService Message * * @param [out] data Proxy to fill * @param [in] msg MonitorService Message to get the proxy information from. @@ -404,8 +404,8 @@ class FASTDDS_EXPORTED_API RTPSParticipant * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); + ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg); /** * fills in the PublicationBuiltinTopicData from a MonitorService Message diff --git a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp index 79c7471e084..e086d3274d3 100644 --- a/include/fastdds/rtps/participant/RTPSParticipantListener.hpp +++ b/include/fastdds/rtps/participant/RTPSParticipantListener.hpp @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -52,15 +53,18 @@ class FASTDDS_EXPORTED_API RTPSParticipantListener * its QOS or is removed. * * @param [out] participant Pointer to the Participant which discovered the remote participant. + * @param [out] reason Reason of the change in the status of the discovered participant. * @param [out] info Remote participant information. User can take ownership of the object. * @param [out] should_be_ignored Flag to indicate the library to automatically ignore the discovered Participant. */ - virtual void onParticipantDiscovery( + virtual void on_participant_discovery( RTPSParticipant* participant, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus reason, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(participant); + static_cast(reason); static_cast(info); should_be_ignored = false; diff --git a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp index 531be0b68da..3c312b298b9 100644 --- a/include/fastdds/statistics/dds/domain/DomainParticipant.hpp +++ b/include/fastdds/statistics/dds/domain/DomainParticipant.hpp @@ -28,7 +28,6 @@ #include #include #include -#include namespace eprosima { namespace fastdds { @@ -132,7 +131,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t disable_monitor_service(); /** - * fills in the ParticipantProxyData from a MonitorService Message + * fills in the ParticipantBuiltinTopicData from a MonitorService Message * * @param [out] data Proxy to fill * @param [in] msg MonitorService Message to get the proxy information from. @@ -141,20 +140,7 @@ class DomainParticipant : public eprosima::fastdds::dds::DomainParticipant * @return RETCODE_ERROR if the operation fails. */ FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& data, - statistics::MonitorServiceStatusData& msg); - - /** - * fills in the ParticipantProxyData from a MonitorService Message - * - * @param [out] data Proxy to fill - * @param [in] msg MonitorService Message to get the proxy information from. - * - * @return RETCODE_OK if the operation succeeds. - * @return RETCODE_ERROR if the operation fails. - */ - FASTDDS_EXPORTED_API eprosima::fastdds::dds::ReturnCode_t fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& data, + fastdds::dds::ParticipantBuiltinTopicData& data, const statistics::MonitorServiceStatusData& msg); /** diff --git a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp index 3c0fd3f68c3..d20e5c8b6f0 100644 --- a/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp +++ b/src/cpp/fastdds/builtin/type_lookup_service/TypeLookupManager.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -35,6 +34,7 @@ #include #include +#include #include #include #include diff --git a/src/cpp/fastdds/domain/DomainParticipant.cpp b/src/cpp/fastdds/domain/DomainParticipant.cpp index 9184bd2c615..a3839843894 100644 --- a/src/cpp/fastdds/domain/DomainParticipant.cpp +++ b/src/cpp/fastdds/domain/DomainParticipant.cpp @@ -408,7 +408,7 @@ ReturnCode_t DomainParticipant::get_discovered_participants( } ReturnCode_t DomainParticipant::get_discovered_participant_data( - builtin::ParticipantBuiltinTopicData& participant_data, + ParticipantBuiltinTopicData& participant_data, const InstanceHandle_t& participant_handle) const { static_cast (participant_data); diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp index 6c3631fb430..4efd07608f0 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -49,6 +49,7 @@ #include #include +#include #include #include #include @@ -73,7 +74,6 @@ namespace dds { using xmlparser::XMLProfileManager; using xmlparser::XMLP_ret; -using rtps::ParticipantDiscoveryInfo; using rtps::RTPSDomain; using rtps::RTPSDomainImpl; using rtps::RTPSParticipant; @@ -1531,16 +1531,17 @@ ReturnCode_t DomainParticipantImpl::unregister_type( return RETCODE_OK; } -void DomainParticipantImpl::MyRTPSParticipantListener::onParticipantDiscovery( +void DomainParticipantImpl::MyRTPSParticipantListener::on_participant_discovery( RTPSParticipant*, - ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus reason, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { should_be_ignored = false; Sentry sentinel(this); if (sentinel) { - participant_->listener_->on_participant_discovery(participant_->participant_, std::move(info), + participant_->listener_->on_participant_discovery(participant_->participant_, reason, std::move(info), should_be_ignored); } } diff --git a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp index 4632d886c14..ba481ff0717 100644 --- a/src/cpp/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/fastdds/domain/DomainParticipantImpl.hpp @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -634,9 +635,10 @@ class DomainParticipantImpl assert(!(callback_counter_ > 0)); } - void onParticipantDiscovery( + void on_participant_discovery( fastdds::rtps::RTPSParticipant* participant, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus reason, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; #if HAVE_SECURITY diff --git a/src/cpp/rtps/builtin/BuiltinProtocols.cpp b/src/cpp/rtps/builtin/BuiltinProtocols.cpp index 640a7f1e1ba..e819d78ead2 100644 --- a/src/cpp/rtps/builtin/BuiltinProtocols.cpp +++ b/src/cpp/rtps/builtin/BuiltinProtocols.cpp @@ -22,11 +22,11 @@ #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp index c85ba2218b7..4ecd0e37a88 100644 --- a/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp +++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.cpp @@ -17,7 +17,7 @@ * */ -#include +#include #include #include diff --git a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp similarity index 82% rename from include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp rename to src/cpp/rtps/builtin/data/ParticipantProxyData.hpp index 2539a6e6b2f..5f7906746ce 100644 --- a/include/fastdds/rtps/builtin/data/ParticipantProxyData.hpp +++ b/src/cpp/rtps/builtin/data/ParticipantProxyData.hpp @@ -17,10 +17,8 @@ * */ -#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP -#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP - -#ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC +#ifndef RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP +#define RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP #include @@ -64,13 +62,13 @@ class ParticipantProxyData { public: - FASTDDS_EXPORTED_API ParticipantProxyData( + ParticipantProxyData( const RTPSParticipantAllocationAttributes& allocation); - FASTDDS_EXPORTED_API ParticipantProxyData( + ParticipantProxyData( const ParticipantProxyData& pdata); - FASTDDS_EXPORTED_API virtual ~ParticipantProxyData(); + virtual ~ParticipantProxyData(); //!Protocol version ProtocolVersion_t m_protocolVersion; @@ -130,7 +128,7 @@ class ParticipantProxyData * @param pdata Object to copy the data from * @return True on success */ - FASTDDS_EXPORTED_API bool updateData( + bool updateData( ParticipantProxyData& pdata); /** @@ -138,14 +136,14 @@ class ParticipantProxyData * @param include_encapsulation Whether to include the size of the encapsulation info. * @return size in bytes of the CDR serialization. */ - FASTDDS_EXPORTED_API uint32_t get_serialized_size( + uint32_t get_serialized_size( bool include_encapsulation) const; /** * Write as a parameter list on a CDRMessage_t * @return True on success */ - FASTDDS_EXPORTED_API bool writeToCDRMessage( + bool writeToCDRMessage( CDRMessage_t* msg, bool write_encapsulation); @@ -153,7 +151,7 @@ class ParticipantProxyData * Read the parameter list from a received CDRMessage_t * @return True on success */ - FASTDDS_EXPORTED_API bool readFromCDRMessage( + bool readFromCDRMessage( CDRMessage_t* msg, bool use_encapsulation, const NetworkFactory& network, @@ -162,62 +160,62 @@ class ParticipantProxyData fastdds::rtps::VendorId_t source_vendor_id = c_VendorId_eProsima); //! Clear the data (restore to default state). - FASTDDS_EXPORTED_API void clear(); + void clear(); /** * Copy the data from another object. * @param pdata Object to copy the data from */ - FASTDDS_EXPORTED_API void copy( + void copy( const ParticipantProxyData& pdata); /** * Set participant persistent GUID_t * @param guid valid GUID_t */ - FASTDDS_EXPORTED_API void set_persistence_guid( + void set_persistence_guid( const GUID_t& guid); /** * Retrieve participant persistent GUID_t * @return guid persistent GUID_t or c_Guid_Unknown */ - FASTDDS_EXPORTED_API GUID_t get_persistence_guid() const; + GUID_t get_persistence_guid() const; /** * Set participant client server sample identity * @param sid valid SampleIdentity */ - FASTDDS_EXPORTED_API void set_sample_identity( + void set_sample_identity( const SampleIdentity& sid); /** * Retrieve participant SampleIdentity * @return SampleIdentity */ - FASTDDS_EXPORTED_API SampleIdentity get_sample_identity() const; + SampleIdentity get_sample_identity() const; /** * Identifies the participant as client of the given server * @param guid valid backup server GUID */ - FASTDDS_EXPORTED_API void set_backup_stamp( + void set_backup_stamp( const GUID_t& guid); /** * Retrieves BACKUP server stamp. On deserialization hints if lease duration must be enforced * @return GUID */ - FASTDDS_EXPORTED_API GUID_t get_backup_stamp() const; + GUID_t get_backup_stamp() const; - FASTDDS_EXPORTED_API void assert_liveliness(); + void assert_liveliness(); - FASTDDS_EXPORTED_API const std::chrono::steady_clock::time_point& last_received_message_tm() const + const std::chrono::steady_clock::time_point& last_received_message_tm() const { return last_received_message_tm_; } - FASTDDS_EXPORTED_API const std::chrono::microseconds& lease_duration() const + const std::chrono::microseconds& lease_duration() const { return lease_duration_; } @@ -235,6 +233,4 @@ class ParticipantProxyData } // namespace fastdds } // namespace eprosima -#endif // ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC - -#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP +#endif // RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP diff --git a/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp b/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp index 756d032f6fe..d5f2d5dc002 100644 --- a/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp +++ b/src/cpp/rtps/builtin/data/ProxyDataConverters.cpp @@ -23,13 +23,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include @@ -103,8 +103,17 @@ void from_proxy_to_builtin( const ParticipantProxyData& proxy_data, ParticipantBuiltinTopicData& builtin_data) { - static_cast(proxy_data); - static_cast(builtin_data); + from_proxy_to_builtin(proxy_data.m_guid.guidPrefix, builtin_data.key.value); + + builtin_data.user_data = proxy_data.m_userData; + builtin_data.guid = proxy_data.m_guid; + builtin_data.metatraffic_locators = proxy_data.metatraffic_locators; + builtin_data.default_locators = proxy_data.default_locators; + builtin_data.participant_name = proxy_data.m_participantName; + builtin_data.properties = proxy_data.m_properties; + builtin_data.lease_duration = proxy_data.m_leaseDuration; + builtin_data.vendor_id = proxy_data.m_VendorId; + builtin_data.domain_id = proxy_data.m_domain_id; } void from_proxy_to_builtin( diff --git a/src/cpp/rtps/builtin/data/WriterProxyData.hpp b/src/cpp/rtps/builtin/data/WriterProxyData.hpp index 788cfd11dea..e64273bf7ea 100644 --- a/src/cpp/rtps/builtin/data/WriterProxyData.hpp +++ b/src/cpp/rtps/builtin/data/WriterProxyData.hpp @@ -38,7 +38,6 @@ namespace rtps { struct CDRMessage_t; class NetworkFactory; -class ParticipantProxyData; /** **@ingroup BUILTIN_MODULE diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp index 5c1c666ed3b..df52e129327 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp @@ -28,13 +28,13 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp index 5d4aa1c8301..7a8e39ba2eb 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPClient.cpp @@ -22,10 +22,10 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp index c818c69632f..a06e6c1497d 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPServer.hpp @@ -21,9 +21,9 @@ #define _FASTDDS_RTPS_EDPSERVER2_H_ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC -#include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp index 09b01638d97..54b12d94fff 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp @@ -29,12 +29,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp index 7a59e1a7d9e..3907774cbd5 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPSimpleListeners.cpp @@ -23,15 +23,15 @@ #include #include -#include #include #include #include #include -#include +#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp index 08ea0c6a7db..86197878aaf 100644 --- a/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp +++ b/src/cpp/rtps/builtin/discovery/endpoint/EDPStatic.cpp @@ -25,10 +25,10 @@ #include #include -#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp index 133f77bd127..8891f89effa 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.cpp @@ -24,10 +24,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp index b7ac5262526..059e41ec1d6 100644 --- a/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/DS/PDPSecurityInitiatorListener.hpp @@ -23,8 +23,7 @@ #include -#include - +#include #include namespace eprosima { diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp index 657358c99f9..a4ff375a78a 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDP.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDP.cpp @@ -27,17 +27,18 @@ #include #include #include -#include +#include #include #include #include #include #include #include +#include #include -#include #include +#include #include #include #include @@ -534,7 +535,7 @@ void PDP::disable() for (ParticipantProxyData* pdata : participants) { actions_on_remote_participant_removed(pdata, pdata->m_guid, - ParticipantDiscoveryInfo::DISCOVERY_STATUS::REMOVED_PARTICIPANT, nullptr); + ParticipantDiscoveryStatus::REMOVED_PARTICIPANT, nullptr); } } @@ -674,13 +675,14 @@ void PDP::notify_and_maybe_ignore_new_participant( { { std::lock_guard cb_lock(callback_mtx_); - ParticipantDiscoveryInfo info(*pdata); - info.status = ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT; + ParticipantBuiltinTopicData info; + from_proxy_to_builtin(*pdata, info); - listener->onParticipantDiscovery( + listener->on_participant_discovery( getRTPSParticipant()->getUserRTPSParticipant(), - std::move(info), + ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT, + info, should_be_ignored); } @@ -1222,7 +1224,7 @@ void PDP::set_proxy_observer( bool PDP::remove_remote_participant( const GUID_t& partGUID, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) + ParticipantDiscoveryStatus reason) { if (partGUID == getLocalParticipantProxyData()->m_guid) { @@ -1261,7 +1263,7 @@ bool PDP::remove_remote_participant( void PDP::actions_on_remote_participant_removed( ParticipantProxyData* pdata, const GUID_t& partGUID, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason, + ParticipantDiscoveryStatus reason, RTPSParticipantListener* listener) { assert(nullptr != pdata); @@ -1294,7 +1296,7 @@ void PDP::actions_on_remote_participant_removed( if (writer_guid != c_Guid_Unknown) { mp_EDP->unpairWriterProxy(partGUID, writer_guid, - reason == ParticipantDiscoveryInfo::DISCOVERY_STATUS::DROPPED_PARTICIPANT); + reason == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT); if (listener) { @@ -1328,11 +1330,13 @@ void PDP::actions_on_remote_participant_removed( if (listener) { std::lock_guard lock(callback_mtx_); - ParticipantDiscoveryInfo info(*pdata); - info.status = reason; + + ParticipantBuiltinTopicData info; + from_proxy_to_builtin(*pdata, info); + bool should_be_ignored = false; - listener->onParticipantDiscovery(mp_RTPSParticipant->getUserRTPSParticipant(), std::move( - info), should_be_ignored); + listener->on_participant_discovery(mp_RTPSParticipant->getUserRTPSParticipant(), reason, + info, should_be_ignored); } { @@ -1454,7 +1458,7 @@ void PDP::check_remote_participant_liveliness( if (now > real_lease_tm) { guard.unlock(); - remove_remote_participant(remote_participant->m_guid, ParticipantDiscoveryInfo::DROPPED_PARTICIPANT); + remove_remote_participant(remote_participant->m_guid, ParticipantDiscoveryStatus::DROPPED_PARTICIPANT); return; } diff --git a/src/cpp/rtps/builtin/discovery/participant/PDP.h b/src/cpp/rtps/builtin/discovery/participant/PDP.h index a671e5bf9d5..a74d5bb45de 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDP.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDP.h @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -320,7 +321,7 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable */ virtual bool remove_remote_participant( const GUID_t& participant_guid, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason); + ParticipantDiscoveryStatus reason); /** * This method returns the BuiltinAttributes of the local participant. @@ -644,7 +645,7 @@ class PDP : public fastdds::statistics::rtps::IProxyQueryable void actions_on_remote_participant_removed( ParticipantProxyData* pdata, const GUID_t& partGUID, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason, + ParticipantDiscoveryStatus reason, RTPSParticipantListener* listener); }; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp index 674c379bcdf..d0fb68a0cc5 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp @@ -33,8 +33,8 @@ #include #include #include -#include +#include #include #include #include @@ -951,7 +951,7 @@ bool get_server_client_default_guidPrefix( bool PDPClient::remove_remote_participant( const GUID_t& partGUID, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) + ParticipantDiscoveryStatus reason) { if (PDP::remove_remote_participant(partGUID, reason)) { diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h index 40e590cdec0..49267c89440 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClient.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClient.h @@ -136,7 +136,7 @@ class PDPClient : public PDP */ bool remove_remote_participant( const GUID_t& participant_guid, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) override; + ParticipantDiscoveryStatus reason) override; #if HAVE_SECURITY bool pairing_remote_writer_with_local_reader_after_security( diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp index aadee679a77..6140921f50e 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPClientListener.cpp @@ -24,10 +24,10 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp index b3e0ee19f28..4d49a58e422 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp @@ -23,11 +23,14 @@ #include #include +#include #include #include #include #include +#include +#include #include #include #include @@ -159,7 +162,7 @@ void PDPListener::on_new_cache_change_added( else if (reader->matched_writer_is_matched(writer_guid)) { reader->getMutex().unlock(); - if (parent_pdp_->remove_remote_participant(guid, ParticipantDiscoveryInfo::REMOVED_PARTICIPANT)) + if (parent_pdp_->remove_remote_participant(guid, ParticipantDiscoveryStatus::REMOVED_PARTICIPANT)) { #ifdef FASTDDS_STATISTICS //! Removal of a participant proxy should trigger @@ -239,7 +242,8 @@ void PDPListener::process_alive_data( } // Copy proxy to be passed forward before releasing PDP mutex - ParticipantProxyData old_data_copy(*old_data); + ParticipantBuiltinTopicData old_topic_data_copy; + from_proxy_to_builtin(*old_data, old_topic_data_copy); lock.unlock(); @@ -250,12 +254,12 @@ void PDPListener::process_alive_data( { std::lock_guard cb_lock(parent_pdp_->callback_mtx_); - ParticipantDiscoveryInfo info(old_data_copy); - info.status = ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT; + ParticipantBuiltinTopicData info(old_topic_data_copy); - listener->onParticipantDiscovery( + listener->on_participant_discovery( parent_pdp_->getRTPSParticipant()->getUserRTPSParticipant(), - std::move(info), + ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT, + info, should_be_ignored); } if (should_be_ignored) diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h index 380d9a8c6c0..ff2fcd780d9 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPListener.h +++ b/src/cpp/rtps/builtin/discovery/participant/PDPListener.h @@ -21,10 +21,11 @@ #define _FASTDDS_RTPS_PDPLISTENER_H_ #ifndef DOXYGEN_SHOULD_SKIP_THIS_PUBLIC +#include + #include -#include -#include +#include namespace eprosima { namespace fastdds { diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp index 4105867e76b..693e29f2602 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.cpp @@ -1035,13 +1035,13 @@ void PDPServer::announceParticipantState( */ bool PDPServer::remove_remote_participant( const GUID_t& partGUID, - ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) + ParticipantDiscoveryStatus reason) { auto endpoints = static_cast(builtin_endpoints_.get()); // Notify the DiscoveryDataBase on lease duration removal because the listener // has already notified the database in all other cases - if (ParticipantDiscoveryInfo::DROPPED_PARTICIPANT == reason) + if (ParticipantDiscoveryStatus::DROPPED_PARTICIPANT == reason) { CacheChange_t* pC = nullptr; diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp index 3dd6a6bab3a..932d7b35a98 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServer.hpp @@ -109,7 +109,7 @@ class PDPServer : public fastdds::rtps::PDP */ bool remove_remote_participant( const fastdds::rtps::GUID_t& participant_guid, - fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS reason) override; + fastdds::rtps::ParticipantDiscoveryStatus reason) override; /** * Force the sending of our local PDP to all servers diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp index 3094a8e712e..736f716e1d2 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPServerListener.cpp @@ -22,10 +22,12 @@ #include #include +#include #include #include #include +#include #include #include #include @@ -239,11 +241,11 @@ void PDPServerListener::on_new_cache_change_added( } // Store whether the participant is new or updated - auto status = (pdata == nullptr) ? ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT : - ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT; + auto status = (pdata == nullptr) ? ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT : + ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT; // New participant case - if (status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { // TODO: pending avoid builtin connections on client info relayed by other server @@ -296,12 +298,12 @@ void PDPServerListener::on_new_cache_change_added( bool should_be_ignored = false; { std::lock_guard cb_lock(pdp_server()->callback_mtx_); - ParticipantDiscoveryInfo info(*pdata); - info.status = status; + ParticipantBuiltinTopicData info; + from_proxy_to_builtin(*pdata, info); - listener->onParticipantDiscovery( + listener->on_participant_discovery( pdp_server()->getRTPSParticipant()->getUserRTPSParticipant(), - std::move(info), should_be_ignored); + status, std::move(info), should_be_ignored); } if (should_be_ignored) { @@ -339,7 +341,7 @@ void PDPServerListener::on_new_cache_change_added( // Remove participant from proxies reader->getMutex().unlock(); - pdp_server()->remove_remote_participant(guid, ParticipantDiscoveryInfo::REMOVED_PARTICIPANT); + pdp_server()->remove_remote_participant(guid, ParticipantDiscoveryStatus::REMOVED_PARTICIPANT); reader->getMutex().lock(); } diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp index ab7f86b5e41..8dc58834819 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp @@ -16,21 +16,22 @@ * @file PDPSimple.cpp * */ + #include #include #include #include -#include #include #include #include +#include #include -#include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp index 2fb2779ca42..58104b39b01 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DSClientEvent.cpp @@ -17,16 +17,15 @@ * */ -#include - -#include +#include #include #include +#include #include #include -#include +#include #include #include diff --git a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp index be796e85b68..014f1c97463 100644 --- a/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/timedevent/DServerEvent.cpp @@ -17,14 +17,13 @@ * */ -#include - -#include +#include #include -#include +#include #include +#include #include namespace eprosima { diff --git a/src/cpp/rtps/builtin/liveliness/WLP.cpp b/src/cpp/rtps/builtin/liveliness/WLP.cpp index a7100a7c333..7583d2137f9 100644 --- a/src/cpp/rtps/builtin/liveliness/WLP.cpp +++ b/src/cpp/rtps/builtin/liveliness/WLP.cpp @@ -24,12 +24,12 @@ #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/network/utils/external_locators.cpp b/src/cpp/rtps/network/utils/external_locators.cpp index 6fd1f78c0cf..03653f7430f 100644 --- a/src/cpp/rtps/network/utils/external_locators.cpp +++ b/src/cpp/rtps/network/utils/external_locators.cpp @@ -22,13 +22,13 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/network/utils/external_locators.hpp b/src/cpp/rtps/network/utils/external_locators.hpp index 8e0d9653f50..e6e11585730 100644 --- a/src/cpp/rtps/network/utils/external_locators.hpp +++ b/src/cpp/rtps/network/utils/external_locators.hpp @@ -20,10 +20,10 @@ #define FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP #include -#include #include #include +#include #include #include diff --git a/src/cpp/rtps/network/utils/netmask_filter.cpp b/src/cpp/rtps/network/utils/netmask_filter.cpp index ab89046261c..1242e16b253 100644 --- a/src/cpp/rtps/network/utils/netmask_filter.cpp +++ b/src/cpp/rtps/network/utils/netmask_filter.cpp @@ -24,11 +24,11 @@ #include #include -#include #include #include #include +#include #include namespace eprosima { diff --git a/src/cpp/rtps/participant/RTPSParticipant.cpp b/src/cpp/rtps/participant/RTPSParticipant.cpp index d4de419fe97..6410290b099 100644 --- a/src/cpp/rtps/participant/RTPSParticipant.cpp +++ b/src/cpp/rtps/participant/RTPSParticipant.cpp @@ -261,8 +261,8 @@ bool RTPSParticipant::disable_monitor_service() const } bool RTPSParticipant::fill_discovery_data_from_cdr_message( - ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) + ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg) { return mp_impl->fill_discovery_data_from_cdr_message(data, msg); } diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp index c4181136edc..38e87e88134 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -45,6 +44,7 @@ #include #include +#include #include #include #include @@ -2717,7 +2717,7 @@ bool RTPSParticipantImpl::ignore_participant( ignored_participants_.insert(participant_guid); } pdp()->remove_remote_participant(GUID_t(participant_guid, c_EntityId_RTPSParticipant), - ParticipantDiscoveryInfo::DISCOVERY_STATUS::IGNORED_PARTICIPANT); + ParticipantDiscoveryStatus::IGNORED_PARTICIPANT); return true; @@ -2931,17 +2931,19 @@ bool RTPSParticipantImpl::disable_monitor_service() const } bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( - ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) + fastdds::rtps::ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg) { bool ret = true; CDRMessage_t serialized_msg{0}; serialized_msg.wraps = true; - serialized_msg.buffer = msg.value().entity_proxy().data(); + serialized_msg.buffer = const_cast(msg.value().entity_proxy().data()); serialized_msg.length = static_cast(msg.value().entity_proxy().size()); - ret = data.readFromCDRMessage( + ParticipantProxyData part_prox_data(m_att.allocation); + + ret = part_prox_data.readFromCDRMessage( &serialized_msg, true, network_factory(), @@ -2949,7 +2951,12 @@ bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( false, c_VendorId_eProsima); - return ret && (data.m_guid.entityId == c_EntityId_RTPSParticipant); + if (ret) + { + from_proxy_to_builtin(part_prox_data, data); + } + + return ret && (data.guid.entityId == c_EntityId_RTPSParticipant); } bool RTPSParticipantImpl::fill_discovery_data_from_cdr_message( diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h index 9524f144806..4c86edfa40c 100644 --- a/src/cpp/rtps/participant/RTPSParticipantImpl.h +++ b/src/cpp/rtps/participant/RTPSParticipantImpl.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -1219,7 +1220,7 @@ class RTPSParticipantImpl bool disable_monitor_service() const; /** - * fills in the ParticipantProxyData from a MonitorService Message + * fills in the ParticipantBuiltinTopicData from a MonitorService Message * * @param [out] data Proxy to fill * @param [in] msg MonitorService Message to get the proxy information from. @@ -1227,8 +1228,8 @@ class RTPSParticipantImpl * @return true if the operation succeeds. */ bool fill_discovery_data_from_cdr_message( - ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); + ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg); /** * fills in the PublicationBuiltinTopicData from a MonitorService Message diff --git a/src/cpp/rtps/security/SecurityManager.cpp b/src/cpp/rtps/security/SecurityManager.cpp index bf5a4c87d7b..ffce8f3b2fc 100644 --- a/src/cpp/rtps/security/SecurityManager.cpp +++ b/src/cpp/rtps/security/SecurityManager.cpp @@ -26,11 +26,11 @@ #include #include #include -#include #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/security/SecurityManager.h b/src/cpp/rtps/security/SecurityManager.h index 4d806e97323..27845b747d1 100644 --- a/src/cpp/rtps/security/SecurityManager.h +++ b/src/cpp/rtps/security/SecurityManager.h @@ -26,12 +26,12 @@ #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/security/accesscontrol/Permissions.cpp b/src/cpp/security/accesscontrol/Permissions.cpp index 59f8cbff998..b73abc8f91d 100644 --- a/src/cpp/security/accesscontrol/Permissions.cpp +++ b/src/cpp/security/accesscontrol/Permissions.cpp @@ -33,8 +33,8 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/security/authentication/PKIDH.cpp b/src/cpp/security/authentication/PKIDH.cpp index e67336a6dd5..2f9fd725809 100644 --- a/src/cpp/security/authentication/PKIDH.cpp +++ b/src/cpp/security/authentication/PKIDH.cpp @@ -26,8 +26,8 @@ #include #include -#include +#include #include #include #include diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp index 91e230dc11c..d637026238d 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipant.cpp @@ -113,8 +113,8 @@ fastdds::dds::ReturnCode_t DomainParticipant::disable_monitor_service() } fastdds::dds::ReturnCode_t DomainParticipant::fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) + fastdds::rtps::ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg) { #ifdef FASTDDS_STATISTICS return static_cast(impl_)->fill_discovery_data_from_cdr_message(data, msg); diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp index be001f116b3..3c086f015c4 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp @@ -323,8 +323,8 @@ ReturnCode_t DomainParticipantImpl::disable_monitor_service() } ReturnCode_t DomainParticipantImpl::fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg) + fastdds::rtps::ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg) { ReturnCode_t ret{efd::RETCODE_OK}; diff --git a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp index 1b481ea5722..4a94aa10d89 100644 --- a/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp +++ b/src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp @@ -146,7 +146,7 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, efd::ReturnCode_t disable_monitor_service(); /** - * fills in the ParticipantProxyData from a MonitorService Message + * fills in the ParticipantBuiltinTopicData from a MonitorService Message * * @param [out] data Proxy to fill * @param [in] msg MonitorService Message to get the proxy information from. @@ -155,8 +155,8 @@ class DomainParticipantImpl : public efd::DomainParticipantImpl, * @return RETCODE_ERROR if the operation fails. */ efd::ReturnCode_t fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& data, - fastdds::statistics::MonitorServiceStatusData& msg); + fastdds::rtps::ParticipantBuiltinTopicData& data, + const fastdds::statistics::MonitorServiceStatusData& msg); /** * fills in the WriterProxyData from a MonitorService Message diff --git a/test/blackbox/api/dds-pim/PubSubParticipant.hpp b/test/blackbox/api/dds-pim/PubSubParticipant.hpp index f3ecd2d63d0..08ed7058866 100644 --- a/test/blackbox/api/dds-pim/PubSubParticipant.hpp +++ b/test/blackbox/api/dds-pim/PubSubParticipant.hpp @@ -40,6 +40,7 @@ #include #include #include +#include #include /** @@ -162,12 +163,13 @@ class PubSubParticipant void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(should_be_ignored); bool expected = false; - if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { ++participant_->matched_; if (nullptr != participant_->on_discovery_) @@ -178,14 +180,14 @@ class PubSubParticipant participant_->cv_discovery_.notify_one(); } else if (participant_->on_participant_qos_update_ != nullptr && - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { participant_->participant_qos_updated_.compare_exchange_strong(expected, participant_->on_participant_qos_update_(info)); participant_->cv_discovery_.notify_one(); } - else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { --participant_->matched_; participant_->cv_discovery_.notify_one(); @@ -873,13 +875,13 @@ class PubSubParticipant } void set_on_discovery_function( - std::function f) + std::function f) { on_discovery_ = f; } void set_on_participant_qos_update_function( - std::function f) + std::function f) { on_participant_qos_update_ = f; } @@ -973,8 +975,8 @@ class PubSubParticipant std::mutex mutex_discovery_; std::condition_variable cv_discovery_; std::atomic matched_; - std::function on_discovery_; - std::function on_participant_qos_update_; + std::function on_discovery_; + std::function on_participant_qos_update_; std::atomic_bool discovery_result_; std::atomic_bool participant_qos_updated_; diff --git a/test/blackbox/api/dds-pim/PubSubReader.hpp b/test/blackbox/api/dds-pim/PubSubReader.hpp index 308fecb9b12..247dda1f5ff 100644 --- a/test/blackbox/api/dds-pim/PubSubReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubReader.hpp @@ -34,6 +34,7 @@ #if _MSC_VER #include #endif // _MSC_VER +#include #include #include #include @@ -99,24 +100,25 @@ class PubSubReader void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { static_cast(should_be_ignored); if (reader_.onDiscovery_ != nullptr) { std::unique_lock lock(reader_.mutexDiscovery_); - reader_.discovery_result_ |= reader_.onDiscovery_(info); + reader_.discovery_result_ |= reader_.onDiscovery_(info, status); reader_.cvDiscovery_.notify_one(); } - if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { reader_.participant_matched(); } - else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { reader_.participant_unmatched(); } @@ -1688,7 +1690,8 @@ class PubSubReader } void setOnDiscoveryFunction( - std::function f) + std::function f) { onDiscovery_ = f; } @@ -2128,7 +2131,8 @@ class PubSubReader std::string participant_profile_ = ""; std::string datareader_profile_ = ""; - std::function onDiscovery_; + std::function onDiscovery_; EndpointDiscoveryFunctor onEndpointDiscovery_; //! True to take data from history. On False, read_ is checked. diff --git a/test/blackbox/api/dds-pim/PubSubWriter.hpp b/test/blackbox/api/dds-pim/PubSubWriter.hpp index b368033abc5..e39b2cd70a0 100644 --- a/test/blackbox/api/dds-pim/PubSubWriter.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriter.hpp @@ -32,6 +32,7 @@ #if _MSC_VER #include #endif // _MSC_VER +#include #include #include #include @@ -80,7 +81,8 @@ class PubSubWriter void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { static_cast(should_be_ignored); @@ -89,12 +91,12 @@ class PubSubWriter writer_.discovery_result_ = writer_.onDiscovery_(info); } - if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { writer_.participant_matched(); } - else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { writer_.participant_unmatched(); } @@ -2018,7 +2020,7 @@ class PubSubWriter std::string participant_profile_ = ""; std::string datawriter_profile_ = ""; - std::function onDiscovery_; + std::function onDiscovery_; //! A mutex for liveliness std::mutex liveliness_mutex_; diff --git a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp index 59ef96e149d..edc3e51ebda 100644 --- a/test/blackbox/api/dds-pim/PubSubWriterReader.hpp +++ b/test/blackbox/api/dds-pim/PubSubWriterReader.hpp @@ -82,25 +82,26 @@ class PubSubWriterReader #endif // if HAVE_SECURITY void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant* participant, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { static_cast(should_be_ignored); static_cast(participant); - switch (info.status) + switch (status) { - case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT: - info_add(discovered_participants_, info.info.m_guid); + case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT: + info_add(discovered_participants_, info.guid); break; - case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT: - info_remove(discovered_participants_, info.info.m_guid); + case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT: + info_remove(discovered_participants_, info.guid); break; - case eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT: - std::cout << "Participant " << info.info.m_guid << " has been dropped"; - info_remove(discovered_participants_, info.info.m_guid); + case eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT: + std::cout << "Participant " << info.guid << " has been dropped"; + info_remove(discovered_participants_, info.guid); break; default: diff --git a/test/blackbox/common/BlackboxTestsDiscovery.cpp b/test/blackbox/common/BlackboxTestsDiscovery.cpp index 43b96a16ae4..ad8f29561ce 100644 --- a/test/blackbox/common/BlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/BlackboxTestsDiscovery.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -890,19 +891,20 @@ TEST_P(Discovery, PubSubAsReliableHelloworldParticipantDiscovery) ASSERT_TRUE(writer.isInitialized()); int count = 0; - reader.setOnDiscoveryFunction([&writer, &count](const ParticipantDiscoveryInfo& info) -> bool + reader.setOnDiscoveryFunction([&writer, &count](const ParticipantBuiltinTopicData& info, + ParticipantDiscoveryStatus status) -> bool { - if (info.info.m_guid == writer.participant_guid()) + if (info.guid == writer.participant_guid()) { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { - std::cout << "Discovered participant " << info.info.m_guid << std::endl; + std::cout << "Discovered participant " << info.guid << std::endl; ++count; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { - std::cout << "Removed participant " << info.info.m_guid << std::endl; + std::cout << "Removed participant " << info.guid << std::endl; return ++count == 2; } } @@ -935,16 +937,17 @@ TEST_P(Discovery, PubSubAsReliableHelloworldUserData) ASSERT_TRUE(writer.isInitialized()); - reader.setOnDiscoveryFunction([&writer](const ParticipantDiscoveryInfo& info) -> bool + reader.setOnDiscoveryFunction([&writer](const ParticipantBuiltinTopicData& info, + ParticipantDiscoveryStatus /*status*/) -> bool { - if (info.info.m_guid == writer.participant_guid()) + if (info.guid == writer.participant_guid()) { std::cout << "Received USER_DATA from the writer: "; - for (auto i: info.info.m_userData) + for (auto i: info.user_data) { std::cout << i << ' '; } - return info.info.m_userData == std::vector({'a', 'b', 'c', 'd'}); + return info.user_data == std::vector({'a', 'b', 'c', 'd'}); } return false; @@ -1600,15 +1603,16 @@ TEST(Discovery, discovery_cyclone_participant_with_custom_pid) void on_participant_discovery( DomainParticipant*, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& /*info*/, bool& should_be_ignored) override { should_be_ignored = false; - if (ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT == info.status) + if (ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT == status) { discovered_participants_++; } - else if (ParticipantDiscoveryInfo::REMOVED_PARTICIPANT == info.status) + else if (ParticipantDiscoveryStatus::REMOVED_PARTICIPANT == status) { discovered_participants_--; } diff --git a/test/blackbox/common/BlackboxTestsSecurity.cpp b/test/blackbox/common/BlackboxTestsSecurity.cpp index 706c4f7e7a0..ce82f801fba 100644 --- a/test/blackbox/common/BlackboxTestsSecurity.cpp +++ b/test/blackbox/common/BlackboxTestsSecurity.cpp @@ -2724,16 +2724,17 @@ TEST_P(Security, BuiltinAuthenticationAndCryptoPlugin_user_data) sub_property_policy.properties().emplace_back("rtps.endpoint.submessage_protection_kind", "ENCRYPT"); sub_property_policy.properties().emplace_back("rtps.endpoint.payload_protection_kind", "ENCRYPT"); - reader.setOnDiscoveryFunction([&writer](const ParticipantDiscoveryInfo& info) -> bool + reader.setOnDiscoveryFunction([&writer](const ParticipantBuiltinTopicData& info, + ParticipantDiscoveryStatus /*status*/) -> bool { - if (info.info.m_guid == writer.participant_guid()) + if (info.guid == writer.participant_guid()) { std::cout << "Received USER_DATA from the writer: "; - for (auto i : info.info.m_userData) + for (auto i : info.user_data) { std::cout << i << ' '; } - return info.info.m_userData == std::vector({ 'a', 'b', 'c', 'd', 'e' }); + return info.user_data == std::vector({ 'a', 'b', 'c', 'd', 'e' }); } return false; diff --git a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp index b4cd187feb3..fbebce6c081 100644 --- a/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp +++ b/test/blackbox/common/DDSBlackboxTestsAckPositive.cpp @@ -35,7 +35,6 @@ #include #include #include -#include #include #include "BlackboxTests.hpp" diff --git a/test/blackbox/common/DDSBlackboxTestsBasic.cpp b/test/blackbox/common/DDSBlackboxTestsBasic.cpp index 1f283275b97..5b865787eca 100644 --- a/test/blackbox/common/DDSBlackboxTestsBasic.cpp +++ b/test/blackbox/common/DDSBlackboxTestsBasic.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -530,14 +531,15 @@ TEST(DDSBasic, IgnoreParticipant) void on_participant_discovery( DomainParticipant* /*participant*/, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { std::cout << "Using custom listener" << std::endl; - if (info.status == info.DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Discovered participant" << std::endl; - if (info.info.m_userData == std::vector({ 'i', 'g', 'n' })) + if (info.user_data == std::vector({ 'i', 'g', 'n' })) { std::cout << "Ignoring participant" << std::endl; should_be_ignored = true; diff --git a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp index 7960d05df2b..5ac07eda051 100644 --- a/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp +++ b/test/blackbox/common/DDSBlackboxTestsDiscovery.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include @@ -593,26 +593,27 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) void on_participant_discovery( DomainParticipant* participant, - ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(should_be_ignored); std::unique_lock lck(*mtx_); - if (info.status == - eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERY_STATUS::DISCOVERED_PARTICIPANT) + if (status == + eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { static_cast(participant); if (nullptr != remote_participant_info) { delete remote_participant_info; } - remote_participant_info = new ParticipantProxyData(info.info); + remote_participant_info = new ParticipantBuiltinTopicData(info); found_->store(true); cv_->notify_one(); } } - ParticipantProxyData* remote_participant_info; + eprosima::fastdds::dds::ParticipantBuiltinTopicData* remote_participant_info; private: @@ -665,7 +666,7 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) participant_found.store(false); // Prevent assertion on spurious discovery of a participant from elsewhere - if (part_1->guid() == listener.remote_participant_info->m_guid) + if (part_1->guid() == listener.remote_participant_info->guid) { // Check that all three properties are present in the ParticipantProxyData, and that their value // is that of the property in part_1 (the original property value) @@ -673,13 +674,13 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) { // Find property in ParticipantProxyData auto received_property = std::find_if( - listener.remote_participant_info->m_properties.begin(), - listener.remote_participant_info->m_properties.end(), + listener.remote_participant_info->properties.begin(), + listener.remote_participant_info->properties.end(), [&](const ParameterProperty_t& property) { return property.first() == physical_property_name; }); - ASSERT_NE(received_property, listener.remote_participant_info->m_properties.end()); + ASSERT_NE(received_property, listener.remote_participant_info->properties.end()); // Find property in first participant auto part_1_property = PropertyPolicyHelper::find_property( @@ -725,20 +726,20 @@ TEST(DDSDiscovery, ParticipantProxyPhysicalData) participant_found.store(false); // Prevent assertion on spurious discovery of a participant from elsewhere - if (part_1->guid() == listener.remote_participant_info->m_guid) + if (part_1->guid() == listener.remote_participant_info->guid) { // Check that none of the three properties are present in the ParticipantProxyData. for (auto physical_property_name : physical_property_names) { // Look for property in ParticipantProxyData auto received_property = std::find_if( - listener.remote_participant_info->m_properties.begin(), - listener.remote_participant_info->m_properties.end(), + listener.remote_participant_info->properties.begin(), + listener.remote_participant_info->properties.end(), [&](const ParameterProperty_t& property) { return property.first() == physical_property_name; }); - ASSERT_EQ(received_property, listener.remote_participant_info->m_properties.end()); + ASSERT_EQ(received_property, listener.remote_participant_info->properties.end()); } break; } @@ -773,15 +774,16 @@ TEST(DDSDiscovery, DDSDiscoveryDoesNotDropUDPLocator) void on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { static_cast(should_be_ignored); - if (info.status == info.DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::lock_guard guard(mtx); - guid = info.info.m_guid; - metatraffic = info.info.metatraffic_locators; + guid = info.guid; + metatraffic = info.metatraffic_locators; cv.notify_all(); } } @@ -1836,10 +1838,11 @@ TEST(DDSDiscovery, DataracePDP) void on_participant_discovery( DomainParticipant* /*participant*/, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& /*info*/, bool& /*should_be_ignored*/) override { - if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { try { @@ -1851,8 +1854,8 @@ TEST(DDSDiscovery, DataracePDP) } destruction_future.wait(); } - else if (info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == eprosima::fastdds::rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == eprosima::fastdds::rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { try { diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp index 77c9c809fc9..8a7fe88f797 100644 --- a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp +++ b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp @@ -20,8 +20,8 @@ #include // TODO(jlbueno): remove private header +#include #include - #include "../types/statistics/monitorservice_typesPubSubTypes.hpp" #include "BlackboxTests.hpp" #include "PubSubReader.hpp" @@ -704,8 +704,7 @@ struct ProxySampleValidator : public SampleValidator if (guid.entityId == c_EntityId_RTPSParticipant) { - RTPSParticipantAllocationAttributes att; - ParticipantProxyData pdata(att); + eprosima::fastdds::rtps::ParticipantBuiltinTopicData pdata; ASSERT_EQ(participant->fill_discovery_data_from_cdr_message(pdata, data), @@ -713,7 +712,7 @@ struct ProxySampleValidator : public SampleValidator auto part_names = participant->get_participant_names(); auto it_names = - std::find(part_names.begin(), part_names.end(), pdata.m_participantName.to_string()); + std::find(part_names.begin(), part_names.end(), pdata.participant_name.to_string()); ASSERT_TRUE(it_names != part_names.end()); } else if (guid.entityId.is_reader()) diff --git a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp index 31a625d89c1..698b7c0a633 100644 --- a/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsPropertyQos.cpp @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include #include #include -#include #include #include "BlackboxTests.hpp" @@ -113,13 +113,13 @@ TEST_P(PropertyQos, send_property_qos) PubSubParticipant participant_2(0u, 0u, 0u, 0u); - participant_2.set_on_discovery_function([&](const rtps::ParticipantDiscoveryInfo& info) -> bool + participant_2.set_on_discovery_function([&](const eprosima::fastdds::dds::ParticipantBuiltinTopicData& info) -> bool { std::cout << "Received Property Qos: "; // Check the external has arrived and the internal does not bool property_received = false; - for (auto i : info.info.m_properties) + for (auto i : info.properties) { std::cout << i.first() << " :{ " << i.second() << " } ; "; diff --git a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp index 993fc1a888a..1f004f0f673 100644 --- a/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp +++ b/test/blackbox/common/DDSBlackboxTestsTransportSHMUDP.cpp @@ -190,12 +190,12 @@ static bool has_shm_locators( } static void check_shm_locators( - const eprosima::fastdds::rtps::ParticipantDiscoveryInfo& info, + const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info, bool unicast, bool multicast) { - EXPECT_EQ(multicast, has_shm_locators(info.info.metatraffic_locators.multicast)); - EXPECT_EQ(unicast, has_shm_locators(info.info.metatraffic_locators.unicast)); + EXPECT_EQ(multicast, has_shm_locators(info.metatraffic_locators.multicast)); + EXPECT_EQ(unicast, has_shm_locators(info.metatraffic_locators.unicast)); } static void shm_metatraffic_test( @@ -207,7 +207,9 @@ static void shm_metatraffic_test( PubSubWriter writer(topic_name + "/" + value); PubSubReader reader(topic_name + "/" + value); - auto discovery_checker = [unicast, multicast](const eprosima::fastdds::rtps::ParticipantDiscoveryInfo& info) + auto discovery_checker = + [unicast, multicast](const eprosima::fastdds::rtps::ParticipantBuiltinTopicData& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus /*status*/) { check_shm_locators(info, unicast, multicast); return true; diff --git a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp index d37ed646397..3bfdff1f555 100644 --- a/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp +++ b/test/blackbox/common/DDSBlackboxTestsUserDataQos.cpp @@ -15,9 +15,9 @@ #include #include #include -#include #include +#include #include "BlackboxTests.hpp" #include "PubSubParticipant.hpp" @@ -84,25 +84,25 @@ TEST_P(UserDataQos, update_user_data_qos) PubSubParticipant participant_2(0u, 0u, 0u, 0u); - participant_2.set_on_discovery_function([&](const rtps::ParticipantDiscoveryInfo& info) -> bool + participant_2.set_on_discovery_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool { std::cout << "Received USER_DATA: "; - for (auto i : info.info.m_userData) + for (auto i : info.user_data) { std::cout << i << ' '; } std::cout << std::endl; - return info.info.m_userData == std::vector({'a', 'b', 'c', 'd', 'e'}); + return info.user_data == std::vector({'a', 'b', 'c', 'd', 'e'}); }); - participant_2.set_on_participant_qos_update_function([&](const rtps::ParticipantDiscoveryInfo& info) -> bool + participant_2.set_on_participant_qos_update_function([&](const rtps::ParticipantBuiltinTopicData& info) -> bool { std::cout << "Received USER_DATA: "; - for (auto i : info.info.m_userData) + for (auto i : info.user_data) { std::cout << i << ' '; } std::cout << std::endl; - return info.info.m_userData == std::vector({'f', 'g'}); + return info.user_data == std::vector({'f', 'g'}); }); ASSERT_TRUE(participant_2.init_participant()); diff --git a/test/dds/communication/PublisherDynamic.cpp b/test/dds/communication/PublisherDynamic.cpp index 06542c017e1..41aea878ee6 100644 --- a/test/dds/communication/PublisherDynamic.cpp +++ b/test/dds/communication/PublisherDynamic.cpp @@ -64,28 +64,29 @@ class ParListener : public DomainParticipantListener */ void on_participant_discovery( DomainParticipant* /*participant*/, - rtps::ParticipantDiscoveryInfo&& info, + rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) override { - if (info.status == rtps::ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == rtps::ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == rtps::ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == rtps::ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == rtps::ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == rtps::ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == rtps::ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == rtps::ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; if (exit_on_lost_liveliness_) { run = false; diff --git a/test/dds/communication/PublisherModule.cpp b/test/dds/communication/PublisherModule.cpp index 3332a360bf7..c09a0fcdf23 100644 --- a/test/dds/communication/PublisherModule.cpp +++ b/test/dds/communication/PublisherModule.cpp @@ -214,28 +214,29 @@ void PublisherModule::on_publication_matched( void PublisherModule::on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Publisher participant " << // participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; if (exit_on_lost_liveliness_) { run_ = false; diff --git a/test/dds/communication/PublisherModule.hpp b/test/dds/communication/PublisherModule.hpp index 9598e8acfad..21b68006e64 100644 --- a/test/dds/communication/PublisherModule.hpp +++ b/test/dds/communication/PublisherModule.hpp @@ -19,6 +19,10 @@ #ifndef TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP #define TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP +#include +#include + +#include #include #include #include @@ -27,9 +31,6 @@ #include "types/FixedSizedPubSubTypes.hpp" #include "types/HelloWorldPubSubTypes.hpp" -#include -#include - namespace eprosima { namespace fastdds { namespace dds { @@ -63,7 +64,8 @@ class PublisherModule */ void on_participant_discovery( DomainParticipant* /*participant*/, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; #if HAVE_SECURITY diff --git a/test/dds/communication/SubscriberDynamic.cpp b/test/dds/communication/SubscriberDynamic.cpp index 095d3ea380c..5c3dbc8b7b5 100644 --- a/test/dds/communication/SubscriberDynamic.cpp +++ b/test/dds/communication/SubscriberDynamic.cpp @@ -61,28 +61,29 @@ class ParListener : public DomainParticipantListener */ void on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) override { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; } } diff --git a/test/dds/communication/SubscriberModule.cpp b/test/dds/communication/SubscriberModule.cpp index 9cb89508e7f..062b1982dbb 100644 --- a/test/dds/communication/SubscriberModule.cpp +++ b/test/dds/communication/SubscriberModule.cpp @@ -197,28 +197,29 @@ bool SubscriberModule::run_for( void SubscriberModule::on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; } } diff --git a/test/dds/communication/SubscriberModule.hpp b/test/dds/communication/SubscriberModule.hpp index 9e315f03121..9d9062b4b13 100644 --- a/test/dds/communication/SubscriberModule.hpp +++ b/test/dds/communication/SubscriberModule.hpp @@ -19,6 +19,12 @@ #ifndef TEST_COMMUNICATION_SUBSCRIBER_HPP #define TEST_COMMUNICATION_SUBSCRIBER_HPP +#include +#include +#include +#include + +#include #include #include #include @@ -27,11 +33,6 @@ #include "types/FixedSizedPubSubTypes.hpp" #include "types/HelloWorldPubSubTypes.hpp" -#include -#include -#include -#include - namespace eprosima { namespace fastdds { namespace dds { @@ -61,7 +62,8 @@ class SubscriberModule void on_participant_discovery( DomainParticipant* /*participant*/, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; #if HAVE_SECURITY diff --git a/test/dds/communication/security/PublisherModule.cpp b/test/dds/communication/security/PublisherModule.cpp index 76cd0434647..8505d09cfe2 100644 --- a/test/dds/communication/security/PublisherModule.cpp +++ b/test/dds/communication/security/PublisherModule.cpp @@ -214,28 +214,29 @@ void PublisherModule::on_publication_matched( void PublisherModule::on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Publisher participant " << // participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Publisher participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; if (exit_on_lost_liveliness_) { run_ = false; diff --git a/test/dds/communication/security/PublisherModule.hpp b/test/dds/communication/security/PublisherModule.hpp index 3c3de5f46be..7f316e5d81c 100644 --- a/test/dds/communication/security/PublisherModule.hpp +++ b/test/dds/communication/security/PublisherModule.hpp @@ -19,6 +19,10 @@ #ifndef TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP #define TEST_DDS_COMMUNICATION_PUBLISHERMODULE_HPP +#include +#include + +#include #include #include #include @@ -27,9 +31,6 @@ #include "types/FixedSizedPubSubTypes.hpp" #include "types/HelloWorldPubSubTypes.hpp" -#include -#include - namespace eprosima { namespace fastdds { namespace dds { @@ -64,7 +65,8 @@ class PublisherModule */ void on_participant_discovery( DomainParticipant* participant, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; #if HAVE_SECURITY diff --git a/test/dds/communication/security/SubscriberModule.cpp b/test/dds/communication/security/SubscriberModule.cpp index f0167cc52c2..349454864d0 100644 --- a/test/dds/communication/security/SubscriberModule.cpp +++ b/test/dds/communication/security/SubscriberModule.cpp @@ -189,28 +189,29 @@ bool SubscriberModule::run_for( void SubscriberModule::on_participant_discovery( DomainParticipant* /*participant*/, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& /*should_be_ignored*/) { - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " discovered participant " << info.info.m_guid << std::endl; + " discovered participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " detected changes on participant " << info.info.m_guid << std::endl; + " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " removed participant " << info.info.m_guid << std::endl; + " removed participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { std::cout << "Subscriber participant " << //participant->getGuid() << - " dropped participant " << info.info.m_guid << std::endl; + " dropped participant " << info.guid << std::endl; } } diff --git a/test/dds/communication/security/SubscriberModule.hpp b/test/dds/communication/security/SubscriberModule.hpp index c7630654f8c..988da3e5cd1 100644 --- a/test/dds/communication/security/SubscriberModule.hpp +++ b/test/dds/communication/security/SubscriberModule.hpp @@ -19,19 +19,19 @@ #ifndef TEST_COMMUNICATION_SUBSCRIBER_HPP #define TEST_COMMUNICATION_SUBSCRIBER_HPP +#include +#include +#include +#include + +#include #include #include #include -#include #include "types/FixedSizedPubSubTypes.hpp" #include "types/HelloWorldPubSubTypes.hpp" -#include -#include -#include -#include - namespace eprosima { namespace fastdds { namespace dds { @@ -59,7 +59,8 @@ class SubscriberModule void on_participant_discovery( DomainParticipant* /*participant*/, - fastdds::rtps::ParticipantDiscoveryInfo&& info, + fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; #if HAVE_SECURITY diff --git a/test/dds/discovery/ParticipantModule.cpp b/test/dds/discovery/ParticipantModule.cpp index efe2526f018..ea8d41cfac6 100644 --- a/test/dds/discovery/ParticipantModule.cpp +++ b/test/dds/discovery/ParticipantModule.cpp @@ -86,24 +86,25 @@ bool ParticipantModule::init() void ParticipantModule::on_participant_discovery( DomainParticipant* participant, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) { static_cast(should_be_ignored); - if (info.status == ParticipantDiscoveryInfo::DISCOVERED_PARTICIPANT) + if (status == ParticipantDiscoveryStatus::DISCOVERED_PARTICIPANT) { - std::cout << "Participant " << participant->guid() << " discovered participant " << info.info.m_guid << ": " + std::cout << "Participant " << participant->guid() << " discovered participant " << info.guid << ": " << ++matched_ << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::CHANGED_QOS_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::CHANGED_QOS_PARTICIPANT) { - std::cout << "Participant " << participant->guid() << " detected changes on participant " << info.info.m_guid + std::cout << "Participant " << participant->guid() << " detected changes on participant " << info.guid << std::endl; } - else if (info.status == ParticipantDiscoveryInfo::REMOVED_PARTICIPANT || - info.status == ParticipantDiscoveryInfo::DROPPED_PARTICIPANT) + else if (status == ParticipantDiscoveryStatus::REMOVED_PARTICIPANT || + status == ParticipantDiscoveryStatus::DROPPED_PARTICIPANT) { - std::cout << "Participant " << participant->guid() << " undiscovered participant " << info.info.m_guid << ": " + std::cout << "Participant " << participant->guid() << " undiscovered participant " << info.guid << ": " << --matched_ << std::endl; } } diff --git a/test/dds/discovery/ParticipantModule.hpp b/test/dds/discovery/ParticipantModule.hpp index 31cafa66d1b..0ab1af97df3 100644 --- a/test/dds/discovery/ParticipantModule.hpp +++ b/test/dds/discovery/ParticipantModule.hpp @@ -21,6 +21,7 @@ #include +#include #include #include #include @@ -46,7 +47,8 @@ class ParticipantModule : public DomainParticipantListener void on_participant_discovery( DomainParticipant* participant, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override; bool init(); diff --git a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h index 05b3254a45e..54bce71540b 100644 --- a/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h +++ b/test/mock/rtps/EDP/rtps/builtin/discovery/endpoint/EDP.h @@ -20,8 +20,7 @@ #define FASTDDS_RTPS_BUILTIN_DISCOVERY_ENDPOINT_EDP_H #include -#include - +#include #include #include #include diff --git a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h index fa715adc6e2..2c0ac9f2575 100644 --- a/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h +++ b/test/mock/rtps/PDP/rtps/builtin/discovery/participant/PDP.h @@ -21,8 +21,8 @@ #include -#include #include +#include #include #include #include diff --git a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h index 53a44058b4d..ecdfff04ee2 100644 --- a/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h +++ b/test/mock/rtps/PDPSimple/rtps/builtin/discovery/participant/PDPSimple.h @@ -21,9 +21,8 @@ #include -#include - #include +#include #include #include diff --git a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp b/test/mock/rtps/ParticipantProxyData/rtps/builtin/data/ParticipantProxyData.hpp similarity index 93% rename from test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp rename to test/mock/rtps/ParticipantProxyData/rtps/builtin/data/ParticipantProxyData.hpp index cab27c46ebe..30811e1e036 100644 --- a/test/mock/rtps/ParticipantProxyData/fastdds/rtps/builtin/data/ParticipantProxyData.hpp +++ b/test/mock/rtps/ParticipantProxyData/rtps/builtin/data/ParticipantProxyData.hpp @@ -15,8 +15,8 @@ /** * @file ParticipantProxyData.hpp */ -#ifndef FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP -#define FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP +#ifndef RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP +#define RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP #include #include @@ -81,4 +81,4 @@ class ParticipantProxyData } // namespace fastdds } // namespace eprosima -#endif // FASTDDS_RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP +#endif // RTPS_BUILTIN_DATA__PARTICIPANTPROXYDATA_HPP diff --git a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp index 3e0451358a4..c6375f17ef1 100644 --- a/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp +++ b/test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.hpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -126,8 +126,8 @@ class FASTDDS_EXPORTED_API RTPSParticipant } bool fill_discovery_data_from_cdr_message( - fastdds::rtps::ParticipantProxyData& /*data*/, - fastdds::statistics::MonitorServiceStatusData& /*msg*/) + fastdds::rtps::ParticipantBuiltinTopicData& /*data*/, + const fastdds::statistics::MonitorServiceStatusData& /*msg*/) { return true; } diff --git a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h index c05f0c1ded3..5b5f22577fb 100644 --- a/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h +++ b/test/mock/rtps/RTPSParticipantImpl/rtps/participant/RTPSParticipantImpl.h @@ -27,6 +27,7 @@ // Include first possible mocks (depending on include on CMakeLists.txt) #include +#include #include #include #include @@ -70,15 +71,18 @@ class MockParticipantListener : public RTPSParticipantListener { public: - void onParticipantDiscovery( + void on_participant_discovery( RTPSParticipant* participant, - ParticipantDiscoveryInfo&& info, + ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData& info, bool& should_be_ignored) override { - onParticipantDiscovery_mock(participant, info, should_be_ignored); + on_participant_discovery_mock(participant, status, info, should_be_ignored); } - MOCK_METHOD3(onParticipantDiscovery_mock, void (RTPSParticipant*, const ParticipantDiscoveryInfo&, bool&)); + MOCK_METHOD4(on_participant_discovery_mock, + void (RTPSParticipant*, ParticipantDiscoveryStatus, const ParticipantBuiltinTopicData&, + bool&)); #if HAVE_SECURITY void onParticipantAuthentication( diff --git a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h index 2c01857ff35..21d6dbe4482 100644 --- a/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h +++ b/test/mock/rtps/SecurityPluginFactory/rtps/security/MockAccessControlPlugin.h @@ -19,8 +19,7 @@ #ifndef FASTDDS_RTPS_SECURITY__MOCKACCESSCONTROLPLUGIN_H #define FASTDDS_RTPS_SECURITY__MOCKACCESSCONTROLPLUGIN_H -#include - +#include #include #include #include diff --git a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp index aa4fca43736..c7b11c478b4 100644 --- a/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp +++ b/test/mock/rtps/WLP/rtps/builtin/liveliness/WLP.hpp @@ -28,6 +28,8 @@ #include #include +#include + namespace eprosima { namespace fastdds { namespace rtps { diff --git a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp index 196fad1efc2..33102126fa0 100644 --- a/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp +++ b/test/mock/rtps/external_locators/rtps/network/utils/external_locators.hpp @@ -20,10 +20,10 @@ #define FASTDDS_RTPS_NETWORK_UTILS_EXTERNAL_LOCATORS_HPP #include -#include #include #include +#include #include #include diff --git a/test/unittest/dds/participant/ParticipantTests.cpp b/test/unittest/dds/participant/ParticipantTests.cpp index 8bddf176175..cf637e0a0d2 100644 --- a/test/unittest/dds/participant/ParticipantTests.cpp +++ b/test/unittest/dds/participant/ParticipantTests.cpp @@ -2535,10 +2535,12 @@ class CustomListener2 : public DomainParticipantListener void on_participant_discovery( eprosima::fastdds::dds::DomainParticipant*, - eprosima::fastdds::rtps::ParticipantDiscoveryInfo&&, + eprosima::fastdds::rtps::ParticipantDiscoveryStatus status, + const ParticipantBuiltinTopicData&, bool& should_be_ignored) override { static_cast(should_be_ignored); + static_cast(status); try { promise_.set_value(); @@ -3658,7 +3660,7 @@ TEST(ParticipantTests, UnsupportedMethods) // Discovery methods std::vector handle_vector({InstanceHandle_t()}); - builtin::ParticipantBuiltinTopicData pbtd; + ParticipantBuiltinTopicData pbtd; builtin::TopicBuiltinTopicData tbtd; ASSERT_EQ(participant->get_discovered_participants(handle_vector), RETCODE_UNSUPPORTED); diff --git a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp index e757dea8a88..aac619c3510 100644 --- a/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp +++ b/test/unittest/rtps/builtin/BuiltinDataSerializationTests.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include @@ -30,6 +29,7 @@ #include #include +#include #include #include diff --git a/test/unittest/rtps/discovery/PDPTests.cpp b/test/unittest/rtps/discovery/PDPTests.cpp index d461bf7590c..15ffe10667a 100644 --- a/test/unittest/rtps/discovery/PDPTests.cpp +++ b/test/unittest/rtps/discovery/PDPTests.cpp @@ -210,7 +210,7 @@ class PDPTester : public PDP bool remove_remote_participant( const GUID_t& /*participant_guid*/, - ParticipantDiscoveryInfo::DISCOVERY_STATUS /*reason*/) override + ParticipantDiscoveryStatus /*reason*/) override { return true; } @@ -259,7 +259,8 @@ class Listener : public eprosima::fastdds::dds::DomainParticipantListener void on_participant_discovery( fastdds::dds::DomainParticipant* participant, - fastdds::rtps::ParticipantDiscoveryInfo&& /*info*/, + fastdds::rtps::ParticipantDiscoveryStatus /*status*/, + const fastdds::rtps::ParticipantBuiltinTopicData& /*info*/, bool& /*should_be_ignored*/) override { if (std::find(p_matched_.begin(), p_matched_.end(), participant->guid()) == p_matched_.end()) diff --git a/test/unittest/rtps/network/ExternalLocatorsTests.cpp b/test/unittest/rtps/network/ExternalLocatorsTests.cpp index f2fe5d3784e..3a25eaf8191 100644 --- a/test/unittest/rtps/network/ExternalLocatorsTests.cpp +++ b/test/unittest/rtps/network/ExternalLocatorsTests.cpp @@ -17,6 +17,7 @@ #include #include +#include #include using namespace eprosima::fastdds::rtps; diff --git a/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp b/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp index 0f6b1c6ba11..927745602f7 100644 --- a/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp +++ b/test/unittest/rtps/security/SecurityHandshakeProcessTests.cpp @@ -14,6 +14,8 @@ #include "SecurityTests.hpp" +#include + TEST_F(SecurityTest, discovered_participant_begin_handshake_request_fail_and_then_ok) { initialization_ok(); diff --git a/test/unittest/rtps/security/SecurityTests.hpp b/test/unittest/rtps/security/SecurityTests.hpp index dc3f8605679..ddd1483d6a7 100644 --- a/test/unittest/rtps/security/SecurityTests.hpp +++ b/test/unittest/rtps/security/SecurityTests.hpp @@ -17,9 +17,10 @@ #include -#include #include #include + +#include #include #include #include diff --git a/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp b/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp index 05dff8a1414..7f6e2cbb3a8 100644 --- a/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp +++ b/test/unittest/rtps/security/SecurityValidationRemoteTests.cpp @@ -14,6 +14,8 @@ #include "SecurityTests.hpp" +#include + TEST_F(SecurityTest, discovered_participant_validation_remote_identity_fail) { initialization_ok(); diff --git a/test/unittest/security/accesscontrol/AccessControlTests.cpp b/test/unittest/security/accesscontrol/AccessControlTests.cpp index fd1cc5ba5a3..802e909973f 100644 --- a/test/unittest/security/accesscontrol/AccessControlTests.cpp +++ b/test/unittest/security/accesscontrol/AccessControlTests.cpp @@ -16,8 +16,7 @@ #include -#include - +#include #include #include #include diff --git a/test/unittest/security/authentication/AuthenticationPluginTests.hpp b/test/unittest/security/authentication/AuthenticationPluginTests.hpp index 53c41c679e9..e0aa5e610a8 100644 --- a/test/unittest/security/authentication/AuthenticationPluginTests.hpp +++ b/test/unittest/security/authentication/AuthenticationPluginTests.hpp @@ -19,8 +19,8 @@ // Include first necessary mocks #include -#include +#include #include #include #include diff --git a/versions.md b/versions.md index 39e3e3420de..f0be7701315 100644 --- a/versions.md +++ b/versions.md @@ -17,6 +17,7 @@ Forthcoming * All public methods now have `snake_case` names * All public attributes now have `snake_case` names * Discovery callbacks refactor: + * on_participant_discovery now receives a `ParticipantDiscoveryStatus` and a `ParticipantBuiltinTopicData` instead of a `ParticipantDiscoveryInfo` * on_data_reader_discovery now receives a `ReaderDiscoveryStatus` and a `SubscriptionBuiltinTopicData` instead of a `ReaderDiscoveryInfo` * on_data_writer_discovery now receives a `WriterDiscoveryStatus` and a `PublicationBuiltinTopicData` instead of a `WriterDiscoveryInfo` * Public API that is no longer public: @@ -25,6 +26,8 @@ Forthcoming * ReaderDiscoveryInfo * WriterProxyData * WriterDiscoveryInfo + * ParticiantProxyData + * ParticiantDiscoveryInfo * ParticipantAttributes * ReplierAttributes * RequesterAttributes