From 8aef2a9596953041866536432c08afd072ea6653 Mon Sep 17 00:00:00 2001 From: Juan Lopez Fernandez Date: Tue, 10 Jun 2025 09:46:59 +0200 Subject: [PATCH 1/3] Refs #23213: Add regression test Signed-off-by: Juan Lopez Fernandez --- .../common/BlackboxTestsNetworkConf.cpp | 85 +++++++++++++++++-- 1 file changed, 78 insertions(+), 7 deletions(-) diff --git a/test/blackbox/common/BlackboxTestsNetworkConf.cpp b/test/blackbox/common/BlackboxTestsNetworkConf.cpp index 19fd45c9efd..399b0d56fbd 100644 --- a/test/blackbox/common/BlackboxTestsNetworkConf.cpp +++ b/test/blackbox/common/BlackboxTestsNetworkConf.cpp @@ -361,7 +361,8 @@ TEST_P(NetworkConfig, PubSubInterfaceWhitelistLocalhost) void interface_whitelist_test( const std::vector& pub_interfaces, const std::vector& sub_interfaces, - bool interface_name = false) + bool interface_name = false, + bool add_shm_descriptor = false) { PubSubReader reader(TEST_TOPIC_NAME); PubSubWriter writer(TEST_TOPIC_NAME); @@ -378,7 +379,7 @@ void interface_whitelist_test( pub_udp_descriptor = std::make_shared(); } - // include the interfaces in the transport descriptor + // include the interfaces in the UDP transport descriptor for (const auto& network_interface : pub_interfaces) { if (!interface_name) @@ -391,10 +392,26 @@ void interface_whitelist_test( } } - // Set the transport descriptor WITH interfaces in the writer + std::shared_ptr pub_shm_descriptor; + + if (add_shm_descriptor) + { + pub_shm_descriptor = std::make_shared(); + } + + // Set the UDP transport descriptor WITH interfaces in the writer writer.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS).history_depth(10). disable_builtin_transport(). - add_user_transport_to_pparams(pub_udp_descriptor).init(); + add_user_transport_to_pparams(pub_udp_descriptor); + + // If shared memory is requested, add it as well + if (add_shm_descriptor) + { + writer.add_user_transport_to_pparams(pub_shm_descriptor); + } + + // Initialize the writer + writer.init(); ASSERT_TRUE(writer.isInitialized()); @@ -409,7 +426,7 @@ void interface_whitelist_test( sub_udp_descriptor = std::make_shared(); } - // include the interfaces in the transport descriptor + // include the interfaces in the UDP transport descriptor for (const auto& network_interface : sub_interfaces) { if (!interface_name) @@ -422,10 +439,26 @@ void interface_whitelist_test( } } - // Set the transport descriptor WITH interfaces in the reader + std::shared_ptr sub_shm_descriptor; + + if (add_shm_descriptor) + { + sub_shm_descriptor = std::make_shared(); + } + + // Set the UDP transport descriptor WITH interfaces in the reader reader.reliability(eprosima::fastdds::dds::RELIABLE_RELIABILITY_QOS).history_depth(10). disable_builtin_transport(). - add_user_transport_to_pparams(sub_udp_descriptor).init(); + add_user_transport_to_pparams(sub_udp_descriptor); + + // If shared memory is requested, add it as well + if (add_shm_descriptor) + { + reader.add_user_transport_to_pparams(sub_shm_descriptor); + } + + // Initialize the reader + reader.init(); ASSERT_TRUE(reader.isInitialized()); @@ -622,6 +655,44 @@ TEST_P(NetworkConfig, PubSubAsymmetricInterfaceWhitelistAllExceptLocalhost) } } +// Regression test for redmine issue #23213 to check in UDP that setting the interface whitelist in one +// of the endpoints, but not in the other, connection is established anyways. +// All available interfaces except loopback case. +// This test verifies that adding a SHM transport descriptor does not affect the communication in this concrete case. +TEST_P(NetworkConfig, PubSubAsymmetricInterfaceWhitelistAllExceptLocalhostSHM) +{ + std::vector no_interfaces; + + std::vector all_interfaces_except_localhost; + use_udpv4 ? GetIP4s(all_interfaces_except_localhost, false) : GetIP6s(all_interfaces_except_localhost, false); + + { + // IP address + { + // Whitelist only in publisher + interface_whitelist_test(all_interfaces_except_localhost, no_interfaces, false, true); + } + + { + // Whitelist only in subscriber + interface_whitelist_test(no_interfaces, all_interfaces_except_localhost, false, true); + } + } + + { + // Interface name + { + // Whitelist only in publisher + interface_whitelist_test(all_interfaces_except_localhost, no_interfaces, true, true); + } + + { + // Whitelist only in subscriber + interface_whitelist_test(no_interfaces, all_interfaces_except_localhost, true, true); + } + } +} + TEST_P(NetworkConfig, SubGetListeningLocators) { PubSubReader reader(TEST_TOPIC_NAME); From cc9bf8af230f27a3ccd598c873458f95cab26a3d Mon Sep 17 00:00:00 2001 From: Juan Lopez Fernandez Date: Tue, 10 Jun 2025 09:48:42 +0200 Subject: [PATCH 2/3] Refs #23213: Only add localhost capability to UDP & TCP transports Signed-off-by: Juan Lopez Fernandez --- .../rtps/transport/TransportInterface.hpp | 2 +- src/cpp/CMakeLists.txt | 1 + .../builtin/data/NetworkConfiguration.hpp | 24 --------- .../discovery/participant/PDPSimple.cpp | 2 +- src/cpp/rtps/network/NetworkConfiguration.cpp | 44 +++++++++++++++++ src/cpp/rtps/network/NetworkConfiguration.hpp | 49 +++++++++++++++++++ src/cpp/rtps/network/NetworkFactory.cpp | 5 +- test/unittest/dds/publisher/CMakeLists.txt | 1 + test/unittest/rtps/discovery/CMakeLists.txt | 1 + test/unittest/rtps/network/CMakeLists.txt | 1 + test/unittest/rtps/reader/CMakeLists.txt | 1 + test/unittest/statistics/dds/CMakeLists.txt | 2 + test/unittest/statistics/rtps/CMakeLists.txt | 1 + test/unittest/transport/CMakeLists.txt | 6 +++ 14 files changed, 113 insertions(+), 27 deletions(-) delete mode 100644 src/cpp/rtps/builtin/data/NetworkConfiguration.hpp create mode 100644 src/cpp/rtps/network/NetworkConfiguration.cpp create mode 100644 src/cpp/rtps/network/NetworkConfiguration.hpp diff --git a/include/fastdds/rtps/transport/TransportInterface.hpp b/include/fastdds/rtps/transport/TransportInterface.hpp index aa14e8f13cb..b5e0e5dcc9f 100644 --- a/include/fastdds/rtps/transport/TransportInterface.hpp +++ b/include/fastdds/rtps/transport/TransportInterface.hpp @@ -319,7 +319,7 @@ class FASTDDS_EXPORTED_API TransportInterface //! Must report whether localhost locator is allowed virtual bool is_localhost_allowed() const { - return true; + return false; } //! Returns netmask filter information (transport's netmask filter kind and allowlist) diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt index 44a74948c60..15d43891d0e 100644 --- a/src/cpp/CMakeLists.txt +++ b/src/cpp/CMakeLists.txt @@ -180,6 +180,7 @@ set(${PROJECT_NAME}_source_files rtps/messages/submessages/GapMsg.hpp rtps/messages/submessages/HeartbeatMsg.hpp rtps/network/NetworkBuffer.cpp + rtps/network/NetworkConfiguration.cpp rtps/network/NetworkFactory.cpp rtps/network/ReceiverResource.cpp rtps/network/utils/external_locators.cpp diff --git a/src/cpp/rtps/builtin/data/NetworkConfiguration.hpp b/src/cpp/rtps/builtin/data/NetworkConfiguration.hpp deleted file mode 100644 index 5a0a1f6593e..00000000000 --- a/src/cpp/rtps/builtin/data/NetworkConfiguration.hpp +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2023 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 NetworkConfiguration.hpp - */ - -#ifndef FASTDDS_RTPS_BUILTIN_DATA__NETWORKCONFIGURATION_HPP -#define FASTDDS_RTPS_BUILTIN_DATA__NETWORKCONFIGURATION_HPP - -#define DISC_NETWORK_CONFIGURATION_LISTENING_LOCALHOST_ALL (0x0000000F) - -#endif // FASTDDS_RTPS_BUILTIN_DATA__NETWORKCONFIGURATION_HPP diff --git a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp index 140ccaa46f2..7fea56e8e44 100644 --- a/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp +++ b/src/cpp/rtps/builtin/discovery/participant/PDPSimple.cpp @@ -30,7 +30,6 @@ #include #include -#include #include #include #include @@ -42,6 +41,7 @@ #include #include #include +#include #include #include #include diff --git a/src/cpp/rtps/network/NetworkConfiguration.cpp b/src/cpp/rtps/network/NetworkConfiguration.cpp new file mode 100644 index 00000000000..b069e0576d6 --- /dev/null +++ b/src/cpp/rtps/network/NetworkConfiguration.cpp @@ -0,0 +1,44 @@ +// Copyright 2025 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. + +#include + +#include + +#include + +namespace eprosima { +namespace fastdds { +namespace rtps { +namespace network { + +void add_localhost_capability( + int32_t kind, + NetworkConfigSet_t& network_config) +{ + // Only add localhost capability for transports that support it + if (kind == LOCATOR_KIND_UDPv4 || kind == LOCATOR_KIND_UDPv6 || + kind == LOCATOR_KIND_TCPv4 || kind == LOCATOR_KIND_TCPv6) + { + // Ensure the kind is a power of two to perform safe bitwise operations + assert(kind > 0 && (kind & (kind - 1)) == 0); + + network_config |= kind; + } +} + +} // namespace network +} // namespace rtps +} // namespace fastdds +} // namespace eprosima diff --git a/src/cpp/rtps/network/NetworkConfiguration.hpp b/src/cpp/rtps/network/NetworkConfiguration.hpp new file mode 100644 index 00000000000..48554dd93b0 --- /dev/null +++ b/src/cpp/rtps/network/NetworkConfiguration.hpp @@ -0,0 +1,49 @@ +// Copyright 2023 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 NetworkConfiguration.hpp + */ + +#ifndef FASTDDS_RTPS_NETWORK__NETWORKCONFIGURATION_HPP +#define FASTDDS_RTPS_NETWORK__NETWORKCONFIGURATION_HPP + +#include + +#define DISC_NETWORK_CONFIGURATION_LISTENING_LOCALHOST_ALL (0x0000000F) + +namespace eprosima { +namespace fastdds { +namespace rtps { +namespace network { + +/** + * @brief Add the capability to use localhost for the given transport kind. + * + * This function adds the capability to use localhost for the given transport kind + * in the provided network configuration. + * + * @param kind The transport kind to add the localhost capability for. + * @param network_config The network configuration to modify. + */ +void add_localhost_capability( + int32_t kind, + NetworkConfigSet_t& network_config); + +} // namespace network +} // namespace rtps +} // namespace fastdds +} // namespace eprosima + +#endif // FASTDDS_RTPS_NETWORK__NETWORKCONFIGURATION_HPP diff --git a/src/cpp/rtps/network/NetworkFactory.cpp b/src/cpp/rtps/network/NetworkFactory.cpp index 6e948c85553..57a98d0390a 100644 --- a/src/cpp/rtps/network/NetworkFactory.cpp +++ b/src/cpp/rtps/network/NetworkFactory.cpp @@ -24,6 +24,7 @@ #include #include +#include #include using namespace std; @@ -166,7 +167,9 @@ bool NetworkFactory::RegisterTransport( if (is_localhost_allowed) { - network_configuration_ |= kind; + network::add_localhost_capability( + kind, + network_configuration_); } } } diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt index 2a042005022..9b21f6adab3 100644 --- a/test/unittest/dds/publisher/CMakeLists.txt +++ b/test/unittest/dds/publisher/CMakeLists.txt @@ -139,6 +139,7 @@ set(DATAWRITERTESTS_SOURCE DataWriterTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageGroup.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/SendBuffersManager.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/ReceiverResource.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/external_locators.cpp diff --git a/test/unittest/rtps/discovery/CMakeLists.txt b/test/unittest/rtps/discovery/CMakeLists.txt index bbc05baa04f..0c471943e94 100644 --- a/test/unittest/rtps/discovery/CMakeLists.txt +++ b/test/unittest/rtps/discovery/CMakeLists.txt @@ -142,6 +142,7 @@ set(PDPTESTS_SOURCE PDPTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/FlowControllerConsts.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp diff --git a/test/unittest/rtps/network/CMakeLists.txt b/test/unittest/rtps/network/CMakeLists.txt index 3d2cb96e95f..26b7e1c5ddc 100644 --- a/test/unittest/rtps/network/CMakeLists.txt +++ b/test/unittest/rtps/network/CMakeLists.txt @@ -26,6 +26,7 @@ set(NETWORKFACTORYTESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageCreator.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp diff --git a/test/unittest/rtps/reader/CMakeLists.txt b/test/unittest/rtps/reader/CMakeLists.txt index 1d908e41cf1..935b9ea02aa 100644 --- a/test/unittest/rtps/reader/CMakeLists.txt +++ b/test/unittest/rtps/reader/CMakeLists.txt @@ -240,6 +240,7 @@ set(STATEFUL_READER_TESTS_SOURCE StatefulReaderTests.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageGroup.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/SendBuffersManager.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/ReceiverResource.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/external_locators.cpp diff --git a/test/unittest/statistics/dds/CMakeLists.txt b/test/unittest/statistics/dds/CMakeLists.txt index 4294705e32d..040b3b2fea9 100644 --- a/test/unittest/statistics/dds/CMakeLists.txt +++ b/test/unittest/statistics/dds/CMakeLists.txt @@ -239,6 +239,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX) ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageGroup.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/SendBuffersManager.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/ReceiverResource.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/external_locators.cpp @@ -425,6 +426,7 @@ if (SQLITE3_SUPPORT AND FASTDDS_STATISTICS AND NOT QNX) ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageGroup.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/SendBuffersManager.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/ReceiverResource.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/external_locators.cpp diff --git a/test/unittest/statistics/rtps/CMakeLists.txt b/test/unittest/statistics/rtps/CMakeLists.txt index aa7eed91861..c10f92dd5fc 100644 --- a/test/unittest/statistics/rtps/CMakeLists.txt +++ b/test/unittest/statistics/rtps/CMakeLists.txt @@ -81,6 +81,7 @@ set(STATISTICS_RTPS_MONITORSERVICETESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/history/TopicPayloadPoolRegistry.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp diff --git a/test/unittest/transport/CMakeLists.txt b/test/unittest/transport/CMakeLists.txt index 23b1fcf7cee..05ade9d422b 100644 --- a/test/unittest/transport/CMakeLists.txt +++ b/test/unittest/transport/CMakeLists.txt @@ -77,6 +77,7 @@ set(UDPV4TESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp @@ -109,6 +110,7 @@ set(ASIOHELPERSTESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp @@ -142,6 +144,7 @@ set(UDPV6TESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp @@ -178,6 +181,7 @@ set(TCPV4TESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageCreator.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp @@ -228,6 +232,7 @@ set(TCPV6TESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/CDRMessage.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageCreator.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp @@ -275,6 +280,7 @@ set(SHAREDMEMTESTS_SOURCE ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/SerializedPayload.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkBuffer.cpp + ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkConfiguration.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/netmask_filter.cpp ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/utils/network.cpp From 36325481d5d1c121821736f6111ad0119614a836 Mon Sep 17 00:00:00 2001 From: Juan Lopez Fernandez Date: Tue, 10 Jun 2025 15:54:56 +0200 Subject: [PATCH 3/3] Refs #23213: Update failing test Signed-off-by: Juan Lopez Fernandez --- test/blackbox/common/DDSBlackboxTestsMonitorService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp index c95d2c0a499..8b4fdbe40e4 100644 --- a/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp +++ b/test/blackbox/common/DDSBlackboxTestsMonitorService.cpp @@ -2944,7 +2944,7 @@ TEST(DDSMonitorServiceTest, monitor_service_proxy_optional_qos) expected_participant_builtin_topic_data.wire_protocol->prefix = expected_participant_builtin_topic_data.guid.guidPrefix; expected_participant_builtin_topic_data.wire_protocol->participant_id = 0; - expected_participant_builtin_topic_data.wire_protocol->builtin.network_configuration = LOCATOR_KIND_SHM; + expected_participant_builtin_topic_data.wire_protocol->builtin.network_configuration = LOCATOR_KIND_UDPv4; validator->register_remote_participant_builtin_topic_data(expected_participant_builtin_topic_data);