[GNUnet-SVN] r26943 - in gnunet/src: exit nat pt vpn

[gnunet]

Author: cfuchs
Date: 2013-04-19 16:50:35 +0200 (Fri, 19 Apr 2013)
New Revision: 26943

Modified:
   gnunet/src/exit/gnunet-daemon-exit.c
   gnunet/src/nat/nat.c
   gnunet/src/nat/nat_auto.c
   gnunet/src/pt/test_gnunet_vpn.c
   gnunet/src/vpn/gnunet-service-vpn.c
Log:
added privilege testing parameters for helper-vpn, exit and nat-client.
todo: nat-server


Modified: gnunet/src/exit/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/exit/gnunet-daemon-exit.c        2013-04-19 11:55:20 UTC (rev 
26942)
+++ gnunet/src/exit/gnunet-daemon-exit.c        2013-04-19 14:50:35 UTC (rev 
26943)
@@ -3344,7 +3344,7 @@
   {
     binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
     if (GNUNET_YES !=
-       GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) // FIXME: CF: 
add test-parameters
+       GNUNET_OS_check_helper_binary (binary, GNUNET_YES, "-d gnunet-vpn - - - 
169.1.3.3.7 255.255.255.0")) //no nat, ipv4 only
     {
       GNUNET_free (binary);
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2013-04-19 11:55:20 UTC (rev 26942)
+++ gnunet/src/nat/nat.c        2013-04-19 14:50:35 UTC (rev 26943)
@@ -1183,7 +1183,7 @@
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-client");
   if ((GNUNET_YES == h->enable_nat_client) &&
       (GNUNET_YES !=
-       GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))) // FIXME: 
CF: add test-parameters
+       GNUNET_OS_check_helper_binary (binary, GNUNET_YES, "-d 127.0.0.1 
127.0.0.2 42"))) // none of these parameters are actually used in privilege 
testing mode
   {
     h->enable_nat_client = GNUNET_NO;
     LOG (GNUNET_ERROR_TYPE_WARNING,

Modified: gnunet/src/nat/nat_auto.c
===================================================================
--- gnunet/src/nat/nat_auto.c   2013-04-19 11:55:20 UTC (rev 26942)
+++ gnunet/src/nat/nat_auto.c   2013-04-19 14:50:35 UTC (rev 26943)
@@ -461,7 +461,7 @@
        (GNUNET_YES !=
         GNUNET_CONFIGURATION_get_value_yesno (ah->cfg, "nat", "BEHIND_NAT")) &&
        (GNUNET_YES ==
-        GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))); // FIXME: 
CF: add test-parameters
+        GNUNET_OS_check_helper_binary (binary, GNUNET_YES, "-d 127.0.0.1 
127.0.0.2 42"))); // none of these parameters are actually used in privilege 
testing mode
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,

Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2013-04-19 11:55:20 UTC (rev 26942)
+++ gnunet/src/pt/test_gnunet_vpn.c     2013-04-19 14:50:35 UTC (rev 26943)
@@ -410,12 +410,12 @@
     return 0;
   }
 #endif
-  vpn_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn.exe");
-  exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit.exe");
+  vpn_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
+  exit_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
   fprintf (stderr,"%s\n", vpn_binary);
   fprintf (stderr,"%s\n", exit_binary);
-  if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (vpn_binary, 
GNUNET_YES, NULL))) || // FIXME: CF: add test-parameters
-      (GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (exit_binary, 
GNUNET_YES, NULL)))) // FIXME: CF: add test-parameters
+  if ((GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (vpn_binary, 
GNUNET_YES, "-d gnunet-vpn - - 169.1.3.3.7 255.255.255.0"))) || //ipv4 only 
please!
+      (GNUNET_YES != (ret = GNUNET_OS_check_helper_binary (exit_binary, 
GNUNET_YES, "-d gnunet-vpn - - - 169.1.3.3.7 255.255.255.0")))) //no nat, ipv4 
only
   {
     GNUNET_free (vpn_binary);
     GNUNET_free (exit_binary);

Modified: gnunet/src/vpn/gnunet-service-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-service-vpn.c 2013-04-19 11:55:20 UTC (rev 26942)
+++ gnunet/src/vpn/gnunet-service-vpn.c 2013-04-19 14:50:35 UTC (rev 26943)
@@ -3062,7 +3062,7 @@
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
 
   if (GNUNET_YES !=
-      GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) // FIXME: CF: 
add test-parameters
+      GNUNET_OS_check_helper_binary (binary, GNUNET_YES, "-d gnunet-vpn - - 
169.1.3.3.7 255.255.255.0")) //ipv4 only please!
   {
     fprintf (stderr,
             "`%s' is not SUID, refusing to run.\n",