From cd757d53cae20e2f330f0905ec7797ca1a0f8f00 Mon Sep 17 00:00:00 2001 From: Patric Stout Date: Tue, 20 Apr 2021 16:34:14 +0200 Subject: Codechange: remove always-empty "address" from NetworkContentSocketHandler When ever you saw this debug lines (which you never should), they showed an empty address. It is also not very useful to have, as it always points to a known server anyway. --- src/network/core/tcp_content.cpp | 6 +++--- src/network/core/tcp_content.h | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/network/core/tcp_content.cpp b/src/network/core/tcp_content.cpp index 6fb3b3379..55319e430 100644 --- a/src/network/core/tcp_content.cpp +++ b/src/network/core/tcp_content.cpp @@ -171,9 +171,9 @@ bool NetworkContentSocketHandler::HandlePacket(Packet *p) default: if (this->HasClientQuit()) { - DEBUG(net, 0, "[tcp/content] received invalid packet type %d from %s", type, this->client_addr.GetAddressAsString().c_str()); + DEBUG(net, 0, "[tcp/content] received invalid packet type %d", type); } else { - DEBUG(net, 0, "[tcp/content] received illegal packet from %s", this->client_addr.GetAddressAsString().c_str()); + DEBUG(net, 0, "[tcp/content] received illegal packet"); } return false; } @@ -224,7 +224,7 @@ bool NetworkContentSocketHandler::ReceivePackets() */ bool NetworkContentSocketHandler::ReceiveInvalidPacket(PacketContentType type) { - DEBUG(net, 0, "[tcp/content] received illegal packet type %d from %s", type, this->client_addr.GetAddressAsString().c_str()); + DEBUG(net, 0, "[tcp/content] received illegal packet type %d", type); return false; } diff --git a/src/network/core/tcp_content.h b/src/network/core/tcp_content.h index be1cc6e77..ef8ae3a10 100644 --- a/src/network/core/tcp_content.h +++ b/src/network/core/tcp_content.h @@ -95,7 +95,6 @@ struct ContentInfo { /** Base socket handler for all Content TCP sockets */ class NetworkContentSocketHandler : public NetworkTCPSocketHandler { protected: - NetworkAddress client_addr; ///< The address we're connected to. void Close() override; bool ReceiveInvalidPacket(PacketContentType type); @@ -193,9 +192,8 @@ public: * @param s the socket we are connected with * @param address IP etc. of the client */ - NetworkContentSocketHandler(SOCKET s = INVALID_SOCKET, const NetworkAddress &address = NetworkAddress()) : - NetworkTCPSocketHandler(s), - client_addr(address) + NetworkContentSocketHandler(SOCKET s = INVALID_SOCKET) : + NetworkTCPSocketHandler(s) { } -- cgit v1.2.3-70-g09d2