the big NAT change

1 files changed, 72 insertions, 42 deletions

diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index d1268c93a..72cff0915 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     (C) 2009, 2011 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -19,20 +19,20 @@
 */
 
 /**
- * @file nat/test_nat.c
- * @brief Testcase for NAT library
- * @author Milan Bouchet-Valat
- */
-
-/**
  * Testcase for port redirection and public IP address retrieval.
  * This test never fails, because there need to be a NAT box set up for that.
- * So we only get IP address and open the 2086 port using any UPnP and NAT-PMP
- * routers found, wait for 30s, close ports and return.
+ * So we only get IP address and open the 2086 port using any NAT traversal
+ * method available, wait for 30s, close ports and return.
  * Have a look at the logs and use NMAP to check that it works with your box.
+ *
+ * @file nat/test_nat.c
+ * @brief Testcase for NAT library
+ * @author Milan Bouchet-Valat
+ * @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"
@@ -40,35 +40,62 @@
 #include "gnunet_scheduler_lib.h"
 #include "gnunet_nat_lib.h"
 
+
+#define VERBOSE GNUNET_YES
+
+
 /* Time to wait before stopping NAT, in seconds */
-#define TIMEOUT 60
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
 
-struct addr_cls
-{
-  struct sockaddr *addr;
-  socklen_t addrlen;
-};
 
+/**
+ * Function called on each address that the NAT service
+ * believes to be valid for the transport.
+ */
 static void
 addr_callback (void *cls, int add_remove,
                const struct sockaddr *addr, socklen_t addrlen)
 {
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "External address changed: %s %s\n",
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
+              "Address changed: %s `%s' (%u bytes)\n",
               add_remove == GNUNET_YES ? "added" : "removed",
-              GNUNET_a2s (addr, addrlen));
+              GNUNET_a2s (addr, addrlen),
+              (unsigned int) addrlen);
 }
 
+
+/**
+ * Function that terminates the test.
+ */
 static void
 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);
 }
 
-/* Return the address of the default interface,
- * or any interface with a valid address if the default is not valid */
+
+struct addr_cls
+{
+  struct sockaddr *addr;
+  socklen_t addrlen;
+};
+
+
+/**
+ * Return the address of the default interface,
+ * 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
+ */
 static int
 process_if (void *cls,
             const char *name,
@@ -76,18 +103,21 @@ process_if (void *cls,
 {
   struct addr_cls *data = cls;
 
-  if (addr && addrlen > 0)
-    {
-      if (data->addr)
-        GNUNET_free (data->addr);
-      data->addr = memcpy (GNUNET_malloc (addrlen), addr, addrlen);
-      data->addrlen = addrlen;
-      if (isDefault)
-        return GNUNET_SYSERR;
-    }
+  if (addr == NULL)
+    return GNUNET_OK;
+  GNUNET_free_non_null (data->addr);
+  data->addr = GNUNET_malloc (addrlen);
+  memcpy (data->addr, addr, addrlen);
+  data->addrlen = addrlen;
+  if (isDefault)
+    return GNUNET_SYSERR;
   return GNUNET_OK;
 }
 
+
+/**
+ * Main function run with scheduler.
+ */
 static void
 run (void *cls,
      char *const *args,
@@ -98,19 +128,15 @@ run (void *cls,
   struct sockaddr *addr;
 
   GNUNET_log_setup ("test-nat", "DEBUG", NULL);
-
   data.addr = NULL;
   GNUNET_OS_network_interfaces_list (process_if, &data);
-  if (!data.addr)
+  if (NULL == data.addr)
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not find a valid interface address!\n");
       exit (GNUNET_SYSERR);
     }
-
-  addr = GNUNET_malloc (data.addrlen);
-  memcpy (addr, data.addr, data.addrlen);
-
+  addr = data.addr;
   GNUNET_assert (addr->sa_family == AF_INET || addr->sa_family == AF_INET6);
   if (addr->sa_family == AF_INET)
     ((struct sockaddr_in *) addr)->sin_port = htons (2086);
@@ -121,14 +147,18 @@ run (void *cls,
               "Requesting NAT redirection from address %s...\n",
               GNUNET_a2s (addr, data.addrlen));
 
-  nat = GNUNET_NAT_register (cfg, addr, data.addrlen, addr_callback, 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 (GNUNET_TIME_relative_multiply
-                                (GNUNET_TIME_UNIT_SECONDS, TIMEOUT), stop,
-                                nat);
+  GNUNET_SCHEDULER_add_delayed (TIMEOUT, &stop, nat);
 }
 
+
 int
 main (int argc, char *const argv[])
 {
@@ -139,7 +169,7 @@ main (int argc, char *const argv[])
   char *const argv_prog[] = {
     "test-nat",
     "-c",
-    "test-nat.conf",
+    "test_nat_data.conf",
     "-L",
 #if VERBOSE
     "DEBUG",