fix

diff --git a/src/fs/fs.h b/src/fs/fs.h
index 1997d353c5c6c9ec1fca5bd131ec3180280c732f..67bb6f4dd32d690ed887fbc89a5310595d558b9f 100644 (file)
--- a/src/fs/fs.h
+++ b/src/fs/fs.h
@@ -1059,7 +1059,7 @@ struct OnDemandBlock
 
   /**
    * 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;
 

diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 1cd10f83007b556eee589e59c47463607fe28ae2..7776f4b8bf8cd9cfa6873294bff5f527423c2b83 100644 (file)
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -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

diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index b437fcf80024f37301566806f9b73e72a7a380d5..cf249c04b7b7c3ba890af9740bb89fe0802a2df2 100644 (file)
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -497,7 +497,7 @@ block_proc (void *cls,
                  (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,

diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index 7ce8b3f18c23724db7e277ce9ab4d7c63380cffd..fc4012464fcbcc490be806c8060b46fc20749d6b 100644 (file)
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -215,7 +215,7 @@ unindex_process (void *cls,
   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;
     }

diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 6bb599455259e8babc1bd57595c8aac2b29f2748..4249817cff802dbf456815b5fc973dfe53a80bd2 100644 (file)
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -125,6 +125,9 @@ progress_cb (void *cls,
       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"),