-picking better default networks for dns/vpn/exit

2 files changed, 18 insertions, 1 deletions

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