[GNUnet-SVN] r30420 - gnunet/src/exit

[gnunet]

Author: grothoff
Date: 2013-10-26 17:17:48 +0200 (Sat, 26 Oct 2013)
New Revision: 30420

Modified:
   gnunet/src/exit/exit.conf
   gnunet/src/exit/gnunet-daemon-exit.c
Log:
-make proper use of new policy parser

Modified: gnunet/src/exit/exit.conf
===================================================================
--- gnunet/src/exit/exit.conf   2013-10-26 14:57:24 UTC (rev 30419)
+++ gnunet/src/exit/exit.conf   2013-10-26 15:17:48 UTC (rev 30420)
@@ -5,7 +5,7 @@
 # must be within the global IPv6 range of your system!)
 IPV6ADDR = 2001:DB8::1
 
-# Prefix for our IPv6 subnet on the TUN interface. 
+# Prefix for our IPv6 subnet on the TUN interface.
 IPV6PREFIX = 64
 
 # IPv4 address to use on our TUN interface (may need to be
@@ -16,13 +16,13 @@
 # Netmask for the IPv4 subnet on the TUN interface.
 IPV4MASK = 255.255.255.0
 
-# Regular expression matching IPv4 addresses in binary (32 values of 0 or 1) 
-# format for which this system is willing to serve as an exit.
-EXIT_RANGE_IPV4_REGEX = (0|1)*
+# IPv4 networks to which we are allowed to exit.
+# The format is "(network[/netmask][:[!]SPORT-DPORT];)*"
+EXIT_RANGE_IPV4_POLICY = 0.0.0.0/0:!25;
 
-# Regular expression matching IPv4 addresses in binary (128 values of 0 or 1) 
-# format for which this system is willing to serve as an exit.
-EXIT_RANGE_IPV6_REGEX = (0|1)*
+# IPv6 networks to which we are allowed to exit.
+# The format is "(network[/netmask][:[!]SPORT-DPORT];)*"
+EXIT_RANGE_IPV6_POLICY = ::/0:!25;
 
 
 # Name of the (virtual) tunnel interface the exit daemon will manage
@@ -43,10 +43,10 @@
 # Set this to YES to allow exiting this system via IPv6 to the Internet
 EXIT_IPV6 = NO
 
-# This option should be set to YES to allow the DNS service to 
+# This option should be set to YES to allow the DNS service to
 # perform lookups against the locally configured DNS resolver.
 # (set to "NO" if no normal ISP is locally available and thus
-# requests for normal ".com"/".org"/etc. must be routed via 
+# requests for normal ".com"/".org"/etc. must be routed via
 # the GNUnet VPN (the GNUNET PT daemon then needs to be configured
 # to intercept and route DNS queries via mesh).
 # Set this to YES to allow using this system for DNS queries.

Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c        2013-10-26 14:57:24 UTC (rev 
30419)
+++ gnunet/src/exit/gnunet-daemon-exit.c        2013-10-26 15:17:48 UTC (rev 
30420)
@@ -3719,7 +3719,7 @@
     if (GNUNET_OK !=
        GNUNET_CONFIGURATION_get_value_string (cfg,
                                                "exit",
-                                               "EXIT_RANGE_IPV4_REGEX",
+                                               "EXIT_RANGE_IPV4_POLICY",
                                                &policy))
       regex = NULL;
     else
@@ -3745,7 +3745,7 @@
     if (GNUNET_OK !=
        GNUNET_CONFIGURATION_get_value_string (cfg,
                                                "exit",
-                                               "EXIT_RANGE_IPV6_REGEX",
+                                               "EXIT_RANGE_IPV6_POLICY",
                                                &policy))
       regex = NULL;
     else