Fix wrong log info messages on TCP (#4258)

Signed-off-by: Jesus Perez <jesusperez@eprosima.com> (cherry picked from commit 36f7f57) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp
eProsima · Jan 27, 2024 · 31b1470 · 31b1470
1 parent 366a9c8
commit 31b1470
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp
@@ -827,6 +827,7 @@ void TCPTransportInterface::perform_listen_operation(
     if (rtcp_message_manager)
     {
         channel = channel_weak.lock();
+        endpoint_to_locator(channel->remote_endpoint(), remote_locator);
 
         if (channel)
         {
@@ -1312,9 +1313,17 @@ void TCPTransportInterface::SocketAccepted(
             channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this,
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
+<<<<<<< HEAD
             EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator)
                                                                     << ", remote: " << channel->remote_endpoint().address()
                                                                     << ":" << channel->remote_endpoint().port() << ")");
+=======
+            EPROSIMA_LOG_INFO(RTCP, "Accepted connection (local: "
+                    << channel->local_endpoint().address() << ":"
+                    << channel->local_endpoint().port() << "), remote: "
+                    << channel->remote_endpoint().address() << ":"
+                    << channel->remote_endpoint().port() << ")");
+>>>>>>> 36f7f57b0 (Fix wrong log info messages on TCP (#4258))
         }
         else
         {
@@ -1358,10 +1367,11 @@ void TCPTransportInterface::SecureSocketAccepted(
             secure_channel->thread(std::thread(&TCPTransportInterface::perform_listen_operation, this,
                     channel_weak_ptr, rtcp_manager_weak_ptr));
 
-            EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: " << IPLocator::to_string(locator)
-                                                                    << ", remote: " << socket->lowest_layer().remote_endpoint().address()
-                                                                    << ":" << socket->lowest_layer().remote_endpoint().port() <<
-                    ")");
+            EPROSIMA_LOG_INFO(RTCP, " Accepted connection (local: "
+                    << 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
         {