doc: gnunet-c-tutorial: Add nodes.

[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 4095e840c2290516fd6c00a0da2997eed729be28..402671bd2f160dbe56ccc7119be45591a7e4ca6e 100644 (file)
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2011, 2014 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,13 +14,10 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
-
 /**
- * Testcase for the NAT testing code.
- *
  * @file nat/test_nat_test.c
  * @brief Testcase for NAT testing functions
  * @author Christian Grothoff
@@ -39,9 +36,12 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
+static struct GNUNET_SCHEDULER_Task * tsk;
+
+
 static void
 report_result (void *cls,
-                enum GNUNET_NAT_FailureCode aret)
+                enum GNUNET_NAT_StatusCode aret)
 {
   if (GNUNET_NAT_ERROR_TIMEOUT == aret)
     fprintf (stderr,
@@ -51,6 +51,22 @@ report_result (void *cls,
              "NAT test reported error %d\n", aret);
   else
     ret = 0;
+  GNUNET_NAT_test_stop (tst);
+  tst = NULL;
+  GNUNET_SCHEDULER_cancel (tsk);
+  tsk = NULL;
+}
+
+
+static void
+failed_timeout (void *cls)
+{
+  tsk = NULL;
+  fprintf (stderr,
+          "NAT test failed to terminate on timeout\n");
+  ret = 2;
+  GNUNET_NAT_test_stop (tst);
+  tst = NULL;
 }
 
 
@@ -65,6 +81,11 @@ run (void *cls, char *const *args, const char *cfgfile,
       GNUNET_NAT_test_start (cfg, GNUNET_YES, 1285, 1285, TIMEOUT,
                              &report_result,
                              NULL);
+  tsk = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (TIMEOUT,
+                                                                    2),
+                                     &failed_timeout,
+                                     NULL);
+
 }
 
 
@@ -104,7 +125,9 @@ main (int argc, char *const argv[])
                                  "-c", "test_nat_test_data.conf",
                                  "12345", NULL);
   GNUNET_assert (NULL != gns);
-  GNUNET_PROGRAM_run (3, 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, GNUNET_TERM_SIG));
   GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (gns));