From: Matthias Wachs <wachs@net.in.tum.de>
Date: Tue, 10 Jan 2012 15:54:49 +0000 (+0000)
Subject: added section to solve vpn conflicts
X-Git-Tag: initial-import-from-subversion-38251~15360
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=19fe4bde52ad570148183709818fd82eba4f83d1;p=oweals%2Fgnunet.git

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 372ad8ac5..0b919f925 100644
--- 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 7d7dd98e0..59fa0f787 100644
--- 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 5e9e68465..4ec077c81 100644
--- 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