From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 4 Oct 2009 14:43:59 +0000 (+0000)
Subject: bugfix
X-Git-Tag: initial-import-from-subversion-38251~23389
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f11e234ffe79c17aa80894973828792d393fcc1;p=oweals%2Fgnunet.git

bugfix
---

diff --git a/src/transport/test_plugin_transport.c b/src/transport/test_plugin_transport.c
index 7891c24d0..60a33c65a 100644
--- a/src/transport/test_plugin_transport.c
+++ b/src/transport/test_plugin_transport.c
@@ -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?
diff --git a/src/transport/test_transport_api.c b/src/transport/test_transport_api.c
index 881c75019..57ab52e4b 100644
--- a/src/transport/test_transport_api.c
+++ b/src/transport/test_transport_api.c
@@ -31,7 +31,9 @@
 #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 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 #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);
diff --git a/src/transport/test_transport_api_peer1.conf b/src/transport/test_transport_api_peer1.conf
index 606ab8224..da79a4e66 100644
--- a/src/transport/test_transport_api_peer1.conf
+++ b/src/transport/test_transport_api_peer1.conf
@@ -9,7 +9,7 @@ HOSTNAME = localhost
 [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
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 8d08f82d9..71dbc390f 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1150,9 +1150,6 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
   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 @@ reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
           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;
         }