[GNUnet-SVN] r9498 - gnunet/src/transport

[gnunet]

Author: grothoff
Date: 2009-11-13 13:27:21 -0700 (Fri, 13 Nov 2009)
New Revision: 9498

Modified:
   gnunet/src/transport/transport_api.c
Log:
fix

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2009-11-13 20:26:47 UTC (rev 
9497)
+++ gnunet/src/transport/transport_api.c        2009-11-13 20:27:21 UTC (rev 
9498)
@@ -617,6 +617,12 @@
 {
   struct GNUNET_TRANSPORT_TransmitHandle *th;
 
+#if DEBUG_TRANSPORT
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Control transmit of %u bytes within %llums requested\n", 
+             size,
+             (unsigned long long) timeout.value);
+#endif
   th = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_TransmitHandle));
   th->handle = h;
   th->notify = notify;
@@ -996,8 +1002,9 @@
     }
 #if DEBUG_TRANSPORT
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Transmitting `%s' message for `%4s'.\n",
-              "TRY_CONNECT", GNUNET_i2s (&th->target));
+              "Transmitting `%s' message for `%4s' (need connection in %llu 
ms).\n",
+              "TRY_CONNECT", GNUNET_i2s (&th->target),
+             GNUNET_TIME_absolute_get_remaining (th->timeout).value);
 #endif
   GNUNET_assert (size >= sizeof (struct TryConnectMessage));
   tcm = buf;
@@ -1101,6 +1108,9 @@
       if (GNUNET_TIME_absolute_get_remaining (th->timeout).value <= 
CONNECT_RETRY_TIMEOUT.value)
        {
          /* signal error */
+         GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                     _("Connection with `%4s' failed and timeout was in the 
past, giving up on message delivery.\n"),
+                     GNUNET_i2s (peer));
          GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == th->notify_delay_task);
          peer_transmit_timeout (th, NULL);       
        }
@@ -1919,7 +1929,7 @@
 #endif
   th->notify_delay_task
     = GNUNET_SCHEDULER_add_now (handle->sched,
-                               &peer_transmit_timeout, th);
+                               &transmit_ready, th);
   return th;
 }