[GNUnet-SVN] r26944 - in gnunet/src: dns gns nat pt

[gnunet]

Author: cfuchs
Date: 2013-04-19 16:58:06 +0200 (Fri, 19 Apr 2013)
New Revision: 26944

Modified:
   gnunet/src/dns/gnunet-service-dns.c
   gnunet/src/gns/test_gns_proxy.c
   gnunet/src/nat/nat.c
   gnunet/src/nat/nat_auto.c
   gnunet/src/pt/test_gns_vpn.c
Log:
added privilege testing parameters for nat-server and added parameters 
to currently windows-only tests (less work in the future, even if this 
is ATM unused)



Modified: gnunet/src/dns/gnunet-service-dns.c
===================================================================
--- gnunet/src/dns/gnunet-service-dns.c 2013-04-19 14:50:35 UTC (rev 26943)
+++ gnunet/src/dns/gnunet-service-dns.c 2013-04-19 14:58:06 UTC (rev 26944)
@@ -1043,7 +1043,7 @@
   cfg = cfg_;
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
   if (GNUNET_YES !=
-      GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))
+      GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) // TODO: once 
we have a windows-testcase, add test parameters here
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                _("`%s' must be installed SUID, refusing to run\n"),

Modified: gnunet/src/gns/test_gns_proxy.c
===================================================================
--- gnunet/src/gns/test_gns_proxy.c     2013-04-19 14:50:35 UTC (rev 26943)
+++ gnunet/src/gns/test_gns_proxy.c     2013-04-19 14:58:06 UTC (rev 26944)
@@ -452,7 +452,7 @@
     return 0;
   }
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
-  if (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL))
+  if (GNUNET_YES != GNUNET_OS_check_helper_binary (binary, GNUNET_YES, NULL)) 
// TODO: once we have a windows-testcase, add test parameters here
   {
     fprintf (stderr, "DNS helper binary has wrong permissions... skipping!\n");
     GNUNET_free (binary);

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2013-04-19 14:50:35 UTC (rev 26943)
+++ gnunet/src/nat/nat.c        2013-04-19 14:58:06 UTC (rev 26944)
@@ -1171,7 +1171,7 @@
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-nat-server");
   if ((h->behind_nat == GNUNET_YES) && (GNUNET_YES == h->enable_nat_server) &&
       (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" ))) 
// use localhost as source for that one udp-port, ok for testing
   {
     h->enable_nat_server = GNUNET_NO;
     LOG (GNUNET_ERROR_TYPE_WARNING,

Modified: gnunet/src/nat/nat_auto.c
===================================================================
--- gnunet/src/nat/nat_auto.c   2013-04-19 14:50:35 UTC (rev 26943)
+++ gnunet/src/nat/nat_auto.c   2013-04-19 14:58:06 UTC (rev 26944)
@@ -426,7 +426,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" ))); 
// use localhost as source for that one udp-port, ok for testing
   GNUNET_free_non_null (tmp);
   GNUNET_free (binary);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,

Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c        2013-04-19 14:50:35 UTC (rev 26943)
+++ gnunet/src/pt/test_gns_vpn.c        2013-04-19 14:58:06 UTC (rev 26944)
@@ -543,11 +543,11 @@
   bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
   if ( (0 != geteuid ()) &&
        ( (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary (bin_vpn, GNUNET_YES, NULL)) ||
+         GNUNET_OS_check_helper_binary (bin_vpn, GNUNET_YES, "-d gnunet-vpn - 
- 169.1.3.3.7 255.255.255.0")) || //ipv4 only please!
         (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary (bin_exit, GNUNET_YES, NULL)) ||
+         GNUNET_OS_check_helper_binary (bin_exit, GNUNET_YES, "-d gnunet-vpn - 
- - 169.1.3.3.7 255.255.255.0")) || //no nat, ipv4 only
         (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary (bin_dns, GNUNET_YES, NULL))) )
+         GNUNET_OS_check_helper_binary (bin_dns, GNUNET_YES, NULL))) ) // 
TODO: once we have a windows-testcase, add test parameters here
   {    
     fprintf (stderr,
             "WARNING: gnunet-helper-{exit,vpn,dns} binaries in $PATH are not 
SUID, refusing to run test (as it would have to fail).\n");