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

[gnunet]

Author: grothoff
Date: 2010-02-27 11:52:09 +0100 (Sat, 27 Feb 2010)
New Revision: 10453

Modified:
   gnunet/src/fs/fs_test_lib_data.conf
   gnunet/src/fs/gnunet-service-fs.c
   gnunet/src/fs/test_fs_download_data.conf
Log:
fixes

Modified: gnunet/src/fs/fs_test_lib_data.conf
===================================================================
--- gnunet/src/fs/fs_test_lib_data.conf 2010-02-26 13:05:09 UTC (rev 10452)
+++ gnunet/src/fs/fs_test_lib_data.conf 2010-02-27 10:52:09 UTC (rev 10453)
@@ -12,7 +12,7 @@
 [transport]
 PORT = 43465
 PLUGINS = tcp
-DEBUG = YES
+#DEBUG = YES
 
 [arm]
 PORT = 43466
@@ -40,7 +40,7 @@
 HOSTNAME = localhost
 #TOTAL_QUOTA_IN = 3932160
 #TOTAL_QUOTA_OUT = 3932160
-DEBUG = YES
+#DEBUG = YES
 
 [fs]
 PORT = 43471

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-02-26 13:05:09 UTC (rev 10452)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-02-27 10:52:09 UTC (rev 10453)
@@ -618,7 +618,6 @@
 }
 
 
-
 /**
  * We're done processing a particular request.
  * Free all associated resources.
@@ -1258,7 +1257,7 @@
     {
       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 @@
        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 @@
           (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 @@
   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)) )

Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf    2010-02-26 13:05:09 UTC (rev 
10452)
+++ gnunet/src/fs/test_fs_download_data.conf    2010-02-27 10:52:09 UTC (rev 
10453)
@@ -19,7 +19,7 @@
 DEFAULTSERVICES = resolver datastore transport core fs
 
 [datastore]
-#DEBUG = YES
+DEBUG = YES
 
 [statistics]
 PORT = 42467