From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 27 Feb 2010 10:52:09 +0000 (+0000)
Subject: fixes
X-Git-Tag: initial-import-from-subversion-38251~22599
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=938a31dcf378460d4684a708e6d42bc32095dcee;p=oweals%2Fgnunet.git

fixes
---

diff --git a/src/fs/fs_test_lib_data.conf b/src/fs/fs_test_lib_data.conf
index d62ee8c98..23cb948c4 100644
--- a/src/fs/fs_test_lib_data.conf
+++ b/src/fs/fs_test_lib_data.conf
@@ -12,7 +12,7 @@ HOSTNAME = localhost
 [transport]
 PORT = 43465
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 43466
@@ -40,7 +40,7 @@ PORT = 43470
 HOSTNAME = localhost
 #TOTAL_QUOTA_IN = 3932160
 #TOTAL_QUOTA_OUT = 3932160
-DEBUG = YES
+#DEBUG = YES
 
 [fs]
 PORT = 43471
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index 6fa18a4c3..07852b4ba 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -618,7 +618,6 @@ destroy_pending_message (struct PendingMessage *pm,
 }
 
 
-
 /**
  * We're done processing a particular request.
  * Free all associated resources.
@@ -1258,7 +1257,7 @@ target_reservation_cb (void *cls,
     {
       if (pr->cp == NULL)
 	{
-#if DEBUG_FS
+#if DEBUG_FS > 1
 	  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		      "Failed to reserve bandwidth for reply (got %d/%u bytes only)!\n",
 		      amount,
@@ -1712,7 +1711,10 @@ process_reply (void *cls,
 	destroy_pending_message_list_entry (pr->pending_head);
       if (pr->drq != NULL)
 	{
-	  GNUNET_FS_drq_get_cancel (pr->drq);
+	  if (pr->client_request_list != NULL)
+	    GNUNET_SERVER_receive_done (pr->client_request_list->client_list->client, 
+					GNUNET_YES);
+ 	  GNUNET_FS_drq_get_cancel (pr->drq);
 	  pr->drq = NULL;
 	}
       do_remove = GNUNET_YES;
@@ -2048,7 +2050,7 @@ process_local_reply (void *cls,
 	   (pr->results_found > 5 + 2 * pr->priority) ) ) ||
        (type == GNUNET_DATASTORE_BLOCKTYPE_DBLOCK) ) 
     {
-#if DEBUG_FS
+#if DEBUG_FS > 2
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
 		  "Unique reply found or load too high, done with request\n");
 #endif
@@ -2433,7 +2435,7 @@ handle_start_search (void *cls,
   uint16_t msize;
   unsigned int sc;
   uint32_t type;
-  
+
   msize = ntohs (message->size);
   if ( (msize < sizeof (struct SearchMessage)) ||
        (0 != (msize - sizeof (struct SearchMessage)) % sizeof (GNUNET_HashCode)) )
diff --git a/src/fs/test_fs_download_data.conf b/src/fs/test_fs_download_data.conf
index d61eaca37..6c14de879 100644
--- a/src/fs/test_fs_download_data.conf
+++ b/src/fs/test_fs_download_data.conf
@@ -19,7 +19,7 @@ HOSTNAME = localhost
 DEFAULTSERVICES = resolver datastore transport core fs
 
 [datastore]
-#DEBUG = YES
+DEBUG = YES
 
 [statistics]
 PORT = 42467