From 1c7fda0b1224b38ea221633b8dbab2e9d1bb81a6 Mon Sep 17 00:00:00 2001
From: Jesus Perez <jesusperez@eprosima.com>
Date: Mon, 11 Mar 2024 12:56:18 +0100
Subject: [PATCH] Refs #20120: Solve conflicts

Signed-off-by: Jesus Perez <jesusperez@eprosima.com>
---
 src/cpp/rtps/transport/TCPTransportInterface.cpp   | 12 ++++++++----
 test/blackbox/common/BlackboxTestsTransportTCP.cpp |  1 +
 test/unittest/transport/CMakeLists.txt             |  2 ++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
index 4e08fc01d01..f4e7b6ec698 100644
--- a/src/cpp/rtps/transport/TCPTransportInterface.cpp
+++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -1370,8 +1370,10 @@ void TCPTransportInterface::SocketAccepted(
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
             EPROSIMA_LOG_INFO(RTCP, "Accepted connection (local: "
-                    << local_endpoint_to_locator(channel) << ", remote: "
-                    << remote_endpoint_to_locator(channel) << ")");
+                    << channel->local_endpoint().address() << ":"
+                    << channel->local_endpoint().port() << "), remote: "
+                    << channel->remote_endpoint().address() << ":"
+                    << channel->remote_endpoint().port() << ")");
         }
         else
         {
@@ -1416,8 +1418,10 @@ void TCPTransportInterface::SecureSocketAccepted(
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
             EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: "
-                    << local_endpoint_to_locator(secure_channel) << ", remote: "
-                    << remote_endpoint_to_locator(secure_channel) << ")");
+                    << socket->lowest_layer().local_endpoint().address() << ":"
+                    << socket->lowest_layer().local_endpoint().port() << "), remote: "
+                    << socket->lowest_layer().remote_endpoint().address() << ":"
+                    << socket->lowest_layer().remote_endpoint().port() << ")");
         }
         else
         {
diff --git a/test/blackbox/common/BlackboxTestsTransportTCP.cpp b/test/blackbox/common/BlackboxTestsTransportTCP.cpp
index 2d0ed08ec36..f61eafdb0ed 100644
--- a/test/blackbox/common/BlackboxTestsTransportTCP.cpp
+++ b/test/blackbox/common/BlackboxTestsTransportTCP.cpp
@@ -33,6 +33,7 @@
 using namespace eprosima::fastrtps;
 using namespace eprosima::fastrtps::rtps;
 
+enum communication_type
 {
     TRANSPORT
 };
diff --git a/test/unittest/transport/CMakeLists.txt b/test/unittest/transport/CMakeLists.txt
index 105270cfceb..1e04e03c531 100644
--- a/test/unittest/transport/CMakeLists.txt
+++ b/test/unittest/transport/CMakeLists.txt
@@ -249,6 +249,7 @@ target_include_directories(UDPv4Tests PRIVATE
     $<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
     )
 target_link_libraries(UDPv4Tests
+    fastcdr
     GTest::gtest
     ${MOCKS}
     $<$<BOOL:${TLS_FOUND}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>)
@@ -279,6 +280,7 @@ if(NOT DISABLE_UDPV6_TESTS)
         ${PROJECT_SOURCE_DIR}/src/cpp
         )
     target_link_libraries(UDPv6Tests
+        fastcdr
         GTest::gtest
         ${MOCKS}
         $<$<BOOL:${TLS_FOUND}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>)