-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 f66773a65f33aa24267928c3983f3ae21e82fa83..4095e840c2290516fd6c00a0da2997eed729be28 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -39,24 +39,18 @@ 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)
-{
-  GNUNET_NAT_test_stop (tst);
-}
-
-
 static void
-report_success (void *cls,
-                int success,
-                const char *emsg)
+report_result (void *cls,
+                enum GNUNET_NAT_FailureCode aret)
 {
-  GNUNET_assert (GNUNET_OK == success);
-  ret = 0;
-  GNUNET_SCHEDULER_cancel (end);
-  end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
+  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;
 }
 
 
@@ -68,12 +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);
 }