X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Ftest_nat.c;h=b38713a80ecb1d0889b4902888466e74d159c14d;hb=27c12911f4f2aba2d90099270d70de846e83854f;hp=72cff0915fb73209a710e807a5f17925e52b578d;hpb=8a3016481ba6aeb36de3950a56e641dda53ca544;p=oweals%2Fgnunet.git

diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 72cff0915..b38713a80 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -34,18 +34,16 @@
  */
 
 #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, 60)
+/**
+ * Time to wait before stopping NAT, in seconds
+ */
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
 
 
 /**
@@ -53,14 +51,13 @@
  * believes to be valid for the transport.
  */
 static void
-addr_callback (void *cls, int add_remove,
-               const struct sockaddr *addr, socklen_t addrlen)
+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),
-	      (unsigned int) 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);
 }
 
 
@@ -72,8 +69,7 @@ stop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   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,7 +83,7 @@ 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
@@ -97,9 +93,9 @@ struct addr_cls
  * @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;
 
@@ -119,23 +115,21 @@ process_if (void *cls,
  * 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_Handle *nat;
   struct addr_cls data;
   struct sockaddr *addr;
 
-  GNUNET_log_setup ("test-nat", "DEBUG", NULL);
   data.addr = NULL;
   GNUNET_OS_network_interfaces_list (process_if, &data);
   if (NULL == data.addr)
-    {
-      GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                  "Could not find a valid interface address!\n");
-      exit (GNUNET_SYSERR);
-    }
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+                "Could not find a valid interface address!\n");
+    exit (GNUNET_SYSERR);
+  }
   addr = data.addr;
   GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6);
   if (addr->sa_family == AF_INET)
@@ -147,13 +141,9 @@ run (void *cls,
               "Requesting NAT redirection from address %s...\n",
               GNUNET_a2s (addr, data.addrlen));
 
-  nat = GNUNET_NAT_register (cfg, 
-			     GNUNET_YES /* tcp */,
-			     2086,
-			     1,
-			     (const struct sockaddr**) &addr, 
-			     &data.addrlen, 
-			     &addr_callback, NULL, NULL);
+  nat = GNUNET_NAT_register (cfg, GNUNET_YES /* tcp */ ,
+                             2086, 1, (const struct sockaddr **) &addr,
+                             &data.addrlen, &addr_callback, NULL, NULL);
   GNUNET_free (addr);
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat);
 }
@@ -170,28 +160,14 @@ 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);
-
+  GNUNET_PROGRAM_run (3, argv_prog, "test-nat", "nohelp", options, &run, NULL);
   return 0;
 }