[GNUnet-SVN] [gnunet] branch master updated: fix nat-auto port conflict

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 3142b0ac6 fix nat-auto port conflict
3142b0ac6 is described below

commit 3142b0ac6289dc71c667cff6b6520170c49ed24e
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Feb 15 14:22:42 2019 +0100

    fix nat-auto port conflict
---
 src/integration-tests/confs/c_bootstrap_server.conf | 4 ++++
 src/integration-tests/confs/c_nat_client.conf       | 4 ++++
 src/integration-tests/confs/c_no_nat_client.conf    | 4 ++++
 src/integration-tests/confs/c_no_nat_client_2.conf  | 5 +++++
 4 files changed, 17 insertions(+)

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf 
b/src/integration-tests/confs/c_bootstrap_server.conf
index b2fd06a37..59f2bb949 100644
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -26,6 +26,10 @@ DISABLEV6 = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-4
 PORT = 20070
 
+[nat-auto]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-natauto-4
+PORT = 20076
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-4
 PORT = 20004
diff --git a/src/integration-tests/confs/c_nat_client.conf 
b/src/integration-tests/confs/c_nat_client.conf
index c25a553fa..550bd38f7 100644
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -28,6 +28,10 @@ DISABLEV6 = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-46
 PORT = 20071
 
+[nat-auto]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-natauto-46
+PORT = 20077
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
 PORT = 20058
diff --git a/src/integration-tests/confs/c_no_nat_client.conf 
b/src/integration-tests/confs/c_no_nat_client.conf
index 8df66f299..4573df601 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -24,6 +24,10 @@ DISABLEV6 = NO
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-18
 PORT = 20072
 
+[nat-auto]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-natauto-18
+PORT = 20074
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022
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 4c8080c67..a7d9a436f 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -29,6 +29,11 @@ DISABLEV6 = NO
 PORT = 20073
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nat-18
 
+[nat-auto]
+PORT = 20075
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-natauto-18
+
+
 [arm]
 UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
 PORT = 20022

-- 
To stop receiving notification emails like this one, please contact
address@hidden