From 3813aa3e6265ad3e9f639d56b87c94f172b3444e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20P=C3=A9rez?= <78275223+jepemi@users.noreply.github.com> Date: Mon, 22 Jan 2024 15:36:34 +0100 Subject: [PATCH] Fix wrong log info messages on TCP (#4258) Signed-off-by: Jesus Perez (cherry picked from commit 36f7f57b039d9f762c9d04797c5ee5b34ac0ca1d) # Conflicts: # src/cpp/rtps/transport/TCPTransportInterface.cpp --- .../rtps/transport/TCPTransportInterface.cpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/cpp/rtps/transport/TCPTransportInterface.cpp b/src/cpp/rtps/transport/TCPTransportInterface.cpp index a46d5f8cc9f..ac62719b148 100644 --- a/src/cpp/rtps/transport/TCPTransportInterface.cpp +++ b/src/cpp/rtps/transport/TCPTransportInterface.cpp @@ -828,6 +828,7 @@ void TCPTransportInterface::perform_listen_operation( if (rtcp_message_manager) { channel = channel_weak.lock(); + endpoint_to_locator(channel->remote_endpoint(), remote_locator); if (channel) { @@ -1316,9 +1317,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 { @@ -1362,10 +1371,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 {