[GNUnet-SVN] r8688 - in gnunet: . src/transport

[gnunet]

Author: grothoff
Date: 2009-07-14 12:27:42 -0600 (Tue, 14 Jul 2009)
New Revision: 8688

Modified:
   gnunet/TODO
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/test_transport_api.c
   gnunet/src/transport/test_transport_api_peer1.conf
   gnunet/src/transport/test_transport_api_peer2.conf
   gnunet/src/transport/transport.h
   gnunet/src/transport/transport_api.c
Log:
fix

Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2009-07-14 18:07:58 UTC (rev 8687)
+++ gnunet/TODO 2009-07-14 18:27:42 UTC (rev 8688)
@@ -1,18 +1,5 @@
 PHASE #1: (Goal: settle key design questions)
 
-TRANSPORT:
-* testcase fails the first time when run with fresh /tmp
-  1) CONNECT fails because no validated HELLO is available
-     (actual validations are scheduled a few cycles later)
-  2) client waits for SEND_OK, which never comes (due to
-     CONNECT request failing; TCP signals error, but
-     "transmit_send_continuation" in gnunet-service-transport.c
-     does not (and currently has no way to) signal this to
-     the test-process => test-process eventually times out with
-     fatal error
-  3) in the meantime, gnunet-service-transport validates the
-     HELLOs => testcase passes next time...
-
 Util:
 * improve disk API [Nils] (Nils, is this done? -Christian)
 * Windows: use events instead of pipes to signal select()s [Nils]

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2009-07-14 18:07:58 UTC 
(rev 8687)
+++ gnunet/src/transport/gnunet-service-transport.c     2009-07-14 18:27:42 UTC 
(rev 8688)
@@ -2183,7 +2183,8 @@
     {
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Sending our own HELLO to new client\n");
+                  "Sending our own `%s' to new client\n",
+                 "HELLO");
 #endif
       transmit_to_client (c,
                           (const struct GNUNET_MessageHeader *) our_hello,

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2009-07-14 18:07:58 UTC (rev 
8687)
+++ gnunet/src/transport/test_transport_api.c   2009-07-14 18:27:42 UTC (rev 
8688)
@@ -31,7 +31,7 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 #define START_ARM GNUNET_YES
 

Modified: gnunet/src/transport/test_transport_api_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_peer1.conf  2009-07-14 18:07:58 UTC 
(rev 8687)
+++ gnunet/src/transport/test_transport_api_peer1.conf  2009-07-14 18:27:42 UTC 
(rev 8688)
@@ -8,7 +8,7 @@
 [transport]
 PORT = 12365
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 12366

Modified: gnunet/src/transport/test_transport_api_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_peer2.conf  2009-07-14 18:07:58 UTC 
(rev 8687)
+++ gnunet/src/transport/test_transport_api_peer2.conf  2009-07-14 18:27:42 UTC 
(rev 8688)
@@ -8,7 +8,7 @@
 [transport]
 PORT = 22365
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 22366

Modified: gnunet/src/transport/transport.h
===================================================================
--- gnunet/src/transport/transport.h    2009-07-14 18:07:58 UTC (rev 8687)
+++ gnunet/src/transport/transport.h    2009-07-14 18:27:42 UTC (rev 8688)
@@ -27,7 +27,7 @@
 #include "gnunet_time_lib.h"
 #include "gnunet_transport_service.h"
 
-#define DEBUG_TRANSPORT GNUNET_YES
+#define DEBUG_TRANSPORT GNUNET_NO
 
 /**
  * For how long do we allow unused bandwidth

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2009-07-14 18:07:58 UTC (rev 
8687)
+++ gnunet/src/transport/transport_api.c        2009-07-14 18:27:42 UTC (rev 
8688)
@@ -80,7 +80,6 @@
    */
   struct GNUNET_TRANSPORT_TransmitHandle *transmit_handle;
 
-
   /**
    * Identity of this neighbour.
    */
@@ -1034,13 +1033,7 @@
 {
   struct GNUNET_TRANSPORT_TransmitHandle *th = cls;  
 
-  th->notify_delay_task
-    = GNUNET_SCHEDULER_add_delayed (th->handle->sched,
-                                   GNUNET_NO,
-                                   GNUNET_SCHEDULER_PRIORITY_KEEP,
-                                   GNUNET_SCHEDULER_NO_PREREQUISITE_TASK,
-                                   GNUNET_TIME_absolute_get_remaining
-                                   (th->timeout), &transmit_timeout, th);
+  th->notify_delay_task = GNUNET_SCHEDULER_NO_PREREQUISITE_TASK;
   try_connect (th);
 }
 
@@ -1085,18 +1078,16 @@
       pos->transmit_handle = NULL;
       th->neighbour = NULL;
       remove_from_any_list (th);
-      if (GNUNET_TIME_absolute_get_remaining (th->timeout).value > 
CONNECT_RETRY_TIMEOUT.value)
+      if (GNUNET_TIME_absolute_get_remaining (th->timeout).value <= 
CONNECT_RETRY_TIMEOUT.value)
        {
          /* signal error */
-         GNUNET_SCHEDULER_cancel (h->sched,
-                                  th->notify_delay_task);
+         GNUNET_assert (GNUNET_SCHEDULER_NO_PREREQUISITE_TASK == 
th->notify_delay_task);
          transmit_timeout (th, NULL);    
        }
       else
        {
          /* try again in a bit */
-         GNUNET_SCHEDULER_cancel (h->sched,
-                                  th->notify_delay_task);
+         GNUNET_assert (GNUNET_SCHEDULER_NO_PREREQUISITE_TASK == 
th->notify_delay_task);
          th->notify_delay_task 
            = GNUNET_SCHEDULER_add_delayed (h->sched,
                                            GNUNET_NO,
@@ -1665,8 +1656,6 @@
                   "Receiving `%s' message, transmission %s.\n", "SEND_OK",
                  ntohl(okm->success) == GNUNET_OK ? "succeeded" : "failed");
 #endif
-      /* FIXME: need to check status code and change action accordingly,
-        especially if the error was for CONNECT */
       n = find_neighbour (h, &okm->peer);
       GNUNET_assert (n != NULL);
       n->transmit_ok = GNUNET_YES;
@@ -1674,7 +1663,8 @@
         {
 #if DEBUG_TRANSPORT
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                      "Processing pending message\n");
+                      "Processing pending message for `%4s'\n",
+                     GNUNET_i2s(&n->id));
 #endif
           GNUNET_SCHEDULER_cancel (h->sched,
                                    n->transmit_handle->notify_delay_task);