Refs #20120: Apply suggestions

Signed-off-by: EduPonz <eduardoponz@eprosima.com>
eProsima · Mar 5, 2024 · b479be8 · b479be8
1 parent 8e19c6e
commit b479be8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 419 deletions.
diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.cpp b/src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@@ -2985,7 +2985,7 @@ bool RTPSParticipantImpl::should_match_local_endpoints(
 }
 
 void RTPSParticipantImpl::update_removed_participant(
-        LocatorList_t& remote_participant_locators)
+        const LocatorList_t& remote_participant_locators)
 {
     if (!remote_participant_locators.empty())
     {

diff --git a/src/cpp/rtps/participant/RTPSParticipantImpl.h b/src/cpp/rtps/participant/RTPSParticipantImpl.h
@@ -1273,7 +1273,7 @@ class RTPSParticipantImpl
      * @param remote_participant_locators Set of locators associated to the participant removed.
      */
     void update_removed_participant(
-            LocatorList_t& remote_participant_locators);
+            const LocatorList_t& remote_participant_locators);
 
 };
 } // namespace rtps

diff --git a/test/unittest/transport/CMakeLists.txt b/test/unittest/transport/CMakeLists.txt
@@ -198,32 +198,6 @@ if(TLS_FOUND)
         )
 endif()
 
-set(TEST_UDPV4TESTS_SOURCE
-    test_UDPv4Tests.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/core/policy/ParameterList.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/Log.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/OStreamConsumer.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/StdoutConsumer.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/fastdds/log/StdoutErrConsumer.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/PropertyPolicy.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/attributes/ThreadSettings.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/common/Time_t.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/flowcontrol/ThroughputControllerDescriptor.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/messages/RTPSMessageCreator.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/network/NetworkFactory.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/ChannelResource.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/PortBasedTransportDescriptor.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/test_UDPv4Transport.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/UDPChannelResource.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/UDPTransportInterface.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/rtps/transport/UDPv4Transport.cpp
-    ${TCPTransportInterface_SOURCE}
-    ${PROJECT_SOURCE_DIR}/src/cpp/utils/IPFinder.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/utils/IPLocator.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/utils/md5.cpp
-    ${PROJECT_SOURCE_DIR}/src/cpp/utils/SystemInfo.cpp
-    )
-
 set(SHAREDMEMTESTS_SOURCE
     SharedMemTests.cpp
     mock/MockReceiverResource.cpp
@@ -300,38 +274,6 @@ if(MSVC OR MSVC_IDE)
 endif()
 gtest_discover_tests(UDPv4Tests)
 
-add_executable(test_UDPv4Tests ${TEST_UDPV4TESTS_SOURCE})
-target_compile_definitions(test_UDPv4Tests PRIVATE
-    BOOST_ASIO_STANDALONE
-    ASIO_STANDALONE
-    $<$<AND:$<NOT:$<BOOL:${WIN32}>>,$<STREQUAL:"${CMAKE_BUILD_TYPE}","Debug">>:__DEBUG>
-    $<$<BOOL:${INTERNAL_DEBUG}>:__INTERNALDEBUG> # Internal debug activated.
-    )
-target_include_directories(test_UDPv4Tests PRIVATE
-    ${Asio_INCLUDE_DIR}
-    ${PROJECT_SOURCE_DIR}/test/mock/rtps/ParticipantProxyData
-    ${PROJECT_SOURCE_DIR}/test/mock/dds/QosPolicies
-    ${PROJECT_SOURCE_DIR}/test/mock/rtps/MessageReceiver
-    ${PROJECT_SOURCE_DIR}/test/mock/rtps/ReceiverResource
-    ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
-    ${PROJECT_SOURCE_DIR}/src/cpp
-    $<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
-    )
-target_link_libraries(test_UDPv4Tests
-    fastcdr
-    GTest::gtest
-    ${MOCKS}
-    $<$<BOOL:${TLS_FOUND}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>)
-if(QNX)
-    target_link_libraries(test_UDPv4Tests socket)
-endif()
-if(MSVC OR MSVC_IDE)
-    target_link_libraries(test_UDPv4Tests ${PRIVACY} iphlpapi Shlwapi)
-else()
-    target_link_libraries(test_UDPv4Tests ${PRIVACY})
-endif()
-gtest_discover_tests(test_UDPv4Tests)
-
 ##########################
 # IPv6 tests
 ##########################

diff --git a/test/unittest/transport/TCPv4Tests.cpp b/test/unittest/transport/TCPv4Tests.cpp
@@ -1114,96 +1114,8 @@ TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_1)
         sem.wait();
     }
 }
-/*
-   TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_2)
-   {
-    eprosima::fastdds::dds::Log::SetVerbosity(eprosima::fastdds::dds::Log::Kind::Info);
-
-    using TLSVerifyMode = TCPTransportDescriptor::TLSConfig::TLSVerifyMode;
-    using TLSOptions = TCPTransportDescriptor::TLSConfig::TLSOptions;
-    using TLSHSRole = TCPTransportDescriptor::TLSConfig::TLSHandShakeRole;
-
-    TCPv4TransportDescriptor recvDescriptor;
-    recvDescriptor.add_listener_port(g_default_port + 1);
-    recvDescriptor.apply_security = true;
-    recvDescriptor.tls_config.handshake_role = TLSHSRole::CLIENT;
-    //recvDescriptor.tls_config.password = "testkey";
-    //recvDescriptor.tls_config.password = "test";
-    //recvDescriptor.tls_config.cert_chain_file = "mainpubcert.pem";
-    //recvDescriptor.tls_config.private_key_file = "mainpubkey.pem";
-    recvDescriptor.tls_config.verify_file = "maincacert.pem"; // This CA only know about mainsub certificates
-    //recvDescriptor.tls_config.verify_file = "ca.pem";
-    // Server doesn't accept clients without certs
-    recvDescriptor.tls_config.verify_mode = TLSVerifyMode::VERIFY_FAIL_IF_NO_PEER_CERT | TLSVerifyMode::VERIFY_PEER;
-    recvDescriptor.tls_config.add_option(TLSOptions::DEFAULT_WORKAROUNDS);
-    TCPv4Transport receiveTransportUnderTest(recvDescriptor);
-    receiveTransportUnderTest.init();
-
-    Locator_t inputLocator;
-    inputLocator.kind = LOCATOR_KIND_TCPv4;
-    inputLocator.port = g_default_port + 1;
-    IPLocator::setIPv4(inputLocator, 127, 0, 0, 1);
-    IPLocator::setLogicalPort(inputLocator, 7410);
-
-    Locator_t outputLocator;
-    outputLocator.kind = LOCATOR_KIND_TCPv4;
-    IPLocator::setIPv4(outputLocator, 127, 0, 0, 1);
-    outputLocator.port = g_default_port + 1;
-    IPLocator::setLogicalPort(outputLocator, 7410);
-
-    TCPv4TransportDescriptor sendDescriptor2;
-    sendDescriptor2.apply_security = true;
-    sendDescriptor2.tls_config.handshake_role = TLSHSRole::SERVER;
-    sendDescriptor2.tls_config.password = "test";
-    sendDescriptor2.tls_config.cert_chain_file = "server.pem";
-    sendDescriptor2.tls_config.private_key_file = "server.pem";
-    //sendDescriptor2.tls_config.password = "testkey";
-    //sendDescriptor2.tls_config.cert_chain_file = "mainsubcert.pem";
-    //sendDescriptor2.tls_config.private_key_file = "mainsubkey.pem";
-    sendDescriptor2.tls_config.verify_mode = TLSVerifyMode::VERIFY_PEER;
-    sendDescriptor2.tls_config.add_option(TLSOptions::DEFAULT_WORKAROUNDS);
-    TCPv4Transport sendTransportUnderTest2(sendDescriptor2);
-    sendTransportUnderTest2.init();
-
-    {
-        MockReceiverResource receiver(receiveTransportUnderTest, inputLocator);
-        MockMessageReceiver *msg_recv = dynamic_cast<MockMessageReceiver*>(receiver.CreateMessageReceiver());
-        ASSERT_TRUE(receiveTransportUnderTest.IsInputChannelOpen(inputLocator));
-
-        ASSERT_TRUE(sendTransportUnderTest2.OpenOutputChannel(outputLocator));
-        octet message[5] = { 'H','e','l','l','o' };
-
-        Semaphore sem;
-        std::function<void()> recCallback = [&]()
-        {
-            EXPECT_FALSE(true); // Should not receive
-            sem.post();
-        };
 
-        msg_recv->setCallback(recCallback);
-
-        auto sendThreadFunction = [&]()
-        {
-            bool sent = sendTransportUnderTest2.send(message, 5, outputLocator, inputLocator);
-            int count = 0;
-            while (!sent && count < 30)
-            {
-                sent = sendTransportUnderTest2.send(message, 5, outputLocator, inputLocator);
-                std::this_thread::sleep_for(std::chrono::milliseconds(100));
- ++count;
-            }
-            EXPECT_FALSE(sent);
-            sem.post();
-        };
-
-        senderThread.reset(new std::thread(sendThreadFunction));
-        std::this_thread::sleep_for(std::chrono::milliseconds(1));
-        senderThread->join();
-        sem.wait();
-    }
-    ASSERT_TRUE(sendTransportUnderTest2.SenderResourceHasBeenClosed(outputLocator));
-   }
- */
+// TODO(eduponz): TEST_F(TCPv4Tests, send_and_receive_between_secure_clients_2)
 
 TEST_F(TCPv4Tests, send_and_receive_between_secure_ports_untrusted_server)
 {