- verboser log, faster start

[oweals/gnunet.git] / src / transport / gnunet-transport.c

diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index ecb26ca898485184c72ff3cb71c8151805e93baa..8dd7bdaf060d7b152a08d094275e17dd56c28420 100644 (file)
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -39,9 +39,9 @@
  * How long do we wait for the NAT test to report success?
  * Should match NAT_SERVER_TIMEOUT in 'nat_test.c'.
  */
-#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
-#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 10)
-#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 5)
+#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60)
+#define RESOLUTION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
+#define OP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
 /**
  * Benchmarking block size in KB
@@ -59,6 +59,10 @@ static char *cpid;
  */
 static struct GNUNET_TRANSPORT_Handle *handle;
 
+/**
+ * Configuration handle
+ */
+static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 /**
  * Try_connect handle
@@ -273,12 +277,25 @@ shutdown_task (void *cls,
   }
 }
 
+struct ResolutionContext *rc_head;
+struct ResolutionContext *rc_tail;
+
+struct ResolutionContext
+{
+       struct ResolutionContext *next;
+       struct ResolutionContext *prev;
+  struct GNUNET_HELLO_Address *addrcp;
+  struct GNUNET_TRANSPORT_AddressToStringContext *asc;
+  int printed;
+};
 
 
 static void
 operation_timeout (void *cls,
                const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
+       struct ResolutionContext *cur;
+       struct ResolutionContext *next;
   op_timeout = GNUNET_SCHEDULER_NO_TASK;
   if ((try_connect) || (benchmark_send) ||
                (benchmark_receive))
@@ -292,7 +309,20 @@ operation_timeout (void *cls,
   }
   if (iterate_connections)
   {
-      FPRINTF (stdout, _("Failed to list connections, timeout occured\n"));
+               next = rc_head;
+               while (NULL != (cur = next))
+               {
+                               next = cur->next;
+                               FPRINTF (stdout, _("Failed to resolve address for peer `%s'\n"),
+                                               GNUNET_i2s (&cur->addrcp->peer));
+
+                               GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, cur);
+                               GNUNET_TRANSPORT_address_to_string_cancel (cur->asc);
+                               GNUNET_free (cur->addrcp);
+                               GNUNET_free (cur);
+
+               }
+               FPRINTF (stdout, "%s", _("Failed to list connections, timeout occured\n"));
       if (GNUNET_SCHEDULER_NO_TASK != end)
         GNUNET_SCHEDULER_cancel (end);
       end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
@@ -641,12 +671,9 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
   }
 }
 
-struct ResolutionContext
-{
-  struct GNUNET_HELLO_Address *addrcp;
 
-  int printed;
-};
+static void resolve_address (const struct GNUNET_HELLO_Address *address,
+                                                                                                                int numeric);
 
 
 static void
@@ -666,8 +693,16 @@ process_string (void *cls, const char *address)
     GNUNET_assert (address_resolutions > 0);
     address_resolutions --;
     if (GNUNET_NO == rc->printed)
-      FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name);
+    {
+       if (numeric == GNUNET_NO)
+       {
+               resolve_address (rc->addrcp, GNUNET_YES ); /* Failed to resolve address, try numeric lookup */
+       }
+       else
+       FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name);
+    }
     GNUNET_free (rc->addrcp);
+    GNUNET_CONTAINER_DLL_remove (rc_head, rc_tail, rc);
     GNUNET_free (rc);
     if ((0 == address_resolutions) && (iterate_connections))
     {
@@ -687,6 +722,24 @@ process_string (void *cls, const char *address)
   }
 }
 
+static void resolve_address (const struct GNUNET_HELLO_Address *address,
+                                                                                                                int numeric)
+{
+  struct ResolutionContext *rc;
+
+  rc = GNUNET_malloc(sizeof (struct ResolutionContext));
+  GNUNET_assert (NULL != rc);
+  GNUNET_CONTAINER_DLL_insert (rc_head, rc_tail, rc);
+  address_resolutions ++;
+
+  rc->addrcp = GNUNET_HELLO_address_copy(address);
+  rc->printed = GNUNET_NO;
+  /* Resolve address to string */
+  rc->asc = GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
+                                      RESOLUTION_TIMEOUT, &process_string,
+                                      rc);
+}
+
 /**
  * Function to call with a binary address
  *
@@ -698,14 +751,14 @@ static void
 process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
                  const struct GNUNET_HELLO_Address *address)
 {
-  const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
-  struct ResolutionContext *rc;
-
   if (peer == NULL)
   {
     /* done */
     address_resolution_in_progress = GNUNET_NO;
     pic = NULL;
+    if (GNUNET_SCHEDULER_NO_TASK != end)
+      GNUNET_SCHEDULER_cancel (end);
+    end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL);
     return;
   }
   if (address == NULL)
@@ -719,16 +772,9 @@ process_address (void *cls, const struct GNUNET_PeerIdentity *peer,
   op_timeout = GNUNET_SCHEDULER_add_delayed (OP_TIMEOUT,
                                              &operation_timeout, NULL);
 
-  rc = GNUNET_malloc(sizeof (struct ResolutionContext));
-  rc->addrcp = GNUNET_HELLO_address_copy(address);
-  rc->printed = GNUNET_NO;
-
-  GNUNET_assert (NULL != rc);
-  address_resolutions ++;
-  /* Resolve address to string */
-  GNUNET_TRANSPORT_address_to_string (cfg, address, numeric,
-                                      RESOLUTION_TIMEOUT, &process_string,
-                                      rc);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received address for peer `%s': %s\n",
+               GNUNET_i2s (peer), address->transport_name);
+  resolve_address (address, numeric);
 }
 
 void try_connect_cb (void *cls,
@@ -759,7 +805,6 @@ static void
 testservice_task (void *cls,
                   const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
-  struct GNUNET_CONFIGURATION_Handle *cfg = cls;
   int counter = 0;
   ret = 1;
 
@@ -926,9 +971,10 @@ testservice_task (void *cls,
  */
 static void
 run (void *cls, char *const *args, const char *cfgfile,
-     const struct GNUNET_CONFIGURATION_Handle *cfg)
+     const struct GNUNET_CONFIGURATION_Handle *mycfg)
 {
-  if (test_configuration)
+       cfg = (struct GNUNET_CONFIGURATION_Handle *) mycfg;
+       if (test_configuration)
   {
     do_test_configuration (cfg);
     return;