diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-28 22:26:12 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-28 22:26:12 +0300 |
| commit | 236f986d352c60d489868fe0755b33394348340f (patch) | |
| tree | 4603c9d2ed6333b03e8f5722dabced6ad495f4b4 | |
| parent | 36e89143b74b7fffdaf9fbb14565c957626a80c3 (diff) | |
Backed out changeset: 871c2923afce
| -rw-r--r-- | indra/llmessage/lliosocket.cpp | 4 | ||||
| -rw-r--r-- | indra/llmessage/lliosocket.h | 4 | ||||
| -rw-r--r-- | indra/test/io.cpp | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp index b15b98db80..b7460df508 100644 --- a/indra/llmessage/lliosocket.cpp +++ b/indra/llmessage/lliosocket.cpp @@ -101,7 +101,7 @@ void ll_debug_socket(const char* msg, apr_socket_t* apr_sock) /// // static -LLSocket::ptr_t LLSocket::create(apr_pool_t* pool, EType type, U16 port, const char *hostname) +LLSocket::ptr_t LLSocket::create(apr_pool_t* pool, EType type, U16 port) { LLSocket::ptr_t rv; apr_socket_t* socket = NULL; @@ -150,7 +150,7 @@ LLSocket::ptr_t LLSocket::create(apr_pool_t* pool, EType type, U16 port, const c apr_sockaddr_t* sa = NULL; status = apr_sockaddr_info_get( &sa, - hostname, + APR_ANYADDR, APR_UNSPEC, port, 0, diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h index 303d80eb14..f840f0275c 100644 --- a/indra/llmessage/lliosocket.h +++ b/indra/llmessage/lliosocket.h @@ -96,14 +96,12 @@ public: * and associated with the socket. * @param type The type of socket to create * @param port The port for the socket - * @param hostname e.g. APR_ANYADDR to listen openly, or "127.0.0.1" * @return A valid socket shared pointer if the call worked. */ static ptr_t create( apr_pool_t* pool, EType type, - U16 port = PORT_EPHEMERAL, - const char *hostname = APR_ANYADDR); + U16 port = PORT_EPHEMERAL); /** * @brief Create a LLSocket when you already have an apr socket. diff --git a/indra/test/io.cpp b/indra/test/io.cpp index 40243a8ad6..ff900ab96b 100644 --- a/indra/test/io.cpp +++ b/indra/test/io.cpp @@ -914,8 +914,7 @@ namespace tut mSocket = LLSocket::create( mPool, LLSocket::STREAM_TCP, - SERVER_LISTEN_PORT, - "127.0.0.1"); + SERVER_LISTEN_PORT); } ~pipe_and_pump_fitness() |