From 4ceef77ae57671d1b542d22d8f19987e89c3b69b Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 24 Nov 2021 21:57:39 +0100
Subject: add -r option to exchange-httpd

---
 src/exchange/taler-exchange-httpd.c        | 11 +++++++++++
 src/testing/testing_api_helpers_exchange.c |  1 +
 2 files changed, 12 insertions(+)

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
@@ -66,6 +66,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)
  */
@@ -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",
                                        ":::",
                                        "-",
                                        "-",
-- 
cgit v1.2.3