summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/exchange/taler-exchange-httpd.c11
-rw-r--r--src/testing/testing_api_helpers_exchange.c1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index ca8eb9a63..fed9efd8e 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -67,6 +67,11 @@
int TEH_allow_keys_timetravel;
/**
+ * Should we allow two HTTPDs to bind to the same port?
+ */
+static int allow_address_reuse;
+
+/**
* The exchange's configuration (global)
*/
const struct GNUNET_CONFIGURATION_Handle *TEH_cfg;
@@ -1797,6 +1802,8 @@ run (void *cls,
MHD_OPTION_NOTIFY_CONNECTION,
&connection_done,
NULL,
+ MHD_OPTION_LISTENING_ADDRESS_REUSE,
+ (unsigned int) allow_address_reuse,
MHD_OPTION_CONNECTION_TIMEOUT,
connection_timeout,
MHD_OPTION_END);
@@ -1839,6 +1846,10 @@ main (int argc,
"connection-close",
"force HTTP connections to be closed after each request",
&connection_close),
+ GNUNET_GETOPT_option_flag ('r',
+ "allow-reuse-address",
+ "allow multiple HTTPDs to listen to the same port",
+ &allow_address_reuse),
GNUNET_GETOPT_option_uint ('t',
"timeout",
"SECONDS",
diff --git a/src/testing/testing_api_helpers_exchange.c b/src/testing/testing_api_helpers_exchange.c
index 438356e27..55be20328 100644
--- a/src/testing/testing_api_helpers_exchange.c
+++ b/src/testing/testing_api_helpers_exchange.c
@@ -766,6 +766,7 @@ TALER_TESTING_setup_with_exchange_cfg (
"-a", /* some tests may need timetravel */
"-c", setup_ctx->config_filename,
#if GNU_PARALLEL
+ "-r",
":::",
"-",
"-",