From 9188dd31aac92b19d931e42f699ac35471970cb2 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 13 Feb 2019 23:48:48 +0100 Subject: [PATCH] use disjoint UNIXPATHs and PORT for NAT --- src/integration-tests/confs/c_bootstrap_server.conf | 3 ++- src/integration-tests/confs/c_nat_client.conf | 3 ++- src/integration-tests/confs/c_no_nat_client.conf | 3 ++- src/integration-tests/confs/c_no_nat_client_2.conf | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 0087d8131..b2fd06a37 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf @@ -23,7 +23,8 @@ SERVERs = [nat] BEHIND_NAT = NO DISABLEV6 = NO - +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-4 +PORT = 20070 [arm] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4 diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 8ec2c60a0..c25a553fa 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf @@ -25,7 +25,8 @@ SERVERS = http://localhost:8080/ [nat] BEHIND_NAT = YES DISABLEV6 = NO - +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-46 +PORT = 20071 [arm] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46 diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 16e514b96..8df66f299 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf @@ -21,7 +21,8 @@ SERVERS = http://localhost:8080/ [nat] BEHIND_NAT = NO DISABLEV6 = NO - +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-18 +PORT = 20072 [arm] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf index cd952e36c..4c8080c67 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf @@ -26,7 +26,8 @@ SERVERS = http://localhost:8080/ [nat] BEHIND_NAT = NO DISABLEV6 = NO - +PORT = 20073 +UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-18 [arm] UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18 -- 2.25.1