-indent, doxygen

[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 0786bb04bcb50dc6f9bbd52759a6bb67af94058f..39bd6612e408cae458bef2cef90af213e06bb9d1 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -26,14 +26,9 @@
  * @author Christian Grothoff
  */
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_nat_lib.h"
 
-
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
-
 /**
  * Time to wait before stopping NAT test, in seconds
  */
@@ -52,15 +47,18 @@ 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,
+                enum GNUNET_NAT_FailureCode aret)
 {
-  GNUNET_assert (GNUNET_OK == success);
+  GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret);
   ret = 0;
   GNUNET_SCHEDULER_cancel (end);
   end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
 }
 
+
 /**
  * Main function run with scheduler.
  */
@@ -69,7 +67,8 @@ 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,
+      GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285,
+                             &report_success,
                              NULL);
   if (NULL == tst)
     return;
@@ -84,51 +83,43 @@ 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",
     "test_nat_test_data.conf",
-    "-L",
-#if VERBOSE
-    "DEBUG",
-#else
-    "WARNING",
-#endif
     NULL
   };
 
   GNUNET_log_setup ("test-nat-test",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
 
-  nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server");
+  nat_res = GNUNET_OS_check_helper_binary ("gnunet-nat-server", GNUNET_NO, NULL);
   if (GNUNET_SYSERR == nat_res)
   {
-    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Cannot run NAT test: `%s' file not found\n",
+    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 (NULL, NULL, "gnunet-nat-server",
-                               "gnunet-nat-server",
-#if VERBOSE
-                               "-L", "DEBUG",
-#endif
-                               "-c", "test_nat_test_data.conf", "12345", NULL);
+  gns = GNUNET_OS_start_process (GNUNET_YES,
+                                 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+                                 NULL, NULL, NULL,
+                                 "gnunet-nat-server",
+                                 "gnunet-nat-server",
+                                 "-c", "test_nat_test_data.conf",
+                                 "12345", NULL);
   GNUNET_assert (NULL != gns);
-  GNUNET_PROGRAM_run (5, argv_prog, "test-nat-test", "nohelp", options, &run,
+  GNUNET_PROGRAM_run (3, argv_prog, "test-nat-test", "nohelp", options, &run,
                       NULL);
-  GNUNET_break (0 == GNUNET_OS_process_kill (gns, SIGTERM));
+  GNUNET_break (0 == GNUNET_OS_process_kill (gns, GNUNET_TERM_SIG));
   GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns));
-  GNUNET_OS_process_close (gns);
+  GNUNET_OS_process_destroy (gns);
+  if (0 != ret)
+    fprintf (stderr,
+             "NAT test failed to report success\n");
   return ret;
 }