aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmessage/lliosocket.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llmessage/lliosocket.cpp')
-rw-r--r--linden/indra/llmessage/lliosocket.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/llmessage/lliosocket.cpp b/linden/indra/llmessage/lliosocket.cpp
index 26fd0b2..dec83b0 100644
--- a/linden/indra/llmessage/lliosocket.cpp
+++ b/linden/indra/llmessage/lliosocket.cpp
@@ -68,7 +68,7 @@ bool is_addr_in_use(apr_status_t status)
68// Define this to see the actual file descriptors being tossed around. 68// Define this to see the actual file descriptors being tossed around.
69//#define LL_DEBUG_SOCKET_FILE_DESCRIPTORS 1 69//#define LL_DEBUG_SOCKET_FILE_DESCRIPTORS 1
70#if LL_DEBUG_SOCKET_FILE_DESCRIPTORS 70#if LL_DEBUG_SOCKET_FILE_DESCRIPTORS
71#include "apr-1/apr_portable.h" 71#include "apr_portable.h"
72#endif 72#endif
73#endif 73#endif
74 74
@@ -220,11 +220,11 @@ bool LLSocket::blockingConnect(const LLHost& host)
220{ 220{
221 if(!mSocket) return false; 221 if(!mSocket) return false;
222 apr_sockaddr_t* sa = NULL; 222 apr_sockaddr_t* sa = NULL;
223 char ip_address[MAXADDRSTR]; /*Flawfinder: ignore*/ 223 std::string ip_address;
224 host.getIPString(ip_address, MAXADDRSTR); 224 ip_address = host.getIPString();
225 if(ll_apr_warn_status(apr_sockaddr_info_get( 225 if(ll_apr_warn_status(apr_sockaddr_info_get(
226 &sa, 226 &sa,
227 ip_address, 227 ip_address.c_str(),
228 APR_UNSPEC, 228 APR_UNSPEC,
229 host.getPort(), 229 host.getPort(),
230 0, 230 0,