diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-01-10 15:54:49 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-01-10 15:54:49 +0000 |
commit | 19fe4bde52ad570148183709818fd82eba4f83d1 (patch) | |
tree | fabd9f2f3a6d63e90165fe99dfd8c8a464a316a2 /src/integration-tests | |
parent | 4cd9ad92ad6131400e52dc1f25516b4134150aef (diff) | |
download | gnunet-19fe4bde52ad570148183709818fd82eba4f83d1.tar.gz gnunet-19fe4bde52ad570148183709818fd82eba4f83d1.zip |
added section to solve vpn conflicts
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/confs/c_bootstrap_server.conf | 11 | ||||
-rw-r--r-- | src/integration-tests/confs/c_nat_client.conf | 11 | ||||
-rw-r--r-- | src/integration-tests/confs/c_no_nat_client.conf | 11 |
3 files changed, 33 insertions, 0 deletions
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 | |||
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 6 | #HOSTKEY = $SERVICEHOME/.hostkey |
7 | HOSTKEY = hostkeys/0000-hostkey | 7 | HOSTKEY = hostkeys/0000-hostkey |
8 | 8 | ||
9 | [vpn] | ||
10 | AUTOSTART = YES | ||
11 | PORT = 0 | ||
12 | HOSTNAME = localhost | ||
13 | HOME = $SERVICEHOME | ||
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | ||
16 | ACCEPT_FROM = 127.0.0.1; | ||
17 | ACCEPT_FROM6 = ::1; | ||
18 | UNIXPATH = /tmp/gnunet-service-vpn-15 | ||
19 | |||
9 | [resolver] | 20 | [resolver] |
10 | AUTOSTART = YES | 21 | AUTOSTART = YES |
11 | PORT = 20017 | 22 | 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 | |||
8 | [client] | 8 | [client] |
9 | HOME = $SERVICEHOME | 9 | HOME = $SERVICEHOME |
10 | 10 | ||
11 | [vpn] | ||
12 | AUTOSTART = YES | ||
13 | PORT = 0 | ||
14 | HOSTNAME = localhost | ||
15 | HOME = $SERVICEHOME | ||
16 | CONFIG = $DEFAULTCONFIG | ||
17 | BINARY = gnunet-service-dns | ||
18 | ACCEPT_FROM = 127.0.0.1; | ||
19 | ACCEPT_FROM6 = ::1; | ||
20 | UNIXPATH = /tmp/gnunet-service-vpn-57 | ||
21 | |||
11 | 22 | ||
12 | [resolver] | 23 | [resolver] |
13 | AUTOSTART = YES | 24 | 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 | |||
6 | #HOSTKEY = $SERVICEHOME/.hostkey | 6 | #HOSTKEY = $SERVICEHOME/.hostkey |
7 | HOSTKEY = hostkeys/0001-hostkey | 7 | HOSTKEY = hostkeys/0001-hostkey |
8 | 8 | ||
9 | [vpn] | ||
10 | AUTOSTART = YES | ||
11 | PORT = 0 | ||
12 | HOSTNAME = localhost | ||
13 | HOME = $SERVICEHOME | ||
14 | CONFIG = $DEFAULTCONFIG | ||
15 | BINARY = gnunet-service-dns | ||
16 | ACCEPT_FROM = 127.0.0.1; | ||
17 | ACCEPT_FROM6 = ::1; | ||
18 | UNIXPATH = /tmp/gnunet-service-vpn-29 | ||
19 | |||
9 | [resolver] | 20 | [resolver] |
10 | AUTOSTART = YES | 21 | AUTOSTART = YES |
11 | PORT = 20035 | 22 | PORT = 20035 |