From 00839eb6350627c6272dea242b85ea24544cea33 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 8 Aug 2018 20:52:00 -0400 Subject: Add optional hostname param to LLSocket::create() for testing. This allows the io.cpp test to listen only on the localhost loopback, avoiding the macOS 10.13.6 "allow listening for incoming connections" popup while running build-time tests that might halt an unattended TeamCity build. --- indra/llmessage/lliosocket.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llmessage/lliosocket.h') 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. -- cgit v1.2.3 From 236f986d352c60d489868fe0755b33394348340f Mon Sep 17 00:00:00 2001 From: AndreyL ProductEngine Date: Tue, 28 Aug 2018 22:26:12 +0300 Subject: Backed out changeset: 871c2923afce --- indra/llmessage/lliosocket.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'indra/llmessage/lliosocket.h') 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. -- cgit v1.2.3 From 88e04ab2ab2a13cd660f33e64c52ad3375144d2a Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Thu, 30 Aug 2018 16:25:45 -0400 Subject: Restore the ability for sockets to specify the interface to listen on --- indra/llmessage/lliosocket.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llmessage/lliosocket.h') 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. -- cgit v1.2.3