[GNUnet-SVN] r10386 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2010-02-20 15:44:23 +0100 (Sat, 20 Feb 2010)
New Revision: 10386

Modified:
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/test_fs_lib_data.conf
Log:
fix

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-02-20 09:02:03 UTC (rev 10385)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-02-20 14:44:23 UTC (rev 10386)
@@ -1665,6 +1665,11 @@
       /* 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_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;

Modified: gnunet/src/fs/test_fs_lib_data.conf
===================================================================
--- gnunet/src/fs/test_fs_lib_data.conf 2010-02-20 09:02:03 UTC (rev 10385)
+++ gnunet/src/fs/test_fs_lib_data.conf 2010-02-20 14:44:23 UTC (rev 10386)
@@ -44,8 +44,9 @@
 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