[GNUnet-SVN] r19412 - in gnunet/src: exit vpn

[gnunet]

Author: grothoff
Date: 2012-01-25 22:08:59 +0100 (Wed, 25 Jan 2012)
New Revision: 19412

Modified:
   gnunet/src/exit/exit.conf
   gnunet/src/vpn/test_gnunet_vpn.c
   gnunet/src/vpn/test_gnunet_vpn.conf
Log:
-picking better default networks for dns/vpn/exit

Modified: gnunet/src/exit/exit.conf
===================================================================
--- gnunet/src/exit/exit.conf   2012-01-25 20:44:52 UTC (rev 19411)
+++ gnunet/src/exit/exit.conf   2012-01-25 21:08:59 UTC (rev 19412)
@@ -4,17 +4,18 @@
 
 # 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

Modified: gnunet/src/vpn/test_gnunet_vpn.c
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.c    2012-01-25 20:44:52 UTC (rev 19411)
+++ gnunet/src/vpn/test_gnunet_vpn.c    2012-01-25 21:08:59 UTC (rev 19412)
@@ -381,7 +381,7 @@
                          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,

Modified: gnunet/src/vpn/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/vpn/test_gnunet_vpn.conf 2012-01-25 20:44:52 UTC (rev 19411)
+++ gnunet/src/vpn/test_gnunet_vpn.conf 2012-01-25 21:08:59 UTC (rev 19412)
@@ -18,3 +18,20 @@
 [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