Skip to content

Commit

Permalink
Remove repeated header include & Fix log (#5419) (#5661)
Browse files Browse the repository at this point in the history
* Remove repeated header include & Fix log (#5419)

* Remove repeated header include

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

* Fix Log & comment

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>

---------

Signed-off-by: cferreiragonz <carlosferreira@eprosima.com>
(cherry picked from commit 1d8a6da)

# Conflicts:
#	src/cpp/rtps/transport/TCPTransportInterface.cpp

* Fix conflicts

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Carlos Ferreira González <carlosferreira@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
  • Loading branch information
3 people authored Mar 5, 2025
1 parent 0d13583 commit c6bb8a4
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/cpp/rtps/transport/TCPTransportInterface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#include <asio/ssl/verify_context.hpp>
#endif // if TLS_FOUND

#include <fastdds/dds/log/Log.hpp>
#include <fastdds/dds/log/Log.hpp>
#include <fastdds/rtps/attributes/PropertyPolicy.h>
#include <fastdds/rtps/common/CDRMessage_t.h>
Expand Down Expand Up @@ -549,13 +548,13 @@ bool TCPTransportInterface::init(

if (cfg_send_size > 0 && send_size != cfg_send_size)
{
EPROSIMA_LOG_WARNING(TRANSPORT_TCP, "UDPTransport sendBufferSize could not be set to the desired value. "
EPROSIMA_LOG_WARNING(TRANSPORT_TCP, "TCPTransport sendBufferSize could not be set to the desired value. "
<< "Using " << send_size << " instead of " << cfg_send_size);
}

if (cfg_recv_size > 0 && recv_size != cfg_recv_size)
{
EPROSIMA_LOG_WARNING(TRANSPORT_TCP, "UDPTransport receiveBufferSize could not be set to the desired value. "
EPROSIMA_LOG_WARNING(TRANSPORT_TCP, "TCPTransport receiveBufferSize could not be set to the desired value. "
<< "Using " << recv_size << " instead of " << cfg_recv_size);
}

Expand Down Expand Up @@ -714,7 +713,7 @@ void TCPTransportInterface::SenderResourceHasBeenClosed(
// Socket disconnection should always be done in the listening thread (or in the transport cleanup, when receiver resources have
// already been destroyed and the listening thread had consequently finished).
// An assert() clause finding the respective channel resource cannot be made since in LARGE DATA scenario, where the PDP discovery is done
// via UDP, a server's send resource can be created with without any associated channel resource until receiving a connection request from
// via UDP, a server's send resource can be created without any associated channel resource until receiving a connection request from
// the client.
// The send resource locator is invalidated to prevent further use of associated channel.
LOCATOR_INVALID(locator);
Expand Down

0 comments on commit c6bb8a4

Please sign in to comment.