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 d32015b56062859b061eb3645ed9308d021269f4..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, 2014 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,8 +14,8 @@
 
      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.
 */
 /**
  * @file nat/test_nat_test.c
@@ -36,7 +36,7 @@ static int ret = 1;
 
 static struct GNUNET_NAT_Test *tst;
 
-static GNUNET_SCHEDULER_TaskIdentifier tsk;
+static struct GNUNET_SCHEDULER_Task * tsk;
 
 
 static void
@@ -54,15 +54,14 @@ report_result (void *cls,
   GNUNET_NAT_test_stop (tst);
   tst = NULL;
   GNUNET_SCHEDULER_cancel (tsk);
-  tsk = GNUNET_SCHEDULER_NO_TASK;
+  tsk = NULL;
 }
 
 
 static void
-failed_timeout (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+failed_timeout (void *cls)
 {
-  tsk = GNUNET_SCHEDULER_NO_TASK;
+  tsk = NULL;
   fprintf (stderr,
           "NAT test failed to terminate on timeout\n");
   ret = 2;
@@ -86,7 +85,7 @@ run (void *cls, char *const *args, const char *cfgfile,
                                                                     2),
                                      &failed_timeout,
                                      NULL);
-  
+
 }
 
 
@@ -127,7 +126,7 @@ main (int argc, char *const argv[])
                                  "12345", NULL);
   GNUNET_assert (NULL != gns);
   GNUNET_PROGRAM_run (3, argv_prog,
-                     "test-nat-test", "nohelp", 
+                     "test-nat-test", "nohelp",
                      options, &run,
                       NULL);
   GNUNET_break (0 == GNUNET_OS_process_kill (gns, GNUNET_TERM_SIG));