WiP

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

diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 6f22269296aff8726893f549b8f3a2589ae26cec..9fab3a9bab899399b6fd79a8d4f95cd953465525 100644 (file)
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -45,7 +45,7 @@
 
 struct addr_cls
 {
-  const struct sockaddr *addr;
+  struct sockaddr *addr;
   socklen_t addrlen;
 };
 
@@ -76,22 +76,16 @@ process_if (void *cls,
 {
   struct addr_cls *data = cls;
 
-  if (addr)
+  if (addr && addrlen > 0)
     {
-      data->addr = addr;
+      if (data->addr)
+        GNUNET_free (data->addr);
+      data->addr = memcpy (GNUNET_malloc (addrlen), addr, addrlen);
       data->addrlen = addrlen;
+      if (isDefault)
+        return GNUNET_SYSERR;
     }
-
-  if (strcmp (name, "eth1") == 0 && addr->sa_family == AF_INET)
-    return GNUNET_SYSERR;
-
   return GNUNET_OK;
-
-
-  if (isDefault && addr)
-    return GNUNET_SYSERR;
-  else
-    return GNUNET_OK;
 }
 
 static void
@@ -142,12 +136,31 @@ main (int argc, char *const argv[])
     GNUNET_GETOPT_OPTION_END
   };
 
-  GNUNET_log_setup ("test-nat", "DEBUG", NULL);
+  char *const argv_prog[] = {
+    "test-nat",
+    "-c",
+    "test-nat.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 (argc, argv, "test-nat", "nohelp", options, &run, NULL);
+  GNUNET_PROGRAM_run (5, argv_prog, "test-nat", "nohelp", options, &run, NULL);
 
   return 0;
 }