Merge branch 'master' of gnunet.org:gnunet

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

diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 6a533798e07ed39dc003e68d399ccc11cbdbad90..2e14a1ffade976dcf9735b5f58cc2790b5ff2e79 100644 (file)
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.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.
 */
 
 /**
@@ -34,18 +34,14 @@
  */
 
 #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_NO
-
-
 /**
- * Time to wait before stopping NAT, in seconds 
+ * Time to wait before stopping NAT, in seconds
  */
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
@@ -58,9 +54,11 @@ static void
 addr_callback (void *cls, int add_remove, const struct sockaddr *addr,
                socklen_t addrlen)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Address changed: %s `%s' (%u bytes)\n",
-              add_remove == GNUNET_YES ? "added" : "removed", GNUNET_a2s (addr,
-                                                                          addrlen),
+  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);
 }
 
@@ -69,11 +67,12 @@ addr_callback (void *cls, int add_remove, const struct sockaddr *addr,
  * Function that terminates the test.
  */
 static void
-stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+stop (void *cls)
 {
   struct GNUNET_NAT_Handle *nat = 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_unregister (nat);
 }
 
@@ -87,18 +86,23 @@ struct addr_cls
 
 /**
  * Return the address of the default interface,
- * or any interface with a valid address if the default is not valid 
+ * or any interface with a valid address if the default is not valid
  *
  * @param cls the 'struct addr_cls'
  * @param name name of the interface
  * @param isDefault do we think this may be our default interface
  * @param addr address of the interface
- * @param addrlen number of bytes in addr
- * @return GNUNET_OK to continue iterating
+ * @param addrlen number of bytes in @a addr
+ * @return #GNUNET_OK to continue iterating
  */
 static int
-process_if (void *cls, const char *name, int isDefault,
-            const struct sockaddr *addr, socklen_t addrlen)
+process_if (void *cls,
+            const char *name,
+            int isDefault,
+            const struct sockaddr *addr,
+            const struct sockaddr *broadcast_addr,
+            const struct sockaddr *netmask,
+            socklen_t addrlen)
 {
   struct addr_cls *data = cls;
 
@@ -106,7 +110,7 @@ process_if (void *cls, const char *name, int isDefault,
     return GNUNET_OK;
   GNUNET_free_non_null (data->addr);
   data->addr = GNUNET_malloc (addrlen);
-  memcpy (data->addr, addr, addrlen);
+  GNUNET_memcpy (data->addr, addr, addrlen);
   data->addrlen = addrlen;
   if (isDefault)
     return GNUNET_SYSERR;
@@ -118,7 +122,9 @@ process_if (void *cls, const char *name, int isDefault,
  * Main function run with scheduler.
  */
 static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+     char *const *args,
+     const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   struct GNUNET_NAT_Handle *nat;
@@ -131,7 +137,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "Could not find a valid interface address!\n");
-    exit (GNUNET_SYSERR);
+    exit (77); /* marks test as skipped */
   }
   addr = data.addr;
   GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6);
@@ -146,7 +152,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ ,
                              2086, 1, (const struct sockaddr **) &addr,
-                             &data.addrlen, &addr_callback, NULL, NULL);
+                             &data.addrlen, &addr_callback, NULL, NULL, NULL);
   GNUNET_free (addr);
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat);
 }
@@ -163,28 +169,21 @@ main (int argc, char *const argv[])
     "test-nat",
     "-c",
     "test_nat_data.conf",
-    "-L",
-#if VERBOSE
-    "DEBUG",
-#else
-    "WARNING",
-#endif
     NULL
   };
-
   GNUNET_log_setup ("test-nat",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Testing NAT library, timeout set to %d seconds\n", TIMEOUT);
-
-  GNUNET_PROGRAM_run (5, argv_prog, "test-nat", "nohelp", options, &run, NULL);
-
+              "Testing NAT library, timeout set to %s\n",
+              GNUNET_STRINGS_relative_time_to_string (TIMEOUT,
+                                                      GNUNET_YES));
+  GNUNET_PROGRAM_run (3,
+                      argv_prog,
+                      "test-nat",
+                      "nohelp",
+                      options,
+                      &run, NULL);
   return 0;
 }