X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Ftest_nat_mini.c;h=d6ab2a32141c64ab0dcd45d988bdecda208f1bda;hb=2105059516320800eaa8fff1196b58f29a50ba7c;hp=4e708c41323f3ecae69722be5a790fd42ddf2c43;hpb=f2e1a736377f59b2f7f12b0dcfc8c73e6e80e897;p=oweals%2Fgnunet.git

diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 4e708c413..d6ab2a321 100644
--- 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,30 +14,26 @@
 
      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 port redirection and public IP address retrieval.
  * This test never fails, because there need to be a NAT box set up for tha *
  * @file nat/test_nat_mini.c
- * @brief Testcase for NAT library - mini 
+ * @brief Testcase for NAT library - mini
  * @author Christian Grothoff
  *
  * TODO: actually use ARM to start resolver service to make DNS work!
  */
 
 #include "platform.h"
-#include "gnunet_common.h"
 #include "gnunet_util_lib.h"
 #include "gnunet_program_lib.h"
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_nat_lib.h"
 
-
-#define VERBOSE GNUNET_YES
-
 /* Time to wait before stopping NAT, in seconds */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
@@ -47,13 +43,23 @@
  */
 static void
 addr_callback (void *cls, int add_remove,
-               const struct sockaddr *addr, socklen_t addrlen)
+               const struct sockaddr *addr,
+               socklen_t addrlen,
+               enum GNUNET_NAT_StatusCode ret)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-	      "Address changed: %s `%s' (%u bytes)\n",
-              add_remove == GNUNET_YES ? "added" : "removed",
-              GNUNET_a2s (addr, addrlen),
-	      (unsigned int) addrlen);
+  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,12 +67,11 @@ 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;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-	      "Stopping NAT and quitting...\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Stopping NAT and quitting...\n");
   GNUNET_NAT_mini_map_stop (mini);
 }
 
@@ -76,25 +81,21 @@ stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
  * Main function run with scheduler.
  */
 static void
-run (void *cls,
-     char *const *args,
-     const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_NAT_MiniHandle *mini;
 
-  GNUNET_log_setup ("test-nat-mini", "DEBUG", NULL);
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "Requesting NAT redirection for port %u...\n",
               PORT);
-  mini = GNUNET_NAT_mini_map_start (PORT,
-				    GNUNET_YES /* tcp */,
-				    &addr_callback, NULL);
+  mini = GNUNET_NAT_mini_map_start (PORT, GNUNET_YES /* tcp */ ,
+                                    &addr_callback, NULL);
   if (NULL == mini)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-		  "Could not start UPnP interaction\n");
-      return;
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Could not start UPnP interaction\n");
+    return;
+  }
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, mini);
 }
 
@@ -111,26 +112,20 @@ main (int argc, char *const argv[])
     "-c",
     "test_nat_data.conf",
     "-L",
-#if VERBOSE
-    "DEBUG",
-#else
     "WARNING",
-#endif
     NULL
   };
 
   GNUNET_log_setup ("test-nat-mini",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "UPnP test for NAT library, timeout set to %d seconds\n", TIMEOUT);
-  GNUNET_PROGRAM_run (5, argv_prog, "test-nat-mini",
-		      "nohelp", options, &run, NULL);
+              "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;
 }