use disjoint UNIXPATHs and PORT for NAT

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 0087d81311d6b081290e6fd16d815201507f8329..b2fd06a377e9afa5779669ed01b50f7d117c260a 100644 (file)
--- 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 8ec2c60a08f9e82d44facb5a7e1cc454779895b2..c25a553fa637360ebb8e6c5e179e3fcc2258f391 100644 (file)
--- 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 16e514b961d43ad0c98525b3368ad5eca9bb5240..8df66f29950433db34184705c5c7402dda2a051b 100644 (file)
--- 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 cd952e36cb5e26e0e09de9bd864ee7cb6ad79a2d..4c8080c6744f19630ae1c89950d7aa1c8d1367e4 100644 (file)
--- 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