-changing exit helper code to automatically do the network configuration for an exit...

diff --git a/src/exit/exit.conf b/src/exit/exit.conf
index bbf463047005254f441918ce74218e4e24f48909..ade3861ea758f52b015105780c83797dbf797792 100644 (file)
--- a/src/exit/exit.conf
+++ b/src/exit/exit.conf
@@ -23,7 +23,10 @@ TUN_IFNAME = exit-gnunet
 # Name of the "real" interface that IPv4 traffic from this system will
 # leave from; this is the name of the interface where we need to
 # enable NAT on postrouting (typically something like 'eth0' or 'eth1'
-# or 'wlan0').  Not needed if EXIT_IPv4 is disabled.
+# or 'wlan0').  Not needed if EXIT_IPv4 is disabled AND if all
+# offered services run on 'localhost'.  In this case, the value
+# of the option can instead be set to "%" (to not enable NAT on any
+# interface).
 EXIT_IFNAME = eth0
 
 # Set this to YES to allow exiting this system via IPv4 to the Internet

diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 9552da155307a396aba5db06629122738b0c68dd..b0f0d215a19972412db1a4d059e15bddcd9af83b 100644 (file)
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -2026,7 +2026,7 @@ run (void *cls, char *const *args GNUNET_UNUSED,
     return;
   }
   exit_argv[1] = tun_ifname;
-  if (ipv4_exit)
+  if (ipv4_enabled)
   {
     if (GNUNET_SYSERR ==
        GNUNET_CONFIGURATION_get_value_string (cfg, "exit", "EXIT_IFNAME", &exit_ifname))