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

[gnunet]

Author: grothoff
Date: 2010-04-15 16:40:14 +0200 (Thu, 15 Apr 2010)
New Revision: 10917

Modified:
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/fs_tree.c
   gnunet/src/fs/gnunet-service-fs.c
Log:
fix ttl underflow check

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2010-04-15 14:17:52 UTC (rev 10916)
+++ gnunet/src/fs/fs_download.c 2010-04-15 14:40:14 UTC (rev 10917)
@@ -38,7 +38,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_DOWNLOAD GNUNET_NO
+#define DEBUG_DOWNLOAD GNUNET_YES
 
 /**
  * We're storing the IBLOCKS after the DBLOCKS on disk (so that we
@@ -175,8 +175,7 @@
 
 
 /**
- * Schedule the download of the specified
- * block in the tree.
+ * Schedule the download of the specified block in the tree.
  *
  * @param dc overall download this block belongs to
  * @param chk content-hash-key of the block

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-04-15 14:17:52 UTC (rev 10916)
+++ gnunet/src/fs/fs_publish.c  2010-04-15 14:40:14 UTC (rev 10917)
@@ -40,7 +40,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_PUBLISH GNUNET_NO
+#define DEBUG_PUBLISH GNUNET_YES
 
 /**
  * Main function that performs the upload.
@@ -1080,8 +1080,6 @@
 {
   if (GNUNET_SCHEDULER_NO_TASK != sc->upload_task)
     GNUNET_SCHEDULER_cancel (sc->h->sched, sc->upload_task);
-  else
-    GNUNET_assert (sc->all_done == GNUNET_YES);
   // FIXME: remove from persistence DB (?) --- think more about
   //        shutdown / persistent-resume APIs!!!
   GNUNET_FS_file_information_inspect (sc->fi,

Modified: gnunet/src/fs/fs_tree.c
===================================================================
--- gnunet/src/fs/fs_tree.c     2010-04-15 14:17:52 UTC (rev 10916)
+++ gnunet/src/fs/fs_tree.c     2010-04-15 14:40:14 UTC (rev 10917)
@@ -31,7 +31,7 @@
 #include "platform.h"
 #include "fs_tree.h"
 
-#define DEBUG_TREE GNUNET_NO
+#define DEBUG_TREE GNUNET_YES
 
 /**
  * Context for an ECRS-based file encoder that computes
@@ -257,9 +257,8 @@
 
 
 /**
- * Encrypt the next block of the file (and 
- * call proc and progress accordingly; or 
- * of course "cont" if we have already completed
+ * Encrypt the next block of the file (and call proc and progress
+ * accordingly; or of course "cont" if we have already completed
  * encoding of the entire file).
  *
  * @param te tree encoder to use

Modified: gnunet/src/fs/gnunet-service-fs.c
===================================================================
--- gnunet/src/fs/gnunet-service-fs.c   2010-04-15 14:17:52 UTC (rev 10916)
+++ gnunet/src/fs/gnunet-service-fs.c   2010-04-15 14:40:14 UTC (rev 10917)
@@ -48,7 +48,7 @@
 #include "gnunet-service-fs_indexing.h"
 #include "fs.h"
 
-#define DEBUG_FS GNUNET_NO
+#define DEBUG_FS GNUNET_YES
 
 /**
  * Maximum number of outgoing messages we queue per peer.
@@ -2689,7 +2689,7 @@
     GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
                              TTL_DECREMENT);
   if ( (pr->ttl < 0) &&
-       (pr->ttl - ttl_decrement > 0) )
+       (((int32_t)(pr->ttl - ttl_decrement)) > 0) )
     {
 #if DEBUG_FS
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2967,7 +2967,7 @@
                                &pr->mingle,
                                &pr->bf_size,
                                pr->replies_seen);
- pr->query = sm->query;
+  pr->query = sm->query;
   switch (type)
     {
     case GNUNET_DATASTORE_BLOCKTYPE_DBLOCK: