From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 20 Feb 2010 14:44:23 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~22653
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8d12570d50b9d9181cdf7ef5b84696597227dcb1;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index da7d6fb0a..b76542767 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -1665,6 +1665,11 @@ process_reply (void *cls,
       /* only possible reply, stop requesting! */
       while (NULL != pr->pending_head)
 	destroy_pending_message_list_entry (pr->pending_head);
+      if (pr->drq != NULL)
+	{
+	  GNUNET_FS_drq_get_cancel (pr->drq);
+	  pr->drq = NULL;
+	}
       GNUNET_break (GNUNET_YES ==
 		    GNUNET_CONTAINER_multihashmap_remove (query_request_map,
 							  key,
@@ -1985,7 +1990,8 @@ process_local_reply (void *cls,
   process_reply (&prq, key, pr);
   
   if ( (GNUNET_YES == test_load_too_high()) ||
-       (pr->results_found > 5 + 2 * pr->priority) )
+       (pr->results_found > 5 + 2 * pr->priority) ||
+       (type == GNUNET_DATASTORE_BLOCKTYPE_DBLOCK) )
     {
       GNUNET_FS_drq_get_next (GNUNET_NO);
       return;
diff --git a/src/fs/test_fs_lib_data.conf b/src/fs/test_fs_lib_data.conf
index 43fea398e..693342be0 100644
--- a/src/fs/test_fs_lib_data.conf
+++ b/src/fs/test_fs_lib_data.conf
@@ -44,8 +44,9 @@ HOSTNAME = localhost
 PORT = 43471
 HOSTNAME = localhost
 DEBUG = YES
-PREFIX = valgrind --tool=memcheck --leak-check=yes
+#PREFIX = valgrind --tool=memcheck --leak-check=yes
 #BINARY = /home/grothoff/bin/gnunet-service-fs
+#PREFIX = xterm -e gdb -x cmd --args 
 
 [testing]
 WEAKRANDOM = YES