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

[gnunet]

Author: grothoff
Date: 2010-03-11 14:17:13 +0100 (Thu, 11 Mar 2010)
New Revision: 10547

Modified:
   gnunet/src/fs/fs.h
   gnunet/src/fs/fs_download.c
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/fs_unindex.c
   gnunet/src/fs/gnunet-search.c
Log:
fix

Modified: gnunet/src/fs/fs.h
===================================================================
--- gnunet/src/fs/fs.h  2010-03-11 12:47:52 UTC (rev 10546)
+++ gnunet/src/fs/fs.h  2010-03-11 13:17:13 UTC (rev 10547)
@@ -1059,7 +1059,7 @@
 
   /**
    * At which offset should we be able to find
-   * this on-demand encoded block?
+   * this on-demand encoded block? (in NBO)
    */
   uint64_t offset GNUNET_PACKED;
 

Modified: gnunet/src/fs/fs_download.c
===================================================================
--- gnunet/src/fs/fs_download.c 2010-03-11 12:47:52 UTC (rev 10546)
+++ gnunet/src/fs/fs_download.c 2010-03-11 13:17:13 UTC (rev 10547)
@@ -36,7 +36,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

Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2010-03-11 12:47:52 UTC (rev 10546)
+++ gnunet/src/fs/fs_publish.c  2010-03-11 13:17:13 UTC (rev 10547)
@@ -497,7 +497,7 @@
                  (unsigned long long) offset,
                  sizeof (struct OnDemandBlock));
 #endif
-      odb.offset = offset;
+      odb.offset = GNUNET_htonll (offset);
       odb.file_id = p->data.file.file_id;
       GNUNET_DATASTORE_put (sc->dsh,
                            sc->rid,

Modified: gnunet/src/fs/fs_unindex.c
===================================================================
--- gnunet/src/fs/fs_unindex.c  2010-03-11 12:47:52 UTC (rev 10546)
+++ gnunet/src/fs/fs_unindex.c  2010-03-11 13:17:13 UTC (rev 10547)
@@ -215,7 +215,7 @@
   else /* on-demand encoded DBLOCK */
     {
       size = sizeof(struct OnDemandBlock);
-      odb.offset = offset;
+      odb.offset = GNUNET_htonll (offset);
       odb.file_id = uc->file_id;
       data = &odb;
     }

Modified: gnunet/src/fs/gnunet-search.c
===================================================================
--- gnunet/src/fs/gnunet-search.c       2010-03-11 12:47:52 UTC (rev 10546)
+++ gnunet/src/fs/gnunet-search.c       2010-03-11 13:17:13 UTC (rev 10547)
@@ -125,6 +125,9 @@
       break;
     case GNUNET_FS_STATUS_SEARCH_UPDATE:
       break;
+    case GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED:
+      /* ignore */
+      break;
     case GNUNET_FS_STATUS_SEARCH_ERROR:
       fprintf (stderr,
               _("Error searching: %s.\n"),