aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2010-11-02 14:11:41 +0000
committerChristian Grothoff <christian@grothoff.org>2010-11-02 14:11:41 +0000
commit791c63831a8d624c9e0a20ce13a7cb4f81def060 (patch)
treea948bb911a97f7e26068a1973052d8607b96fd80
parente9df6faf32ba8e2a8aea2de9b77155d4be018fd3 (diff)
downloadgnunet-791c63831a8d624c9e0a20ce13a7cb4f81def060.tar.gz
gnunet-791c63831a8d624c9e0a20ce13a7cb4f81def060.zip
fix as suggested by mwachs
-rw-r--r--src/fs/gnunet-service-fs.c4
-rw-r--r--src/transport/transport_api.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index ad770f779..579e1ac50 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -41,7 +41,7 @@
41#include "gnunet-service-fs_indexing.h" 41#include "gnunet-service-fs_indexing.h"
42#include "fs.h" 42#include "fs.h"
43 43
44#define DEBUG_FS GNUNET_YES 44#define DEBUG_FS GNUNET_NO
45 45
46/** 46/**
47 * Should we introduce random latency in processing? Required for proper 47 * Should we introduce random latency in processing? Required for proper
@@ -2786,7 +2786,7 @@ target_peer_select_cb (void *cls,
2786 if (delay.rel_value <= cp->avg_delay.rel_value) 2786 if (delay.rel_value <= cp->avg_delay.rel_value)
2787 { 2787 {
2788#if DEBUG_FS 2788#if DEBUG_FS
2789 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, 2789 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
2790 "NOT sending query since we send %u others to this peer in the last %llums\n", 2790 "NOT sending query since we send %u others to this peer in the last %llums\n",
2791 MAX_QUEUE_PER_PEER, 2791 MAX_QUEUE_PER_PEER,
2792 cp->avg_delay.rel_value); 2792 cp->avg_delay.rel_value);
diff --git a/src/transport/transport_api.c b/src/transport/transport_api.c
index 5410aca8a..c0f32f93d 100644
--- a/src/transport/transport_api.c
+++ b/src/transport/transport_api.c
@@ -1900,6 +1900,12 @@ GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct
1900 default: 1900 default:
1901 GNUNET_break (0); 1901 GNUNET_break (0);
1902 } 1902 }
1903 if (th->notify_delay_task != GNUNET_SCHEDULER_NO_TASK)
1904 {
1905 GNUNET_SCHEDULER_cancel (n->h->sched,
1906 th->notify_delay_task);
1907 th->notify_delay_task = GNUNET_SCHEDULER_NO_TASK;
1908 }
1903} 1909}
1904 1910
1905 1911