diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-16 01:06:14 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-16 01:06:14 +0300 |
| commit | 3ee8130bb0e7ae7d0794434a2254086557c2382b (patch) | |
| tree | f0914b48cd16d7301366ac89824bd2e105d39364 /indra/llmessage | |
| parent | 3ef47fc0057b1193ab94151589a2ac2742370520 (diff) | |
| parent | f6735af9315ed91a0d28804252c1351c9d4b379f (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/lliosocket.cpp | 4 | ||||
| -rw-r--r-- | indra/llmessage/lliosocket.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/indra/llmessage/lliosocket.cpp b/indra/llmessage/lliosocket.cpp index b7460df508..b15b98db80 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) +LLSocket::ptr_t LLSocket::create(apr_pool_t* pool, EType type, U16 port, const char *hostname) { 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) apr_sockaddr_t* sa = NULL; status = apr_sockaddr_info_get( &sa, - APR_ANYADDR, + hostname, APR_UNSPEC, port, 0, diff --git a/indra/llmessage/lliosocket.h b/indra/llmessage/lliosocket.h index f840f0275c..303d80eb14 100644 --- a/indra/llmessage/lliosocket.h +++ b/indra/llmessage/lliosocket.h @@ -96,12 +96,14 @@ 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); + U16 port = PORT_EPHEMERAL, + const char *hostname = APR_ANYADDR); /** * @brief Create a LLSocket when you already have an apr socket. |