doc: gnunet-c-tutorial: Add nodes.

[oweals/gnunet.git] / src / nat / test_nat_mini.c

diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 6fe4fd5b9d11ccdd9282418afb8d0c1a062a9ab1..d6ab2a32141c64ab0dcd45d988bdecda208f1bda 100644 (file)
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009, 2011 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.
 */
 
 /**
@@ -45,15 +45,21 @@ static void
 addr_callback (void *cls, int add_remove,
                const struct sockaddr *addr,
                socklen_t addrlen,
-               const char *emsg)
+               enum GNUNET_NAT_StatusCode ret)
 {
-  fprintf (stderr,
+  if (GNUNET_NAT_ERROR_SUCCESS == ret)
+  {
+    fprintf (stderr,
            "Address changed: %s `%s' (%u bytes)\n",
            add_remove == GNUNET_YES
            ? "added" : "removed",
            GNUNET_a2s (addr,
                        addrlen),
            (unsigned int) addrlen);
+  }
+  else
+    ;
+    //TODO: proper error handling!
 }
 
 
@@ -61,7 +67,7 @@ addr_callback (void *cls, int add_remove,
  * Function that terminates the test.
  */
 static void
-stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop (void *cls)
 {
   struct GNUNET_NAT_MiniHandle *mini = cls;
 
@@ -115,8 +121,9 @@ main (int argc, char *const argv[])
                     NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "UPnP test for NAT library, timeout set to %d seconds\n",
-              TIMEOUT);
+              "UPnP test for NAT library, timeout set to %s\n",
+              GNUNET_STRINGS_relative_time_to_string (TIMEOUT,
+                                                      GNUNET_YES));
   GNUNET_PROGRAM_run (5, argv_prog, "test-nat-mini", "nohelp", options, &run,
                       NULL);
   return 0;