- use tunnel encryption state to select decryption key

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

diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 19631af089ff8a86d17a3a851c05d3f015ba3915..b38713a80ecb1d0889b4902888466e74d159c14d 100644 (file)
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -34,16 +34,12 @@
  */
 
 #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_EXTRA_LOGGING
-
-
 /**
  * Time to wait before stopping NAT, in seconds
  */
@@ -98,7 +94,8 @@ struct addr_cls
  */
 static int
 process_if (void *cls, const char *name, int isDefault,
-            const struct sockaddr *addr, socklen_t addrlen)
+            const struct sockaddr *addr, const struct sockaddr *broadcast_addr,
+            const struct sockaddr *netmask, socklen_t addrlen)
 {
   struct addr_cls *data = cls;
 
@@ -163,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;
 }