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

[gnunet]

Author: grothoff
Date: 2009-10-04 08:43:59 -0600 (Sun, 04 Oct 2009)
New Revision: 9107

Modified:
   gnunet/src/transport/test_plugin_transport.c
   gnunet/src/transport/test_transport_api.c
   gnunet/src/transport/test_transport_api_peer1.conf
   gnunet/src/transport/transport_api.c
Log:
bugfix

Modified: gnunet/src/transport/test_plugin_transport.c
===================================================================
--- gnunet/src/transport/test_plugin_transport.c        2009-10-04 14:43:50 UTC 
(rev 9106)
+++ gnunet/src/transport/test_plugin_transport.c        2009-10-04 14:43:59 UTC 
(rev 9107)
@@ -37,7 +37,7 @@
 #include "plugin_transport.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
 /**
  * How long until we give up on transmitting the message?

Modified: gnunet/src/transport/test_transport_api.c
===================================================================
--- gnunet/src/transport/test_transport_api.c   2009-10-04 14:43:50 UTC (rev 
9106)
+++ gnunet/src/transport/test_transport_api.c   2009-10-04 14:43:59 UTC (rev 
9107)
@@ -31,8 +31,10 @@
 #include "gnunet_transport_service.h"
 #include "transport.h"
 
-#define VERBOSE GNUNET_YES
+#define VERBOSE GNUNET_NO
 
+#define VERBOSE_ARM GNUNET_NO
+
 #define START_ARM GNUNET_YES
 
 /**
@@ -149,7 +151,7 @@
 #if START_ARM
   p->arm_pid = GNUNET_OS_start_process ("gnunet-service-arm",
                                         "gnunet-service-arm",
-#if VERBOSE
+#if VERBOSE_ARM
                                         "-L", "DEBUG",
 #endif
                                         "-c", cfgname, NULL);

Modified: gnunet/src/transport/test_transport_api_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_peer1.conf  2009-10-04 14:43:50 UTC 
(rev 9106)
+++ gnunet/src/transport/test_transport_api_peer1.conf  2009-10-04 14:43:59 UTC 
(rev 9107)
@@ -9,7 +9,7 @@
 [transport]
 PORT = 12365
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 #PREFIX = xterm -T t1 -e gdb -x cmd --args
 #BINARY = /home/grothoff/bin/gnunet-service-transport
 #PREFIX = valgrind --tool=memcheck

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2009-10-04 14:43:50 UTC (rev 
9106)
+++ gnunet/src/transport/transport_api.c        2009-10-04 14:43:59 UTC (rev 
9107)
@@ -1150,9 +1150,6 @@
   struct GNUNET_TRANSPORT_TransmitHandle *pos;
   struct NeighbourList *n;
 
-  fprintf (stderr,
-          "Trying to reconnect to transport!\n");
-
   /* Forget about all neighbours that we used to be connected
      to */
   while (NULL != (n = h->neighbours))
@@ -1178,6 +1175,12 @@
           if (pos->next != NULL)
             pos->next->prev = pos->prev;
           GNUNET_assert (pos->neighbour == NULL);
+         if (GNUNET_SCHEDULER_NO_TASK != pos->notify_delay_task)
+           {
+             GNUNET_SCHEDULER_cancel (h->sched,
+                                      pos->notify_delay_task);
+             pos->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+           }
           GNUNET_free (pos);
           break;
         }