-indentation

[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 d017dffbd9a9b6e7053d0d41a878edbfea7238ed..4095e840c2290516fd6c00a0da2997eed729be28 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -39,22 +39,20 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
-static GNUNET_SCHEDULER_TaskIdentifier end;
-
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+report_result (void *cls,
+                enum GNUNET_NAT_FailureCode aret)
 {
-  GNUNET_NAT_test_stop (tst);
+  if (GNUNET_NAT_ERROR_TIMEOUT == aret)
+    fprintf (stderr,
+             "NAT test timed out\n");
+  else if (GNUNET_NAT_ERROR_SUCCESS != aret)
+    fprintf (stderr,
+             "NAT test reported error %d\n", aret);
+  else
+    ret = 0;
 }
 
-static void
-report_success (void *cls, int success)
-{
-  GNUNET_assert (GNUNET_OK == success);
-  ret = 0;
-  GNUNET_SCHEDULER_cancel (end);
-  end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
-}
 
 /**
  * Main function run with scheduler.
@@ -64,11 +62,9 @@ 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, TIMEOUT,
+                             &report_result,
                              NULL);
-  if (NULL == tst)
-    return;
-  end = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
 }
 
 
@@ -100,18 +96,22 @@ main (int argc, char *const argv[])
     return 0;
   }
 
-  gns =
-      GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR, NULL, NULL, "gnunet-nat-server",
-                               "gnunet-nat-server",
-                               "-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 (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_destroy (gns);
   if (0 != ret)
-    fprintf (stderr, "NAT test failed to report success\n");
+    fprintf (stderr,
+             "NAT test failed to report success\n");
   return ret;
 }