From 4a9d79f019482e00392f55e5181faa90f94139f9 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Tue, 17 Jan 2017 20:57:36 -0500 Subject: [PATCH] sockAddrToA -> sockAddrToDottedIP Avoid blocking host name lookup for debug log messages. Can cause long delays when DNS not available. --- src/remote/blockingUDPTransport.cpp | 2 +- src/server/responseHandlers.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/remote/blockingUDPTransport.cpp b/src/remote/blockingUDPTransport.cpp index 46c7f90..8ad6db4 100644 --- a/src/remote/blockingUDPTransport.cpp +++ b/src/remote/blockingUDPTransport.cpp @@ -80,7 +80,7 @@ BlockingUDPTransport::BlockingUDPTransport(bool serverFlag, _remoteName = ":0"; } else { char strBuffer[64]; - sockAddrToA(&_remoteAddress.sa, strBuffer, sizeof(strBuffer)); + sockAddrToDottedIP(&_remoteAddress.sa, strBuffer, sizeof(strBuffer)); _remoteName = strBuffer; } } diff --git a/src/server/responseHandlers.cpp b/src/server/responseHandlers.cpp index 7463a0c..88c955c 100644 --- a/src/server/responseHandlers.cpp +++ b/src/server/responseHandlers.cpp @@ -703,7 +703,7 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom, { char host[100]; - sockAddrToA(&transport->getRemoteAddress()->sa,host,100); + sockAddrToDottedIP(&transport->getRemoteAddress()->sa,host,100); LOG(logLevelDebug,"Zero length channel name, disconnecting client: %s", host); disconnect(transport); return; @@ -711,7 +711,7 @@ void ServerCreateChannelHandler::handleResponse(osiSockAddr* responseFrom, else if (channelName.size() > MAX_CHANNEL_NAME_LENGTH) { char host[100]; - sockAddrToA(&transport->getRemoteAddress()->sa,host,100); + sockAddrToDottedIP(&transport->getRemoteAddress()->sa,host,100); LOG(logLevelDebug,"Unreasonable channel name length, disconnecting client: %s", host); disconnect(transport); return; @@ -975,7 +975,7 @@ void ServerDestroyChannelHandler::handleResponse(osiSockAddr* responseFrom, if (!transport->isClosed()) { char host[100]; - sockAddrToA(&responseFrom->sa,host,100); + sockAddrToDottedIP(&responseFrom->sa,host,100); LOG(logLevelDebug, "Trying to destroy a channel that no longer exists (SID: %d, CID %d, client: %s).", sid, cid, host); } return;