added section to solve vpn conflicts

diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf
index 372ad8ac57f14df2da9924d50582420c9e8442d9..0b919f925d5d689a5bdcffbde7b1c649de261312 100644 (file)
--- a/src/integration-tests/confs/c_bootstrap_server.conf
+++ b/src/integration-tests/confs/c_bootstrap_server.conf
@@ -6,6 +6,17 @@ DEFAULTCONFIG = confs/c_bootstrap_server.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0000-hostkey 
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-15
+
 [resolver]
 AUTOSTART = YES
 PORT = 20017

diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf
index 7d7dd98e0e38cc920bc0361df0f97e1c7afadbde..59fa0f787c70ec76a651271cbe1b4cd277ffbf0b 100644 (file)
--- a/src/integration-tests/confs/c_nat_client.conf
+++ b/src/integration-tests/confs/c_nat_client.conf
@@ -8,6 +8,17 @@ HOSTKEY = hostkeys/0002-hostkey
 [client]
 HOME = $SERVICEHOME
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-57
+
 
 [resolver]
 AUTOSTART = YES

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 5e9e68465c1ba3cc5d74c00489f0d1ed8037b594..4ec077c81a30b92e5103fc891dfca863ea680ced 100644 (file)
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -6,6 +6,17 @@ DEFAULTCONFIG = confs/c_no_nat_client.conf
 #HOSTKEY = $SERVICEHOME/.hostkey
 HOSTKEY = hostkeys/0001-hostkey 
 
+[vpn]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/gnunet-service-vpn-29
+
 [resolver]
 AUTOSTART = YES
 PORT = 20035