-fixing #2309

[oweals/gnunet.git] / src / nat / test_nat_test.c

diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 3b20a9abdeef1fc812659bae1256918b1d11ff76..64617880aae5dbe4529f6a287b12003d5a37da7a 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -31,11 +31,11 @@
 #include "gnunet_nat_lib.h"
 
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 
 /**
- * Time to wait before stopping NAT test, in seconds 
+ * Time to wait before stopping NAT test, in seconds
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 15)
 
@@ -47,15 +47,13 @@ static struct GNUNET_NAT_Test *tst;
 static GNUNET_SCHEDULER_TaskIdentifier end;
 
 static void
-end_test (void *cls,
-         const struct GNUNET_SCHEDULER_TaskContext *tc)
+end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GNUNET_NAT_test_stop (tst);
 }
 
 static void
-report_success (void *cls,
-               int success)
+report_success (void *cls, int success)
 {
   GNUNET_assert (GNUNET_OK == success);
   ret = 0;
@@ -67,18 +65,15 @@ report_success (void *cls,
  * Main function run with scheduler.
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
-  tst = GNUNET_NAT_test_start (cfg, GNUNET_YES,
-                              1285, 1285,
-                              &report_success, NULL);
+  tst =
+      GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, &report_success,
+                             NULL);
   if (NULL == tst)
     return;
-  end  = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
-                                      &end_test,
-                                      NULL);
+  end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
 }
 
 
@@ -89,6 +84,9 @@ main (int argc, char *const argv[])
     GNUNET_GETOPT_OPTION_END
   };
   struct GNUNET_OS_Process *gns;
+
+  int nat_res;
+
   char *const argv_prog[] = {
     "test-nat-test",
     "-c",
@@ -109,23 +107,28 @@ main (int argc, char *const argv[])
                     "WARNING",
 #endif
                     NULL);
-  gns = GNUNET_OS_start_process (NULL, NULL,
-                                "gnunet-nat-server",
-                                "gnunet-nat-server",
+
+  nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+  if (GNUNET_SYSERR == nat_res)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+                "Cannot run NAT test: `%s' file not found\n",
+                "gnunet-nat-server");
+    return 0;
+  }
+
+  gns =
+      GNUNET_OS_start_process (GNUNET_YES, NULL, NULL, "gnunet-nat-server",
+                               "gnunet-nat-server",
 #if VERBOSE
-                                "-L",
-                                "DEBUG",
+                               "-L", "DEBUG",
 #endif
-                                "12345",
-                                NULL);
+                               "-c", "test_nat_test_data.conf", "12345", NULL);
   GNUNET_assert (NULL != gns);
-  GNUNET_PROGRAM_run (5, argv_prog, 
-                     "test-nat-test", "nohelp", 
-                     options, 
-                     &run, NULL);
+  GNUNET_PROGRAM_run (5, argv_prog, "test-nat-test", "nohelp", options, &run,
+                      NULL);
   GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM));
-  GNUNET_break (GNUNET_OK ==
-               GNUNET_OS_process_wait (gns));
+  GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns));
   GNUNET_OS_process_close (gns);
   return ret;
 }