From 19fe4bde52ad570148183709818fd82eba4f83d1 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 10 Jan 2012 15:54:49 +0000 Subject: [PATCH] added section to solve vpn conflicts --- src/integration-tests/confs/c_bootstrap_server.conf | 11 +++++++++++ src/integration-tests/confs/c_nat_client.conf | 11 +++++++++++ src/integration-tests/confs/c_no_nat_client.conf | 11 +++++++++++ 3 files changed, 33 insertions(+) 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 -- 2.25.1