3 files changed, 23 insertions, 5 deletions

diff --git a/src/exit/exit.conf b/src/exit/exit.conf
index bd3fd0df1..0d48de94b 100644
--- a/src/exit/exit.conf
+++ b/src/exit/exit.conf
@@ -4,17 +4,18 @@ BINARY = gnunet-daemon-exit
 
 # IPv6 address for the TUN interface (must be changed as this
 # must be within the global IPv6 range of your system!)
-IPV6ADDR = 1234:1::1
+IPV6ADDR = 2001:DB8::1
 
 # Prefix for our IPv6 subnet on the TUN interface. 
-IPV6PREFIX = 32
+IPV6PREFIX = 64
 
 # IPv4 address to use on our TUN interface (may need to be
 # changed to avoid conflicts with existing addresses on your system).
-IPV4ADDR = 10.10.1.1
+# Use RFC 3927-style link-local address
+IPV4ADDR = 169.254.86.1
 
 # Netmask for the IPv4 subnet on the TUN interface.
-IPV4MASK = 255.255.0.0
+IPV4MASK = 255.255.255.0
 
 
 # Name of the (virtual) tunnel interface the exit daemon will manage
diff --git a/src/vpn/test_gnunet_vpn.c b/src/vpn/test_gnunet_vpn.c
index e43cad5d8..1e4e2044d 100644
--- a/src/vpn/test_gnunet_vpn.c
+++ b/src/vpn/test_gnunet_vpn.c
@@ -381,7 +381,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                           MHD_OPTION_END);
   GNUNET_assert (NULL != mhd);
   mhd_main ();
-  GNUNET_assert (1 == inet_pton (AF_INET, "10.10.1.1", &v4));
+  GNUNET_assert (1 == inet_pton (AF_INET, "169.254.86.1", &v4));
   rr = GNUNET_VPN_redirect_to_ip (vpn,
                                   AF_INET,
                                   AF_INET,
diff --git a/src/vpn/test_gnunet_vpn.conf b/src/vpn/test_gnunet_vpn.conf
index 7537407ba..a5c0aa224 100644
--- a/src/vpn/test_gnunet_vpn.conf
+++ b/src/vpn/test_gnunet_vpn.conf
@@ -18,3 +18,20 @@ EXIT_IFNAME = eth1
 [testing]
 WEAKRANDOM = YES
 HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat
+
+
+
+# repeating some values from the default configurations
+# here as the respective network addresses are also
+# hard-wired in the tests and the MUST match (!)
+[vpn]
+IPV6ADDR = FC2D:FDAA:6A26::1
+IPV6PREFIX = 64
+IPV4ADDR = 169.254.20.1
+IPV4MASK = 255.255.255.0
+
+[exit]
+IPV6ADDR = FC5A:04E1:C2BA::1
+IPV6PREFIX = 92
+IPV4ADDR = 169.254.86.1
+IPV4MASK = 255.255.255.0