- debug

[oweals/gnunet.git] / src / pt / test_gns_vpn.c

diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index debba18af699ce9614dd49214d12bedeb16f3a6b..6fe1e63a225c8a755b2ab007f2d4e9368db18218 100644 (file)
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -28,7 +28,7 @@
 #include <microhttpd.h>
 #include "gnunet_namestore_service.h"
 #include "gnunet_gns_service.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
 
 #define PORT 8080
 #define TEST_DOMAIN "www.gads"
@@ -267,6 +267,7 @@ static void
 disco_ns (void* cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_NAMESTORE_disconnect (namestore);
+  namestore = NULL;
 }
 
 
@@ -293,15 +294,11 @@ commence_testing (void *cls, int32_t success, const char *emsg)
             "NS failed to create record %s\n", emsg);
     GNUNET_SCHEDULER_shutdown ();
     return;
-  }
-  
-  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10), start_curl, NULL);
-
+  }  
+  GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10), &start_curl, NULL);
 }
 
 
-
-
 /**
  * Function to keep the HTTP server running.
  */
@@ -417,30 +414,6 @@ run (void *cls,
 }
 
 
-/**
- * Test if the given AF is supported by this system.
- * 
- * @param af to test
- * @return GNUNET_OK if the AF is supported
- */
-static int
-test_af (int af)
-{
-  int s;
-
-  s = socket (af, SOCK_STREAM, 0);
-  if (-1 == s)
-  {
-    if (EAFNOSUPPORT == errno)
-      return GNUNET_NO;
-    fprintf (stderr, "Failed to create test socket: %s\n", STRERROR (errno));
-    return GNUNET_SYSERR;
-  }
-  close (s);
-  return GNUNET_OK;
-}
-
-
 /**
  * Open '/dev/null' and make the result the given
  * file descriptor.
@@ -528,6 +501,9 @@ int
 main (int argc, char *const *argv)
 {
   char *sbin_iptables;
+  char *bin_vpn;
+  char *bin_exit;
+  char *bin_dns;
   char *const iptables_args[] =
   {
     "iptables", "-t", "mangle", "-L", "-v", NULL
@@ -562,33 +538,42 @@ main (int argc, char *const *argv)
     return 0;
   }
 
+  bin_vpn = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
+  bin_exit = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-exit");
+  bin_dns = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-dns");
   if ( (0 != geteuid ()) &&
        ( (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary ("gnunet-helper-vpn")) ||
+         GNUNET_OS_check_helper_binary (bin_vpn)) ||
         (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary ("gnunet-helper-exit")) ||
+         GNUNET_OS_check_helper_binary (bin_exit)) ||
         (GNUNET_YES !=
-         GNUNET_OS_check_helper_binary ("gnunet-helper-dns"))) )
-  {
+         GNUNET_OS_check_helper_binary (bin_dns))) )
+  {    
     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");
     fprintf (stderr,
             "Change $PATH ('.' in $PATH before $GNUNET_PREFIX/bin is problematic) or permissions (run 'make install' as root) to fix this!\n");
+    GNUNET_free (bin_vpn);    
+    GNUNET_free (bin_exit);
+    GNUNET_free (bin_dns);
     return 0;
   }
-  GNUNET_CRYPTO_setup_hostkey ("test_gns_vpn.conf");
+  GNUNET_free (bin_vpn);    
+  GNUNET_free (bin_exit);
+  GNUNET_free (bin_dns);
+  GNUNET_CRYPTO_rsa_setup_hostkey ("test_gns_vpn.conf");
   
   dest_ip = "169.254.86.1";
   dest_af = AF_INET;
   src_af = AF_INET;
 
-  if (GNUNET_OK == test_af (AF_INET6))
+  if (GNUNET_OK == GNUNET_NETWORK_test_pf (PF_INET6))
     use_v6 = GNUNET_YES;
   else
     use_v6 = GNUNET_NO;
   
-  if ( (GNUNET_OK != test_af (src_af)) ||
-       (GNUNET_OK != test_af (dest_af)) )
+  if ( (GNUNET_OK != GNUNET_NETWORK_test_pf (src_af)) ||
+       (GNUNET_OK != GNUNET_NETWORK_test_pf (dest_af)) )
   {
     fprintf (stderr, 
             "Required address families not supported by this system, skipping test.\n");