Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[21433] Improve PDPClients initialization (backport #5459) #5508

Merged
merged 3 commits into from
Jan 21, 2025
Merged

[21433] Improve PDPClients initialization (backport #5459) #5508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd2d53c
Improve PDPClients initialization (#5459)
cferreiragonz Dec 18, 2024
e20d736
Fix backport namespaces
MiguelCompany Jan 21, 2025
9420c9d
Fix build
MiguelCompany Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cpp/rtps/builtin/discovery/participant/PDPClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ ParticipantProxyData* PDPClient::createParticipantProxyData(
ParticipantProxyData* pdata = add_participant_proxy_data(participant_data.m_guid, is_server, &participant_data);
if (pdata != nullptr)
{
// Clients only assert its server lifeliness, other clients liveliness is provided
// Clients only assert its server liveliness, other clients liveliness is provided
// through server's PDP discovery data
if (is_server)
{
Expand Down
10 changes: 7 additions & 3 deletions src/cpp/rtps/participant/RTPSParticipantImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2850,9 +2850,13 @@ void RTPSParticipantImpl::get_default_metatraffic_locators(
{
uint32_t metatraffic_multicast_port = att.port.getMulticastPort(domain_id_);

m_network_Factory.getDefaultMetatrafficMulticastLocators(att.builtin.metatrafficMulticastLocatorList,
metatraffic_multicast_port);
m_network_Factory.NormalizeLocators(att.builtin.metatrafficMulticastLocatorList);
if (m_att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::CLIENT &&
m_att.builtin.discovery_config.discoveryProtocol != DiscoveryProtocol::SUPER_CLIENT)
{
m_network_Factory.getDefaultMetatrafficMulticastLocators(att.builtin.metatrafficMulticastLocatorList,
metatraffic_multicast_port);
m_network_Factory.NormalizeLocators(att.builtin.metatrafficMulticastLocatorList);
}

m_network_Factory.getDefaultMetatrafficUnicastLocators(att.builtin.metatrafficUnicastLocatorList,
metatraffic_unicast_port_);
Expand Down
22 changes: 22 additions & 0 deletions test/unittest/dds/participant/ParticipantTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -862,6 +862,28 @@ TEST(ParticipantTests, SimpleParticipantRemoteServerListConfiguration)
EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant));
}

/**
* Test that checks a CLIENT participant is not initialized with builtin metatrafficMulticastLocators.
*/
TEST(ParticipantTests, NoBuiltinMetatrafficMulticastForClients)
{
DomainParticipantQos qos;
qos.wire_protocol().builtin.discovery_config.discoveryProtocol = fastrtps::rtps::DiscoveryProtocol::CLIENT;
DomainParticipant* participant = DomainParticipantFactory::get_instance()->create_participant(
(uint32_t)GET_PID() % 230, qos);
ASSERT_NE(nullptr, participant);

fastrtps::rtps::RTPSParticipantAttributes attributes;
get_rtps_attributes(participant, attributes);
EXPECT_EQ(attributes.builtin.discovery_config.discoveryProtocol, fastrtps::rtps::DiscoveryProtocol::CLIENT);
EXPECT_EQ(attributes.builtin.metatrafficMulticastLocatorList.size(), 0);

DomainParticipantQos result_qos = participant->get_qos();
EXPECT_EQ(ReturnCode_t::RETCODE_OK, participant->set_qos(result_qos));

EXPECT_EQ(ReturnCode_t::RETCODE_OK, DomainParticipantFactory::get_instance()->delete_participant(participant));
}


/**
* Test that a SIMPLE participant is transformed into a CLIENT if the variable ROS_SUPER_CLIENT is false and into a SUPERCLIENT if it's true.
Expand Down
Loading