[GNUnet-SVN] r10932 - in gnunet: contrib src/fs

[gnunet]

Author: grothoff
Date: 2010-04-16 13:58:00 +0200 (Fri, 16 Apr 2010)
New Revision: 10932

Modified:
   gnunet/contrib/defaults.conf
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/fs_tree.c
Log:
fs fix

Modified: gnunet/contrib/defaults.conf
===================================================================
--- gnunet/contrib/defaults.conf        2010-04-16 10:29:15 UTC (rev 10931)
+++ gnunet/contrib/defaults.conf        2010-04-16 11:58:00 UTC (rev 10932)
@@ -163,6 +163,7 @@
 HTTPPORT = 8080
 HOSTNAME = localhost
 HOME = $SERVICEHOME
+HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
 CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-daemon-hostlist
 # consider having "-e" as default as well once implemented

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2010-04-16 10:29:15 UTC (rev 10931)
+++ gnunet/src/fs/fs_download.c 2010-04-16 11:58:00 UTC (rev 10932)
@@ -38,7 +38,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_DOWNLOAD GNUNET_YES
+#define DEBUG_DOWNLOAD GNUNET_NO
 
 /**
  * We're storing the IBLOCKS after the DBLOCKS on disk (so that we

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-04-16 10:29:15 UTC (rev 10931)
+++ gnunet/src/fs/fs_publish.c  2010-04-16 11:58:00 UTC (rev 10932)
@@ -40,7 +40,7 @@
 #include "fs.h"
 #include "fs_tree.h"
 
-#define DEBUG_PUBLISH GNUNET_YES
+#define DEBUG_PUBLISH GNUNET_NO
 
 /**
  * Main function that performs the upload.
@@ -129,6 +129,8 @@
   GNUNET_free_non_null (sc->nid);  
   GNUNET_free_non_null (sc->nuid);
   GNUNET_DATASTORE_disconnect (sc->dsh, GNUNET_NO);
+  if (sc->client != NULL)
+    GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
   GNUNET_free (sc);
 }
 

Modified: gnunet/src/fs/fs_tree.c
===================================================================
--- gnunet/src/fs/fs_tree.c     2010-04-16 10:29:15 UTC (rev 10931)
+++ gnunet/src/fs/fs_tree.c     2010-04-16 11:58:00 UTC (rev 10932)
@@ -31,7 +31,7 @@
 #include "platform.h"
 #include "fs_tree.h"
 
-#define DEBUG_TREE GNUNET_YES
+#define DEBUG_TREE GNUNET_NO
 
 /**
  * Context for an ECRS-based file encoder that computes
@@ -251,6 +251,8 @@
                                  corresponds to */
   for (i=0;i<height;i++)
     bds *= CHK_PER_INODE;
+  if (height > 0)
+    offset--; /* round down since for height > 0 offset is at the END of the 
block */
   ret = offset / bds;
   return ret % CHK_PER_INODE; 
 }