From 3fa1e83b553771a0e81e0cd63c2082a17a32e3da Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Mon, 15 Apr 2019 11:43:10 -0700 Subject: [PATCH] avoid redundant sockaddr -> string --- src/remoteClient/clientContextImpl.cpp | 2 +- src/server/responseHandlers.cpp | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index 3a4cc70..dca8e4e 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -3620,7 +3620,7 @@ public: !std::equal(guid.value, guid.value + 12, m_guid.value)) { EXCEPTION_GUARD3(m_requester, req, req->message("More than one channel with name '" + m_name + - "' detected, connected to: " + inetAddressToString(transport->getRemoteAddress()) + ", ignored: " + inetAddressToString(*serverAddress), warningMessage)); + "' detected, connected to: " + transport->getRemoteName() + ", ignored: " + inetAddressToString(*serverAddress), warningMessage)); } // do not pass (create transports) with we already have one diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index a00e3fe..f7b86d5 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -716,18 +716,13 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom, string channelName = SerializeHelper::deserializeString(payloadBuffer, transport.get()); if (channelName.size() == 0) { - - char host[100]; - sockAddrToDottedIP(&transport->getRemoteAddress().sa,host,100); - LOG(logLevelDebug,"Zero length channel name, disconnecting client: %s", host); + LOG(logLevelDebug,"Zero length channel name, disconnecting client: %s", transport->getRemoteName().c_str()); disconnect(transport); return; } else if (channelName.size() > MAX_CHANNEL_NAME_LENGTH) { - char host[100]; - sockAddrToDottedIP(&transport->getRemoteAddress().sa,host,100); - LOG(logLevelDebug,"Unreasonable channel name length, disconnecting client: %s", host); + LOG(logLevelDebug,"Unreasonable channel name length, disconnecting client: %s", transport->getRemoteName().c_str()); disconnect(transport); return; }