[GNUnet-SVN] r13492 - in gnunet/src: fs transport

[gnunet]

Author: grothoff
Date: 2010-11-02 15:11:41 +0100 (Tue, 02 Nov 2010)
New Revision: 13492

Modified:
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/transport/transport_api.c
Log:
fix as suggested by mwachs

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-11-02 12:57:11 UTC (rev 13491)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-11-02 14:11:41 UTC (rev 13492)
@@ -41,7 +41,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_YES
+#define DEBUG_FS GNUNET_NO
 
 /**
  * Should we introduce random latency in processing?  Required for proper
@@ -2786,7 +2786,7 @@
   if (delay.rel_value <= cp->avg_delay.rel_value)
     {
 #if DEBUG_FS
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "NOT sending query since we send %u others to this peer in 
the last %llums\n",
                  MAX_QUEUE_PER_PEER,
                  cp->avg_delay.rel_value);

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-11-02 12:57:11 UTC (rev 
13491)
+++ gnunet/src/transport/transport_api.c        2010-11-02 14:11:41 UTC (rev 
13492)
@@ -1900,6 +1900,12 @@
     default:
       GNUNET_break (0);
     }
+  if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
+    {
+      GNUNET_SCHEDULER_cancel (n->h->sched,
+                              th->notify_delay_task);
+      th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
+    }
 }