X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Ftest_nat_test.c;h=a7cbaeab4d32dd987e226798278999ebb2a57a92;hb=ccd23df541fac1192f492b0169cb87f0f23a726d;hp=39bd6612e408cae458bef2cef90af213e06bb9d1;hpb=8f4f3b2de0a5288fd6b68219f7ec0e2073f5017e;p=oweals%2Fgnunet.git

diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 39bd6612e..a7cbaeab4 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -1,26 +1,21 @@
 /*
      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
-     by the Free Software Foundation; either version 3, or (at your
-     option) any later version.
+     GNUnet is free software: you can redistribute it and/or modify it
+     under the terms of the GNU Affero General Public License as published
+     by the Free Software Foundation, either version 3 of the License,
+     or (at your option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
-
-     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.
+     Affero General Public License for more details.
+    
+     You should have received a copy of the GNU Affero General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 /**
- * Testcase for the NAT testing code.
- *
  * @file nat/test_nat_test.c
  * @brief Testcase for NAT testing functions
  * @author Christian Grothoff
@@ -39,23 +34,37 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
-static GNUNET_SCHEDULER_TaskIdentifier end;
+static struct GNUNET_SCHEDULER_Task * tsk;
+
 
 static void
-end_test (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+report_result (void *cls,
+                enum GNUNET_NAT_StatusCode aret)
 {
+  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;
   GNUNET_NAT_test_stop (tst);
+  tst = NULL;
+  GNUNET_SCHEDULER_cancel (tsk);
+  tsk = NULL;
 }
 
 
 static void
-report_success (void *cls,
-                enum GNUNET_NAT_FailureCode aret)
+failed_timeout (void *cls)
 {
-  GNUNET_assert (GNUNET_NAT_ERROR_SUCCESS == aret);
-  ret = 0;
-  GNUNET_SCHEDULER_cancel (end);
-  end = GNUNET_SCHEDULER_add_now (&end_test, NULL);
+  tsk = NULL;
+  fprintf (stderr,
+	   "NAT test failed to terminate on timeout\n");
+  ret = 2;
+  GNUNET_NAT_test_stop (tst);
+  tst = NULL;
 }
 
 
@@ -67,12 +76,14 @@ 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);
+  tsk = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply (TIMEOUT,
+								     2),
+				      &failed_timeout,
+				      NULL);
+
 }
 
 
@@ -112,7 +123,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));