From 79a331635df4add87d69103a9cf8dbe8e28ce58a Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 11 Mar 2010 13:17:13 +0000 Subject: [PATCH] fix --- src/fs/fs.h | 2 +- src/fs/fs_download.c | 2 +- src/fs/fs_publish.c | 2 +- src/fs/fs_unindex.c | 2 +- src/fs/gnunet-search.c | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/fs/fs.h b/src/fs/fs.h index 1997d353c..67bb6f4dd 100644 --- 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 1cd10f830..7776f4b8b 100644 --- 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 b437fcf80..cf249c04b 100644 --- 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 7ce8b3f18..fc4012464 100644 --- 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 6bb599455..4249817cf 100644 --- 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"), -- 2.25.1