diff options
| author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:46:35 +0000 |
| commit | 502af2167f7c218366666ca4944bd7cc54b5b19a (patch) | |
| tree | a91fec5cc9769d260640bd91c6633cb9cf395524 /src/fs/fs_download.c | |
| parent | 03af5a603b7cc53432249d5854cd412aa90dde0d (diff) | |
indentation
Diffstat (limited to 'src/fs/fs_download.c')
| -rw-r--r-- | src/fs/fs_download.c | 2467 |
1 files changed, 1133 insertions, 1334 deletions
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c index e515b147da..6b72b4e56d 100644 --- a/src/fs/fs_download.c +++ b/src/fs/fs_download.c @@ -40,14 +40,15 @@ static int is_recursive_download (struct GNUNET_FS_DownloadContext *dc) { - return (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE)) && - ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (dc->meta)) || - ( (dc->meta == NULL) && - ( (NULL == dc->filename) || - ( (strlen (dc->filename) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && - (NULL != - strstr (dc->filename + strlen(dc->filename) - strlen(GNUNET_FS_DIRECTORY_EXT), - GNUNET_FS_DIRECTORY_EXT)) ) ) ) ); + return (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_RECURSIVE)) && + ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (dc->meta)) || + ((dc->meta == NULL) && + ((NULL == dc->filename) || + ((strlen (dc->filename) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && + (NULL != + strstr (dc->filename + strlen (dc->filename) - + strlen (GNUNET_FS_DIRECTORY_EXT), + GNUNET_FS_DIRECTORY_EXT)))))); } @@ -68,31 +69,31 @@ is_recursive_download (struct GNUNET_FS_DownloadContext *dc) * with the range for any other block */ static uint64_t -compute_disk_offset (uint64_t fsize, - uint64_t off, - unsigned int depth) +compute_disk_offset (uint64_t fsize, uint64_t off, unsigned int depth) { unsigned int i; - uint64_t lsize; /* what is the size of all IBlocks for depth "i"? */ - uint64_t loff; /* where do IBlocks for depth "i" start? */ - unsigned int ioff; /* which IBlock corresponds to "off" at depth "i"? */ - + uint64_t lsize; /* what is the size of all IBlocks for depth "i"? */ + uint64_t loff; /* where do IBlocks for depth "i" start? */ + unsigned int ioff; /* which IBlock corresponds to "off" at depth "i"? */ + if (depth == 0) return off; /* first IBlocks start at the end of file, rounded up - to full DBLOCK_SIZE */ + * to full DBLOCK_SIZE */ loff = ((fsize + DBLOCK_SIZE - 1) / DBLOCK_SIZE) * DBLOCK_SIZE; - lsize = ( (fsize + DBLOCK_SIZE - 1) / DBLOCK_SIZE) * sizeof (struct ContentHashKey); + lsize = + ((fsize + DBLOCK_SIZE - + 1) / DBLOCK_SIZE) * sizeof (struct ContentHashKey); GNUNET_assert (0 == (off % DBLOCK_SIZE)); ioff = (off / DBLOCK_SIZE); - for (i=1;i<depth;i++) - { - loff += lsize; - lsize = (lsize + CHK_PER_INODE - 1) / CHK_PER_INODE; - GNUNET_assert (lsize > 0); - GNUNET_assert (0 == (ioff % CHK_PER_INODE)); - ioff /= CHK_PER_INODE; - } + for (i = 1; i < depth; i++) + { + loff += lsize; + lsize = (lsize + CHK_PER_INODE - 1) / CHK_PER_INODE; + GNUNET_assert (lsize > 0); + GNUNET_assert (0 == (ioff % CHK_PER_INODE)); + ioff /= CHK_PER_INODE; + } return loff + ioff * sizeof (struct ContentHashKey); } @@ -106,38 +107,28 @@ compute_disk_offset (uint64_t fsize, */ void GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, - struct GNUNET_FS_DownloadContext *dc) + struct GNUNET_FS_DownloadContext *dc) { pi->value.download.dc = dc; - pi->value.download.cctx - = dc->client_info; + pi->value.download.cctx = dc->client_info; pi->value.download.pctx - = (dc->parent == NULL) ? NULL : dc->parent->client_info; + = (dc->parent == NULL) ? NULL : dc->parent->client_info; pi->value.download.sctx - = (dc->search == NULL) ? NULL : dc->search->client_info; - pi->value.download.uri - = dc->uri; - pi->value.download.filename - = dc->filename; - pi->value.download.size - = dc->length; + = (dc->search == NULL) ? NULL : dc->search->client_info; + pi->value.download.uri = dc->uri; + pi->value.download.filename = dc->filename; + pi->value.download.size = dc->length; pi->value.download.duration - = GNUNET_TIME_absolute_get_duration (dc->start_time); - pi->value.download.completed - = dc->completed; - pi->value.download.anonymity - = dc->anonymity; + = GNUNET_TIME_absolute_get_duration (dc->start_time); + pi->value.download.completed = dc->completed; + pi->value.download.anonymity = dc->anonymity; pi->value.download.eta - = GNUNET_TIME_calculate_eta (dc->start_time, - dc->completed, - dc->length); + = GNUNET_TIME_calculate_eta (dc->start_time, dc->completed, dc->length); pi->value.download.is_active = (dc->client == NULL) ? GNUNET_NO : GNUNET_YES; if (0 == (dc->options & GNUNET_FS_DOWNLOAD_IS_PROBE)) - dc->client_info = dc->h->upcb (dc->h->upcb_cls, - pi); + dc->client_info = dc->h->upcb (dc->h->upcb_cls, pi); else - dc->client_info = GNUNET_FS_search_probe_progress_ (NULL, - pi); + dc->client_info = GNUNET_FS_search_probe_progress_ (NULL, pi); } @@ -152,10 +143,7 @@ GNUNET_FS_download_make_status_ (struct GNUNET_FS_ProgressInfo *pi, * @param buf where the callee should write the message * @return number of bytes written to buf */ -static size_t -transmit_download_request (void *cls, - size_t size, - void *buf); +static size_t transmit_download_request (void *cls, size_t size, void *buf); /** @@ -163,7 +151,7 @@ transmit_download_request (void *cls, */ struct ProcessResultClosure { - + /** * Hash of data. */ @@ -171,14 +159,14 @@ struct ProcessResultClosure /** * Data found in P2P network. - */ + */ const void *data; /** * Our download context. */ struct GNUNET_FS_DownloadContext *dc; - + /** * Number of bytes in data. */ @@ -193,7 +181,7 @@ struct ProcessResultClosure * Flag to indicate if this block should be stored on disk. */ int do_store; - + }; @@ -208,8 +196,7 @@ struct ProcessResultClosure */ static int process_result_with_request (void *cls, - const GNUNET_HashCode * key, - void *value); + const GNUNET_HashCode * key, void *value); /** @@ -227,53 +214,42 @@ process_result_with_request (void *cls, */ static int encrypt_existing_match (struct GNUNET_FS_DownloadContext *dc, - const struct ContentHashKey *chk, - struct DownloadRequest *dr, - const char * block, - size_t len, - int do_store) + const struct ContentHashKey *chk, + struct DownloadRequest *dr, + const char *block, size_t len, int do_store) { struct ProcessResultClosure prc; char enc[len]; struct GNUNET_CRYPTO_AesSessionKey sk; struct GNUNET_CRYPTO_AesInitializationVector iv; GNUNET_HashCode query; - + GNUNET_CRYPTO_hash_to_aes_key (&chk->key, &sk, &iv); - if (-1 == GNUNET_CRYPTO_aes_encrypt (block, len, - &sk, - &iv, - enc)) - { - GNUNET_break (0); - return GNUNET_SYSERR; - } + if (-1 == GNUNET_CRYPTO_aes_encrypt (block, len, &sk, &iv, enc)) + { + GNUNET_break (0); + return GNUNET_SYSERR; + } GNUNET_CRYPTO_hash (enc, len, &query); - if (0 != memcmp (&query, - &chk->query, - sizeof (GNUNET_HashCode))) - { - GNUNET_break_op (0); - return GNUNET_SYSERR; - } + if (0 != memcmp (&query, &chk->query, sizeof (GNUNET_HashCode))) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Matching block for `%s' at offset %llu already present, no need for download!\n", - dc->filename, - (unsigned long long) dr->offset); + "Matching block for `%s' at offset %llu already present, no need for download!\n", + dc->filename, (unsigned long long) dr->offset); #endif /* already got it! */ prc.dc = dc; prc.data = enc; prc.size = len; - prc.type = (0 == dr->depth) - ? GNUNET_BLOCK_TYPE_FS_DBLOCK - : GNUNET_BLOCK_TYPE_FS_IBLOCK; + prc.type = (0 == dr->depth) + ? GNUNET_BLOCK_TYPE_FS_DBLOCK : GNUNET_BLOCK_TYPE_FS_IBLOCK; prc.query = chk->query; prc.do_store = do_store; - process_result_with_request (&prc, - &chk->key, - dr); + process_result_with_request (&prc, &chk->key, dr); return GNUNET_OK; } @@ -285,8 +261,7 @@ encrypt_existing_match (struct GNUNET_FS_DownloadContext *dc, * * @param dc download context that is having trouble */ -static void -try_reconnect (struct GNUNET_FS_DownloadContext *dc); +static void try_reconnect (struct GNUNET_FS_DownloadContext *dc); /** @@ -300,13 +275,12 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc); * @param length number of bytes in data * @param data contents of the file (or NULL if they were not inlined) */ -static void +static void trigger_recursive_download (void *cls, - const char *filename, - const struct GNUNET_FS_Uri *uri, - const struct GNUNET_CONTAINER_MetaData *meta, - size_t length, - const void *data); + const char *filename, + const struct GNUNET_FS_Uri *uri, + const struct GNUNET_CONTAINER_MetaData *meta, + size_t length, const void *data); /** @@ -323,55 +297,51 @@ full_recursive_download (struct GNUNET_FS_DownloadContext *dc) void *data; struct GNUNET_DISK_FileHandle *h; struct GNUNET_DISK_MapHandle *m; - + size64 = GNUNET_FS_uri_chk_get_file_size (dc->uri); size = (size_t) size64; if (size64 != (uint64_t) size) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Recursive downloads of directories larger than 4 GB are not supported on 32-bit systems\n")); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ + ("Recursive downloads of directories larger than 4 GB are not supported on 32-bit systems\n")); + return; + } if (dc->filename != NULL) - { - h = GNUNET_DISK_file_open (dc->filename, - GNUNET_DISK_OPEN_READ, - GNUNET_DISK_PERM_NONE); - } + { + h = GNUNET_DISK_file_open (dc->filename, + GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_NONE); + } else - { - GNUNET_assert (dc->temp_filename != NULL); - h = GNUNET_DISK_file_open (dc->temp_filename, - GNUNET_DISK_OPEN_READ, - GNUNET_DISK_PERM_NONE); - } + { + GNUNET_assert (dc->temp_filename != NULL); + h = GNUNET_DISK_file_open (dc->temp_filename, + GNUNET_DISK_OPEN_READ, GNUNET_DISK_PERM_NONE); + } if (h == NULL) - return; /* oops */ + return; /* oops */ data = GNUNET_DISK_file_map (h, &m, GNUNET_DISK_MAP_TYPE_READ, size); if (data == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Directory too large for system address space\n")); - } + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Directory too large for system address space\n")); + } else - { - GNUNET_FS_directory_list_contents (size, - data, - 0, - &trigger_recursive_download, - dc); - GNUNET_DISK_file_unmap (m); - } + { + GNUNET_FS_directory_list_contents (size, + data, + 0, &trigger_recursive_download, dc); + GNUNET_DISK_file_unmap (m); + } GNUNET_DISK_file_close (h); if (dc->filename == NULL) - { - if (0 != UNLINK (dc->temp_filename)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "unlink", - dc->temp_filename); - GNUNET_free (dc->temp_filename); - dc->temp_filename = NULL; - } + { + if (0 != UNLINK (dc->temp_filename)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", dc->temp_filename); + GNUNET_free (dc->temp_filename); + dc->temp_filename = NULL; + } } @@ -392,28 +362,25 @@ check_completed (struct GNUNET_FS_DownloadContext *dc) struct GNUNET_FS_DownloadContext *pos; /* first, check if we need to download children */ - if ( (dc->child_head == NULL) && - (is_recursive_download (dc)) ) - full_recursive_download (dc); + if ((dc->child_head == NULL) && (is_recursive_download (dc))) + full_recursive_download (dc); /* then, check if children are done already */ pos = dc->child_head; while (pos != NULL) - { - if ( (pos->emsg == NULL) && - (pos->completed < pos->length) ) - return; /* not done yet */ - if ( (pos->child_head != NULL) && - (pos->has_finished != GNUNET_YES) ) - return; /* not transitively done yet */ - pos = pos->next; - } + { + if ((pos->emsg == NULL) && (pos->completed < pos->length)) + return; /* not done yet */ + if ((pos->child_head != NULL) && (pos->has_finished != GNUNET_YES)) + return; /* not transitively done yet */ + pos = pos->next; + } /* All of our children are done, so mark this download done */ dc->has_finished = GNUNET_YES; if (dc->job_queue != NULL) - { - GNUNET_FS_dequeue_ (dc->job_queue); - dc->job_queue = NULL; - } + { + GNUNET_FS_dequeue_ (dc->job_queue); + dc->job_queue = NULL; + } GNUNET_FS_download_sync_ (dc); /* signal completion */ @@ -422,7 +389,7 @@ check_completed (struct GNUNET_FS_DownloadContext *dc) /* let parent know */ if (dc->parent != NULL) - check_completed (dc->parent); + check_completed (dc->parent); } @@ -435,12 +402,10 @@ check_completed (struct GNUNET_FS_DownloadContext *dc) * @param dr download request to match against * @param data plaintext data, starting from the beginning of the file * @param data_len number of bytes in data - */ + */ static void try_match_block (struct GNUNET_FS_DownloadContext *dc, - struct DownloadRequest *dr, - const char *data, - size_t data_len) + struct DownloadRequest *dr, const char *data, size_t data_len) { struct GNUNET_FS_ProgressInfo pi; unsigned int i; @@ -456,134 +421,112 @@ try_match_block (struct GNUNET_FS_DownloadContext *dc, const char *fn; const char *odata; size_t odata_len; - + odata = data; odata_len = data_len; if (BRS_DOWNLOAD_UP == dr->state) return; if (dr->depth > 0) + { + complete = GNUNET_YES; + for (i = 0; i < dr->num_children; i++) { - complete = GNUNET_YES; - for (i=0;i<dr->num_children;i++) - { - drc = dr->children[i]; - try_match_block (dc, - drc, - data, data_len); - if (drc->state != BRS_RECONSTRUCT_META_UP) - complete = GNUNET_NO; - else - chks[i] = drc->chk; - } - if (GNUNET_YES != complete) - return; - data = (const char*) chks; - dlen = dr->num_children * sizeof (struct ContentHashKey); + drc = dr->children[i]; + try_match_block (dc, drc, data, data_len); + if (drc->state != BRS_RECONSTRUCT_META_UP) + complete = GNUNET_NO; + else + chks[i] = drc->chk; } + if (GNUNET_YES != complete) + return; + data = (const char *) chks; + dlen = dr->num_children * sizeof (struct ContentHashKey); + } else - { - if (dr->offset > data_len) - return; /* oops */ - dlen = GNUNET_MIN (data_len - dr->offset, - DBLOCK_SIZE); - } - GNUNET_CRYPTO_hash (&data[dr->offset], - dlen, - &in_chk.key); + { + if (dr->offset > data_len) + return; /* oops */ + dlen = GNUNET_MIN (data_len - dr->offset, DBLOCK_SIZE); + } + GNUNET_CRYPTO_hash (&data[dr->offset], dlen, &in_chk.key); GNUNET_CRYPTO_hash_to_aes_key (&in_chk.key, &sk, &iv); - if (-1 == GNUNET_CRYPTO_aes_encrypt (&data[dr->offset], dlen, - &sk, - &iv, - enc)) - { - GNUNET_break (0); - return; - } + if (-1 == GNUNET_CRYPTO_aes_encrypt (&data[dr->offset], dlen, &sk, &iv, enc)) + { + GNUNET_break (0); + return; + } GNUNET_CRYPTO_hash (enc, dlen, &in_chk.query); switch (dr->state) - { - case BRS_INIT: - dr->chk = in_chk; - dr->state = BRS_RECONSTRUCT_META_UP; + { + case BRS_INIT: + dr->chk = in_chk; + dr->state = BRS_RECONSTRUCT_META_UP; + break; + case BRS_CHK_SET: + if (0 != memcmp (&in_chk, &dr->chk, sizeof (struct ContentHashKey))) + { + /* other peer provided bogus meta data */ + GNUNET_break_op (0); break; - case BRS_CHK_SET: - if (0 != memcmp (&in_chk, - &dr->chk, - sizeof (struct ContentHashKey))) - { - /* other peer provided bogus meta data */ - GNUNET_break_op (0); - break; - } - /* write block to disk */ - fn = dc->filename != NULL - ? dc->filename - : dc->temp_filename; - fh = GNUNET_DISK_file_open (fn, - GNUNET_DISK_OPEN_READWRITE | - GNUNET_DISK_OPEN_CREATE | - GNUNET_DISK_OPEN_TRUNCATE, - GNUNET_DISK_PERM_USER_READ | - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_GROUP_READ | - GNUNET_DISK_PERM_OTHER_READ); - if (fh == NULL) - { - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, - "open", - fn); - GNUNET_asprintf (&dc->emsg, - _("Failed to open file `%s' for writing"), - fn); - GNUNET_DISK_file_close (fh); - dr->state = BRS_ERROR; - pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; - pi.value.download.specifics.error.message = dc->emsg; - GNUNET_FS_download_make_status_ (&pi, dc); - return; - } - if (data_len != - GNUNET_DISK_file_write (fh, - odata, - odata_len)) - { - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, - "write", - fn); - GNUNET_asprintf (&dc->emsg, - _("Failed to open file `%s' for writing"), - fn); - GNUNET_DISK_file_close (fh); - dr->state = BRS_ERROR; - pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; - pi.value.download.specifics.error.message = dc->emsg; - GNUNET_FS_download_make_status_ (&pi, dc); - return; - } + } + /* write block to disk */ + fn = dc->filename != NULL ? dc->filename : dc->temp_filename; + fh = GNUNET_DISK_file_open (fn, + GNUNET_DISK_OPEN_READWRITE | + GNUNET_DISK_OPEN_CREATE | + GNUNET_DISK_OPEN_TRUNCATE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ); + if (fh == NULL) + { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", fn); + GNUNET_asprintf (&dc->emsg, + _("Failed to open file `%s' for writing"), fn); GNUNET_DISK_file_close (fh); - /* signal success */ - dr->state = BRS_DOWNLOAD_UP; - dc->completed = dc->length; - GNUNET_FS_download_sync_ (dc); - pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS; - pi.value.download.specifics.progress.data = data; - pi.value.download.specifics.progress.offset = 0; - pi.value.download.specifics.progress.data_len = dlen; - pi.value.download.specifics.progress.depth = 0; + dr->state = BRS_ERROR; + pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; + pi.value.download.specifics.error.message = dc->emsg; GNUNET_FS_download_make_status_ (&pi, dc); - if ( (NULL != dc->filename) && - (0 != truncate (dc->filename, - GNUNET_ntohll (dc->uri->data.chk.file_length))) ) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "truncate", - dc->filename); - check_completed (dc); - break; - default: - /* how did we get here? */ - GNUNET_break (0); - break; + return; + } + if (data_len != GNUNET_DISK_file_write (fh, odata, odata_len)) + { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "write", fn); + GNUNET_asprintf (&dc->emsg, + _("Failed to open file `%s' for writing"), fn); + GNUNET_DISK_file_close (fh); + dr->state = BRS_ERROR; + pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; + pi.value.download.specifics.error.message = dc->emsg; + GNUNET_FS_download_make_status_ (&pi, dc); + return; } + GNUNET_DISK_file_close (fh); + /* signal success */ + dr->state = BRS_DOWNLOAD_UP; + dc->completed = dc->length; + GNUNET_FS_download_sync_ (dc); + pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS; + pi.value.download.specifics.progress.data = data; + pi.value.download.specifics.progress.offset = 0; + pi.value.download.specifics.progress.data_len = dlen; + pi.value.download.specifics.progress.depth = 0; + GNUNET_FS_download_make_status_ (&pi, dc); + if ((NULL != dc->filename) && + (0 != truncate (dc->filename, + GNUNET_ntohll (dc->uri->data.chk.file_length)))) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "truncate", dc->filename); + check_completed (dc); + break; + default: + /* how did we get here? */ + GNUNET_break (0); + break; + } } @@ -604,34 +547,28 @@ try_match_block (struct GNUNET_FS_DownloadContext *dc, * @param data actual meta-data found * @param data_len number of bytes in data * @return 0 to continue extracting, 1 to abort - */ + */ static int match_full_data (void *cls, - const char *plugin_name, - enum EXTRACTOR_MetaType type, - enum EXTRACTOR_MetaFormat format, - const char *data_mime_type, - const char *data, - size_t data_len) + const char *plugin_name, + enum EXTRACTOR_MetaType type, + enum EXTRACTOR_MetaFormat format, + const char *data_mime_type, const char *data, size_t data_len) { struct GNUNET_FS_DownloadContext *dc = cls; - if (type != EXTRACTOR_METATYPE_GNUNET_FULL_DATA) + if (type != EXTRACTOR_METATYPE_GNUNET_FULL_DATA) return 0; #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Found %u bytes of FD!\n", - (unsigned int) data_len); + "Found %u bytes of FD!\n", (unsigned int) data_len); #endif if (GNUNET_FS_uri_chk_get_file_size (dc->uri) != data_len) - { - GNUNET_break_op (0); - return 1; /* bogus meta data */ - } - try_match_block (dc, - dc->top_request, - data, - data_len); + { + GNUNET_break_op (0); + return 1; /* bogus meta data */ + } + try_match_block (dc, dc->top_request, data, data_len); return 1; } @@ -648,15 +585,15 @@ propagate_up (struct DownloadRequest *dr) unsigned int i; do - { - dr->state = BRS_DOWNLOAD_UP; - dr = dr->parent; - if (dr == NULL) - break; - for (i=0;i<dr->num_children;i++) - if (dr->children[i]->state != BRS_DOWNLOAD_UP) - break; - } + { + dr->state = BRS_DOWNLOAD_UP; + dr = dr->parent; + if (dr == NULL) + break; + for (i = 0; i < dr->num_children; i++) + if (dr->children[i]->state != BRS_DOWNLOAD_UP) + break; + } while (i == dr->num_children); } @@ -673,7 +610,7 @@ propagate_up (struct DownloadRequest *dr) */ static void try_top_down_reconstruction (struct GNUNET_FS_DownloadContext *dc, - struct DownloadRequest *dr) + struct DownloadRequest *dr) { uint64_t off; char block[DBLOCK_SIZE]; @@ -686,87 +623,66 @@ try_top_down_reconstruction (struct GNUNET_FS_DownloadContext *dc, uint64_t child_block_size; const struct ContentHashKey *chks; int up_done; - + GNUNET_assert (dc->rfh != NULL); GNUNET_assert (dr->state == BRS_CHK_SET); total = GNUNET_FS_uri_chk_get_file_size (dc->uri); GNUNET_assert (dr->depth < dc->treedepth); - len = GNUNET_FS_tree_calculate_block_size (total, - dr->offset, - dr->depth); + len = GNUNET_FS_tree_calculate_block_size (total, dr->offset, dr->depth); GNUNET_assert (len <= DBLOCK_SIZE); - off = compute_disk_offset (total, - dr->offset, - dr->depth); - if (dc->old_file_size < off + len) - return; /* failure */ - if (off != - GNUNET_DISK_file_seek (dc->rfh, - off, - GNUNET_DISK_SEEK_SET) ) - { - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "seek", - dc->filename); - return; /* failure */ - } - if (len != - GNUNET_DISK_file_read (dc->rfh, - block, - len)) - { - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "read", - dc->filename); - return; /* failure */ - } + off = compute_disk_offset (total, dr->offset, dr->depth); + if (dc->old_file_size < off + len) + return; /* failure */ + if (off != GNUNET_DISK_file_seek (dc->rfh, off, GNUNET_DISK_SEEK_SET)) + { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "seek", dc->filename); + return; /* failure */ + } + if (len != GNUNET_DISK_file_read (dc->rfh, block, len)) + { + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "read", dc->filename); + return; /* failure */ + } GNUNET_CRYPTO_hash (block, len, &key); - if (0 != memcmp (&key, - &dr->chk.key, - sizeof (GNUNET_HashCode))) - return; /* mismatch */ + if (0 != memcmp (&key, &dr->chk.key, sizeof (GNUNET_HashCode))) + return; /* mismatch */ if (GNUNET_OK != - encrypt_existing_match (dc, - &dr->chk, - dr, - block, - len, - GNUNET_NO)) + encrypt_existing_match (dc, &dr->chk, dr, block, len, GNUNET_NO)) + { + /* hash matches but encrypted block does not, really bad */ + dr->state = BRS_ERROR; + /* propagate up */ + while (dr->parent != NULL) { - /* hash matches but encrypted block does not, really bad */ + dr = dr->parent; dr->state = BRS_ERROR; - /* propagate up */ - while (dr->parent != NULL) - { - dr = dr->parent; - dr->state = BRS_ERROR; - } - return; } + return; + } /* block matches */ dr->state = BRS_DOWNLOAD_DOWN; /* set CHKs for children */ up_done = GNUNET_YES; - chks = (const struct ContentHashKey*) block; - for (i=0;i<dr->num_children;i++) - { - drc = dr->children[i]; - GNUNET_assert (drc->offset >= dr->offset); - child_block_size = GNUNET_FS_tree_compute_tree_size (drc->depth); - GNUNET_assert (0 == (drc->offset - dr->offset) % child_block_size); - chk_off = (drc->offset - dr->offset) / child_block_size; - if (drc->state == BRS_INIT) - { - drc->state = BRS_CHK_SET; - drc->chk = chks[chk_off]; - try_top_down_reconstruction (dc, drc); - } - if (drc->state != BRS_DOWNLOAD_UP) - up_done = GNUNET_NO; /* children not all done */ - } + chks = (const struct ContentHashKey *) block; + for (i = 0; i < dr->num_children; i++) + { + drc = dr->children[i]; + GNUNET_assert (drc->offset >= dr->offset); + child_block_size = GNUNET_FS_tree_compute_tree_size (drc->depth); + GNUNET_assert (0 == (drc->offset - dr->offset) % child_block_size); + chk_off = (drc->offset - dr->offset) / child_block_size; + if (drc->state == BRS_INIT) + { + drc->state = BRS_CHK_SET; + drc->chk = chks[chk_off]; + try_top_down_reconstruction (dc, drc); + } + if (drc->state != BRS_DOWNLOAD_UP) + up_done = GNUNET_NO; /* children not all done */ + } if (up_done == GNUNET_YES) - propagate_up (dr); /* children all done (or no children...) */ + propagate_up (dr); /* children all done (or no children...) */ } @@ -778,67 +694,63 @@ try_top_down_reconstruction (struct GNUNET_FS_DownloadContext *dc, */ static void schedule_block_download (struct GNUNET_FS_DownloadContext *dc, - struct DownloadRequest *dr) + struct DownloadRequest *dr) { unsigned int i; switch (dr->state) - { - case BRS_INIT: - GNUNET_assert (0); - break; - case BRS_RECONSTRUCT_DOWN: - GNUNET_assert (0); - break; - case BRS_RECONSTRUCT_META_UP: - GNUNET_assert (0); - break; - case BRS_RECONSTRUCT_UP: - GNUNET_assert (0); - break; - case BRS_CHK_SET: - /* normal case, start download */ - break; - case BRS_DOWNLOAD_DOWN: - for (i=0;i<dr->num_children;i++) - schedule_block_download (dc, dr->children[i]); - return; - case BRS_DOWNLOAD_UP: - /* We're done! */ - return; - case BRS_ERROR: - GNUNET_break (0); - return; - } + { + case BRS_INIT: + GNUNET_assert (0); + break; + case BRS_RECONSTRUCT_DOWN: + GNUNET_assert (0); + break; + case BRS_RECONSTRUCT_META_UP: + GNUNET_assert (0); + break; + case BRS_RECONSTRUCT_UP: + GNUNET_assert (0); + break; + case BRS_CHK_SET: + /* normal case, start download */ + break; + case BRS_DOWNLOAD_DOWN: + for (i = 0; i < dr->num_children; i++) + schedule_block_download (dc, dr->children[i]); + return; + case BRS_DOWNLOAD_UP: + /* We're done! */ + return; + case BRS_ERROR: + GNUNET_break (0); + return; + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Scheduling download at offset %llu and depth %u for `%s'\n", - (unsigned long long) dr->offset, - dr->depth, - GNUNET_h2s (&dr->chk.query)); + "Scheduling download at offset %llu and depth %u for `%s'\n", + (unsigned long long) dr->offset, + dr->depth, GNUNET_h2s (&dr->chk.query)); #endif if (GNUNET_NO != GNUNET_CONTAINER_multihashmap_contains_value (dc->active, - &dr->chk.query, - dr)) - return; /* already active */ + &dr->chk.query, dr)) + return; /* already active */ GNUNET_CONTAINER_multihashmap_put (dc->active, - &dr->chk.query, - dr, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); + &dr->chk.query, + dr, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE); if (dc->client == NULL) - return; /* download not active */ - GNUNET_CONTAINER_DLL_insert (dc->pending_head, - dc->pending_tail, - dr); + return; /* download not active */ + GNUNET_CONTAINER_DLL_insert (dc->pending_head, dc->pending_tail, dr); dr->is_pending = GNUNET_YES; if (NULL == dc->th) dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client, - sizeof (struct SearchMessage), - GNUNET_CONSTANTS_SERVICE_TIMEOUT, - GNUNET_NO, - &transmit_download_request, - dc); + sizeof (struct SearchMessage), + GNUNET_CONSTANTS_SERVICE_TIMEOUT, + GNUNET_NO, + &transmit_download_request, + dc); } @@ -855,15 +767,14 @@ schedule_block_download (struct GNUNET_FS_DownloadContext *dc, * @param length number of bytes in data * @param data contents of the file (or NULL if they were not inlined) */ -static void +static void trigger_recursive_download (void *cls, - const char *filename, - const struct GNUNET_FS_Uri *uri, - const struct GNUNET_CONTAINER_MetaData *meta, - size_t length, - const void *data) + const char *filename, + const struct GNUNET_FS_Uri *uri, + const struct GNUNET_CONTAINER_MetaData *meta, + size_t length, const void *data) { - struct GNUNET_FS_DownloadContext *dc = cls; + struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_FS_DownloadContext *cpos; char *temp_name; char *fn; @@ -875,129 +786,116 @@ trigger_recursive_download (void *cls, char *sfn; if (NULL == uri) - return; /* entry for the directory itself */ + return; /* entry for the directory itself */ cpos = dc->child_head; while (cpos != NULL) - { - if ( (GNUNET_FS_uri_test_equal (uri, - cpos->uri)) || - ( (filename != NULL) && - (0 == strcmp (cpos->filename, - filename)) ) ) - break; - cpos = cpos->next; - } + { + if ((GNUNET_FS_uri_test_equal (uri, + cpos->uri)) || + ((filename != NULL) && (0 == strcmp (cpos->filename, filename)))) + break; + cpos = cpos->next; + } if (cpos != NULL) - return; /* already exists */ + return; /* already exists */ fn = NULL; if (NULL == filename) - { - fn = GNUNET_FS_meta_data_suggest_filename (meta); - if (fn == NULL) - { - us = GNUNET_FS_uri_to_string (uri); - fn = GNUNET_strdup (&us [strlen (GNUNET_FS_URI_CHK_PREFIX)]); - GNUNET_free (us); - } - else if (fn[0] == '.') - { - ext = fn; - us = GNUNET_FS_uri_to_string (uri); - GNUNET_asprintf (&fn, - "%s%s", - &us[strlen (GNUNET_FS_URI_CHK_PREFIX)], ext); - GNUNET_free (ext); - GNUNET_free (us); - } - /* change '\' to '/' (this should have happened - during insertion, but malicious peers may - not have done this) */ - while (NULL != (pos = strstr (fn, "\\"))) - *pos = '/'; - /* remove '../' everywhere (again, well-behaved - peers don't do this, but don't trust that - we did not get something nasty) */ - while (NULL != (pos = strstr (fn, "../"))) - { - pos[0] = '_'; - pos[1] = '_'; - pos[2] = '_'; - } - filename = fn; - } + { + fn = GNUNET_FS_meta_data_suggest_filename (meta); + if (fn == NULL) + { + us = GNUNET_FS_uri_to_string (uri); + fn = GNUNET_strdup (&us[strlen (GNUNET_FS_URI_CHK_PREFIX)]); + GNUNET_free (us); + } + else if (fn[0] == '.') + { + ext = fn; + us = GNUNET_FS_uri_to_string (uri); + GNUNET_asprintf (&fn, + "%s%s", &us[strlen (GNUNET_FS_URI_CHK_PREFIX)], ext); + GNUNET_free (ext); + GNUNET_free (us); + } + /* change '\' to '/' (this should have happened + * during insertion, but malicious peers may + * not have done this) */ + while (NULL != (pos = strstr (fn, "\\"))) + *pos = '/'; + /* remove '../' everywhere (again, well-behaved + * peers don't do this, but don't trust that + * we did not get something nasty) */ + while (NULL != (pos = strstr (fn, "../"))) + { + pos[0] = '_'; + pos[1] = '_'; + pos[2] = '_'; + } + filename = fn; + } if (dc->filename == NULL) - { - full_name = NULL; - } + { + full_name = NULL; + } else - { - dn = GNUNET_strdup (dc->filename); - GNUNET_break ( (strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && - (NULL != - strstr (dn + strlen(dn) - strlen(GNUNET_FS_DIRECTORY_EXT), - GNUNET_FS_DIRECTORY_EXT)) ); - sfn = GNUNET_strdup (filename); - while ( (strlen (sfn) > 0) && - (filename[strlen(sfn)-1] == '/') ) - sfn[strlen(sfn)-1] = '\0'; - if ( (strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && - (NULL != - strstr (dn + strlen(dn) - strlen(GNUNET_FS_DIRECTORY_EXT), - GNUNET_FS_DIRECTORY_EXT)) ) - dn[strlen(dn) - strlen (GNUNET_FS_DIRECTORY_EXT)] = '\0'; - if ( (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta)) && - ( (strlen (filename) < strlen (GNUNET_FS_DIRECTORY_EXT)) || - (NULL == - strstr (filename + strlen(filename) - strlen(GNUNET_FS_DIRECTORY_EXT), - GNUNET_FS_DIRECTORY_EXT)) ) ) - { - GNUNET_asprintf (&full_name, - "%s%s%s%s", - dn, - DIR_SEPARATOR_STR, - sfn, - GNUNET_FS_DIRECTORY_EXT); - } - else - { - GNUNET_asprintf (&full_name, - "%s%s%s", - dn, - DIR_SEPARATOR_STR, - sfn); - } - GNUNET_free (sfn); - GNUNET_free (dn); - } - if ( (full_name != NULL) && - (GNUNET_OK != - GNUNET_DISK_directory_create_for_file (full_name)) ) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Failed to create directory for recursive download of `%s'\n"), - full_name); - GNUNET_free (full_name); - GNUNET_free_non_null (fn); - return; - } + { + dn = GNUNET_strdup (dc->filename); + GNUNET_break ((strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && + (NULL != + strstr (dn + strlen (dn) - strlen (GNUNET_FS_DIRECTORY_EXT), + GNUNET_FS_DIRECTORY_EXT))); + sfn = GNUNET_strdup (filename); + while ((strlen (sfn) > 0) && (filename[strlen (sfn) - 1] == '/')) + sfn[strlen (sfn) - 1] = '\0'; + if ((strlen (dn) >= strlen (GNUNET_FS_DIRECTORY_EXT)) && + (NULL != + strstr (dn + strlen (dn) - strlen (GNUNET_FS_DIRECTORY_EXT), + GNUNET_FS_DIRECTORY_EXT))) + dn[strlen (dn) - strlen (GNUNET_FS_DIRECTORY_EXT)] = '\0'; + if ((GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta)) && + ((strlen (filename) < strlen (GNUNET_FS_DIRECTORY_EXT)) || + (NULL == + strstr (filename + strlen (filename) - + strlen (GNUNET_FS_DIRECTORY_EXT), GNUNET_FS_DIRECTORY_EXT)))) + { + GNUNET_asprintf (&full_name, + "%s%s%s%s", + dn, DIR_SEPARATOR_STR, sfn, GNUNET_FS_DIRECTORY_EXT); + } + else + { + GNUNET_asprintf (&full_name, "%s%s%s", dn, DIR_SEPARATOR_STR, sfn); + } + GNUNET_free (sfn); + GNUNET_free (dn); + } + if ((full_name != NULL) && + (GNUNET_OK != GNUNET_DISK_directory_create_for_file (full_name))) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _ + ("Failed to create directory for recursive download of `%s'\n"), + full_name); + GNUNET_free (full_name); + GNUNET_free_non_null (fn); + return; + } temp_name = NULL; #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Triggering recursive download of size %llu with %u bytes MD\n", - (unsigned long long) GNUNET_FS_uri_chk_get_file_size (uri), - (unsigned int) GNUNET_CONTAINER_meta_data_get_serialized_size (meta)); + "Triggering recursive download of size %llu with %u bytes MD\n", + (unsigned long long) GNUNET_FS_uri_chk_get_file_size (uri), + (unsigned int) + GNUNET_CONTAINER_meta_data_get_serialized_size (meta)); #endif GNUNET_FS_download_start (dc->h, - uri, - meta, - full_name, temp_name, - 0, - GNUNET_FS_uri_chk_get_file_size (uri), - dc->anonymity, - dc->options, - NULL, - dc); + uri, + meta, + full_name, temp_name, + 0, + GNUNET_FS_uri_chk_get_file_size (uri), + dc->anonymity, dc->options, NULL, dc); GNUNET_free_non_null (full_name); GNUNET_free_non_null (temp_name); GNUNET_free_non_null (fn); @@ -1016,7 +914,7 @@ GNUNET_FS_free_download_request_ (struct DownloadRequest *dr) if (dr == NULL) return; - for (i=0;i<dr->num_children;i++) + for (i = 0; i < dr->num_children; i++) GNUNET_FS_free_download_request_ (dr->children[i]); GNUNET_free_non_null (dr->children); GNUNET_free (dr); @@ -1034,8 +932,7 @@ GNUNET_FS_free_download_request_ (struct DownloadRequest *dr) */ static int process_result_with_request (void *cls, - const GNUNET_HashCode *key, - void *value) + const GNUNET_HashCode * key, void *value) { struct ProcessResultClosure *prc = cls; struct DownloadRequest *dr = value; @@ -1054,152 +951,132 @@ process_result_with_request (void *cls, #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received block `%s' matching pending request at depth %u and offset %llu/%llu\n", - GNUNET_h2s (key), - dr->depth, - (unsigned long long) dr->offset, - (unsigned long long) GNUNET_ntohll (dc->uri->data.chk.file_length)); - + "Received block `%s' matching pending request at depth %u and offset %llu/%llu\n", + GNUNET_h2s (key), + dr->depth, + (unsigned long long) dr->offset, + (unsigned long long) GNUNET_ntohll (dc->uri->data. + chk.file_length)); + #endif - bs = GNUNET_FS_tree_calculate_block_size (GNUNET_ntohll (dc->uri->data.chk.file_length), - dr->offset, - dr->depth); + bs = GNUNET_FS_tree_calculate_block_size (GNUNET_ntohll + (dc->uri->data.chk.file_length), + dr->offset, dr->depth); if (prc->size != bs) + { + GNUNET_asprintf (&dc->emsg, + _ + ("Internal error or bogus download URI (expected %u bytes at depth %u and offset %llu/%llu, got %u bytes)\n"), + bs, dr->depth, (unsigned long long) dr->offset, + (unsigned long long) GNUNET_ntohll (dc->uri->data. + chk.file_length), + prc->size); + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "%s", dc->emsg); + while (dr->parent != NULL) { - GNUNET_asprintf (&dc->emsg, - _("Internal error or bogus download URI (expected %u bytes at depth %u and offset %llu/%llu, got %u bytes)\n"), - bs, - dr->depth, - (unsigned long long) dr->offset, - (unsigned long long) GNUNET_ntohll (dc->uri->data.chk.file_length), - prc->size); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "%s", - dc->emsg); - while (dr->parent != NULL) - { - dr->state = BRS_ERROR; - dr = dr->parent; - } dr->state = BRS_ERROR; - goto signal_error; + dr = dr->parent; } + dr->state = BRS_ERROR; + goto signal_error; + } - (void) GNUNET_CONTAINER_multihashmap_remove (dc->active, - &prc->query, - dr); + (void) GNUNET_CONTAINER_multihashmap_remove (dc->active, &prc->query, dr); if (GNUNET_YES == dr->is_pending) - { - GNUNET_CONTAINER_DLL_remove (dc->pending_head, - dc->pending_tail, - dr); - dr->is_pending = GNUNET_NO; - } + { + GNUNET_CONTAINER_DLL_remove (dc->pending_head, dc->pending_tail, dr); + dr->is_pending = GNUNET_NO; + } GNUNET_CRYPTO_hash_to_aes_key (&dr->chk.key, &skey, &iv); - if (-1 == GNUNET_CRYPTO_aes_decrypt (prc->data, - prc->size, - &skey, - &iv, - pt)) - { - GNUNET_break (0); - dc->emsg = GNUNET_strdup (_("internal error decrypting content")); - goto signal_error; - } + if (-1 == GNUNET_CRYPTO_aes_decrypt (prc->data, prc->size, &skey, &iv, pt)) + { + GNUNET_break (0); + dc->emsg = GNUNET_strdup (_("internal error decrypting content")); + goto signal_error; + } off = compute_disk_offset (GNUNET_ntohll (dc->uri->data.chk.file_length), - dr->offset, - dr->depth); + dr->offset, dr->depth); /* save to disk */ - if ( ( GNUNET_YES == prc->do_store) && - ( (dc->filename != NULL) || - (is_recursive_download (dc)) ) && - ( (dr->depth == dc->treedepth) || - (0 == (dc->options & GNUNET_FS_DOWNLOAD_NO_TEMPORARIES)) ) ) + if ((GNUNET_YES == prc->do_store) && + ((dc->filename != NULL) || + (is_recursive_download (dc))) && + ((dr->depth == dc->treedepth) || + (0 == (dc->options & GNUNET_FS_DOWNLOAD_NO_TEMPORARIES)))) + { + fh = GNUNET_DISK_file_open (dc->filename != NULL + ? dc->filename + : dc->temp_filename, + GNUNET_DISK_OPEN_READWRITE | + GNUNET_DISK_OPEN_CREATE, + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ); + if (NULL == fh) { - fh = GNUNET_DISK_file_open (dc->filename != NULL - ? dc->filename - : dc->temp_filename, - GNUNET_DISK_OPEN_READWRITE | - GNUNET_DISK_OPEN_CREATE, - GNUNET_DISK_PERM_USER_READ | - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_GROUP_READ | - GNUNET_DISK_PERM_OTHER_READ); - if (NULL == fh) - { - GNUNET_asprintf (&dc->emsg, - _("Download failed: could not open file `%s': %s\n"), - dc->filename, - STRERROR (errno)); - goto signal_error; - } + GNUNET_asprintf (&dc->emsg, + _("Download failed: could not open file `%s': %s\n"), + dc->filename, STRERROR (errno)); + goto signal_error; + } #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Saving decrypted block to disk at offset %llu\n", - (unsigned long long) off); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Saving decrypted block to disk at offset %llu\n", + (unsigned long long) off); #endif - if ( (off != - GNUNET_DISK_file_seek (fh, - off, - GNUNET_DISK_SEEK_SET) ) ) - { - GNUNET_asprintf (&dc->emsg, - _("Failed to seek to offset %llu in file `%s': %s\n"), - (unsigned long long) off, - dc->filename, - STRERROR (errno)); - goto signal_error; - } - if (prc->size != - GNUNET_DISK_file_write (fh, - pt, - prc->size)) - { - GNUNET_asprintf (&dc->emsg, - _("Failed to write block of %u bytes at offset %llu in file `%s': %s\n"), - (unsigned int) prc->size, - (unsigned long long) off, - dc->filename, - STRERROR (errno)); - goto signal_error; - } - GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh)); - fh = NULL; + if ((off != GNUNET_DISK_file_seek (fh, off, GNUNET_DISK_SEEK_SET))) + { + GNUNET_asprintf (&dc->emsg, + _("Failed to seek to offset %llu in file `%s': %s\n"), + (unsigned long long) off, + dc->filename, STRERROR (errno)); + goto signal_error; } + if (prc->size != GNUNET_DISK_file_write (fh, pt, prc->size)) + { + GNUNET_asprintf (&dc->emsg, + _ + ("Failed to write block of %u bytes at offset %llu in file `%s': %s\n"), + (unsigned int) prc->size, (unsigned long long) off, + dc->filename, STRERROR (errno)); + goto signal_error; + } + GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (fh)); + fh = NULL; + } - if (dr->depth == 0) + if (dr->depth == 0) + { + /* DBLOCK, update progress and try recursion if applicable */ + app = prc->size; + if (dr->offset < dc->offset) { - /* DBLOCK, update progress and try recursion if applicable */ - app = prc->size; - if (dr->offset < dc->offset) - { - /* starting offset begins in the middle of pt, - do not count first bytes as progress */ - GNUNET_assert (app > (dc->offset - dr->offset)); - app -= (dc->offset - dr->offset); - } - if (dr->offset + prc->size > dc->offset + dc->length) - { - /* end of block is after relevant range, - do not count last bytes as progress */ - GNUNET_assert (app > (dr->offset + prc->size) - (dc->offset + dc->length)); - app -= (dr->offset + prc->size) - (dc->offset + dc->length); - } - dc->completed += app; - - /* do recursive download if option is set and either meta data - says it is a directory or if no meta data is given AND filename - ends in '.gnd' (top-level case) */ - if (is_recursive_download (dc)) - GNUNET_FS_directory_list_contents (prc->size, - pt, - off, - &trigger_recursive_download, - dc); - + /* starting offset begins in the middle of pt, + * do not count first bytes as progress */ + GNUNET_assert (app > (dc->offset - dr->offset)); + app -= (dc->offset - dr->offset); } + if (dr->offset + prc->size > dc->offset + dc->length) + { + /* end of block is after relevant range, + * do not count last bytes as progress */ + GNUNET_assert (app > + (dr->offset + prc->size) - (dc->offset + dc->length)); + app -= (dr->offset + prc->size) - (dc->offset + dc->length); + } + dc->completed += app; + + /* do recursive download if option is set and either meta data + * says it is a directory or if no meta data is given AND filename + * ends in '.gnd' (top-level case) */ + if (is_recursive_download (dc)) + GNUNET_FS_directory_list_contents (prc->size, + pt, + off, &trigger_recursive_download, dc); + + } dr->state = BRS_DOWNLOAD_DOWN; pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS; pi.value.download.specifics.progress.data = pt; @@ -1208,84 +1085,83 @@ process_result_with_request (void *cls, pi.value.download.specifics.progress.depth = dr->depth; GNUNET_FS_download_make_status_ (&pi, dc); GNUNET_assert (dc->completed <= dc->length); - if (dr->depth == 0) + if (dr->depth == 0) propagate_up (dr); if (dc->completed == dc->length) - { - /* download completed, signal */ + { + /* download completed, signal */ #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Download completed, truncating file to desired length %llu\n", - (unsigned long long) GNUNET_ntohll (dc->uri->data.chk.file_length)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Download completed, truncating file to desired length %llu\n", + (unsigned long long) GNUNET_ntohll (dc->uri->data. + chk.file_length)); #endif - /* truncate file to size (since we store IBlocks at the end) */ - if (dc->filename != NULL) - { - if (0 != truncate (dc->filename, - GNUNET_ntohll (dc->uri->data.chk.file_length))) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "truncate", - dc->filename); - } - GNUNET_assert (dr->depth == 0); - check_completed (dc); - } - if (dr->depth == 0) + /* truncate file to size (since we store IBlocks at the end) */ + if (dc->filename != NULL) { - /* bottom of the tree, no child downloads possible, just sync */ - GNUNET_FS_download_sync_ (dc); - return GNUNET_YES; + if (0 != truncate (dc->filename, + GNUNET_ntohll (dc->uri->data.chk.file_length))) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "truncate", dc->filename); } + GNUNET_assert (dr->depth == 0); + check_completed (dc); + } + if (dr->depth == 0) + { + /* bottom of the tree, no child downloads possible, just sync */ + GNUNET_FS_download_sync_ (dc); + return GNUNET_YES; + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Triggering downloads of children (this block was at depth %u and offset %llu)\n", - dr->depth, - (unsigned long long) dr->offset); + "Triggering downloads of children (this block was at depth %u and offset %llu)\n", + dr->depth, (unsigned long long) dr->offset); #endif - GNUNET_assert (0 == (prc->size % sizeof(struct ContentHashKey))); - chkarr = (struct ContentHashKey*) pt; - for (i=(prc->size / sizeof(struct ContentHashKey))-1;i>=0;i--) + GNUNET_assert (0 == (prc->size % sizeof (struct ContentHashKey))); + chkarr = (struct ContentHashKey *) pt; + for (i = (prc->size / sizeof (struct ContentHashKey)) - 1; i >= 0; i--) + { + drc = dr->children[i]; + switch (drc->state) { - drc = dr->children[i]; - switch (drc->state) - { - case BRS_INIT: - drc->chk = chkarr[i]; - drc->state = BRS_CHK_SET; - schedule_block_download (dc, drc); - break; - case BRS_RECONSTRUCT_DOWN: - GNUNET_assert (0); - break; - case BRS_RECONSTRUCT_META_UP: - GNUNET_assert (0); - break; - case BRS_RECONSTRUCT_UP: - GNUNET_assert (0); - break; - case BRS_CHK_SET: - GNUNET_assert (0); - break; - case BRS_DOWNLOAD_DOWN: - GNUNET_assert (0); - break; - case BRS_DOWNLOAD_UP: - GNUNET_assert (0); - break; - case BRS_ERROR: - GNUNET_assert (0); - break; - default: - GNUNET_assert (0); - break; - } + case BRS_INIT: + drc->chk = chkarr[i]; + drc->state = BRS_CHK_SET; + schedule_block_download (dc, drc); + break; + case BRS_RECONSTRUCT_DOWN: + GNUNET_assert (0); + break; + case BRS_RECONSTRUCT_META_UP: + GNUNET_assert (0); + break; + case BRS_RECONSTRUCT_UP: + GNUNET_assert (0); + break; + case BRS_CHK_SET: + GNUNET_assert (0); + break; + case BRS_DOWNLOAD_DOWN: + GNUNET_assert (0); + break; + case BRS_DOWNLOAD_UP: + GNUNET_assert (0); + break; + case BRS_ERROR: + GNUNET_assert (0); + break; + default: + GNUNET_assert (0); + break; } + } GNUNET_FS_download_sync_ (dc); return GNUNET_YES; - signal_error: +signal_error: if (fh != NULL) GNUNET_DISK_file_close (fh); pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; @@ -1293,10 +1169,10 @@ process_result_with_request (void *cls, GNUNET_FS_download_make_status_ (&pi, dc); /* abort all pending requests */ if (NULL != dc->th) - { - GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); - dc->th = NULL; - } + { + GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); + dc->th = NULL; + } GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO); dc->in_receive = GNUNET_NO; dc->client = NULL; @@ -1321,9 +1197,7 @@ process_result_with_request (void *cls, */ static void process_result (struct GNUNET_FS_DownloadContext *dc, - enum GNUNET_BLOCK_Type type, - const void *data, - size_t size) + enum GNUNET_BLOCK_Type type, const void *data, size_t size) { struct ProcessResultClosure prc; @@ -1335,14 +1209,13 @@ process_result (struct GNUNET_FS_DownloadContext *dc, GNUNET_CRYPTO_hash (data, size, &prc.query); #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Received result for query `%s' from `%s'-service\n", - GNUNET_h2s (&prc.query), - "FS"); + "Received result for query `%s' from `%s'-service\n", + GNUNET_h2s (&prc.query), "FS"); #endif GNUNET_CONTAINER_multihashmap_get_multiple (dc->active, - &prc.query, - &process_result_with_request, - &prc); + &prc.query, + &process_result_with_request, + &prc); } @@ -1353,35 +1226,30 @@ process_result (struct GNUNET_FS_DownloadContext *dc, * @param cls closure * @param msg message received, NULL on timeout or fatal error */ -static void -receive_results (void *cls, - const struct GNUNET_MessageHeader * msg) +static void +receive_results (void *cls, const struct GNUNET_MessageHeader *msg) { struct GNUNET_FS_DownloadContext *dc = cls; const struct PutMessage *cm; uint16_t msize; - if ( (NULL == msg) || - (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_PUT) || - (sizeof (struct PutMessage) > ntohs(msg->size)) ) - { - GNUNET_break (msg == NULL); - try_reconnect (dc); - return; - } - msize = ntohs(msg->size); - cm = (const struct PutMessage*) msg; - process_result (dc, - ntohl (cm->type), - &cm[1], - msize - sizeof (struct PutMessage)); + if ((NULL == msg) || + (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_PUT) || + (sizeof (struct PutMessage) > ntohs (msg->size))) + { + GNUNET_break (msg == NULL); + try_reconnect (dc); + return; + } + msize = ntohs (msg->size); + cm = (const struct PutMessage *) msg; + process_result (dc, + ntohl (cm->type), &cm[1], msize - sizeof (struct PutMessage)); if (dc->client == NULL) - return; /* fatal error */ + return; /* fatal error */ /* continue receiving */ GNUNET_CLIENT_receive (dc->client, - &receive_results, - dc, - GNUNET_TIME_UNIT_FOREVER_REL); + &receive_results, dc, GNUNET_TIME_UNIT_FOREVER_REL); } @@ -1398,9 +1266,7 @@ receive_results (void *cls, * @return number of bytes written to buf */ static size_t -transmit_download_request (void *cls, - size_t size, - void *buf) +transmit_download_request (void *cls, size_t size, void *buf) { struct GNUNET_FS_DownloadContext *dc = cls; size_t msize; @@ -1409,65 +1275,60 @@ transmit_download_request (void *cls, dc->th = NULL; if (NULL == buf) - { + { #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting download request failed, trying to reconnect\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting download request failed, trying to reconnect\n"); #endif - try_reconnect (dc); - return 0; - } + try_reconnect (dc); + return 0; + } GNUNET_assert (size >= sizeof (struct SearchMessage)); msize = 0; sm = buf; - while ( (NULL != (dr = dc->pending_head)) && - (size >= msize + sizeof (struct SearchMessage)) ) - { + while ((NULL != (dr = dc->pending_head)) && + (size >= msize + sizeof (struct SearchMessage))) + { #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Transmitting download request for `%s' to `%s'-service\n", - GNUNET_h2s (&dr->chk.query), - "FS"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Transmitting download request for `%s' to `%s'-service\n", + GNUNET_h2s (&dr->chk.query), "FS"); #endif - memset (sm, 0, sizeof (struct SearchMessage)); - sm->header.size = htons (sizeof (struct SearchMessage)); - sm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_START_SEARCH); - if (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_LOOPBACK_ONLY)) - sm->options = htonl (1); - else - sm->options = htonl (0); - if (dr->depth == 0) - sm->type = htonl (GNUNET_BLOCK_TYPE_FS_DBLOCK); - else - sm->type = htonl (GNUNET_BLOCK_TYPE_FS_IBLOCK); - sm->anonymity_level = htonl (dc->anonymity); - sm->target = dc->target.hashPubKey; - sm->query = dr->chk.query; - GNUNET_CONTAINER_DLL_remove (dc->pending_head, - dc->pending_tail, - dr); - dr->is_pending = GNUNET_NO; - msize += sizeof (struct SearchMessage); - sm++; - } + memset (sm, 0, sizeof (struct SearchMessage)); + sm->header.size = htons (sizeof (struct SearchMessage)); + sm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_START_SEARCH); + if (0 != (dc->options & GNUNET_FS_DOWNLOAD_OPTION_LOOPBACK_ONLY)) + sm->options = htonl (1); + else + sm->options = htonl (0); + if (dr->depth == 0) + sm->type = htonl (GNUNET_BLOCK_TYPE_FS_DBLOCK); + else + sm->type = htonl (GNUNET_BLOCK_TYPE_FS_IBLOCK); + sm->anonymity_level = htonl (dc->anonymity); + sm->target = dc->target.hashPubKey; + sm->query = dr->chk.query; + GNUNET_CONTAINER_DLL_remove (dc->pending_head, dc->pending_tail, dr); + dr->is_pending = GNUNET_NO; + msize += sizeof (struct SearchMessage); + sm++; + } if (dc->pending_head != NULL) - { - dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client, - sizeof (struct SearchMessage), - GNUNET_CONSTANTS_SERVICE_TIMEOUT, - GNUNET_NO, - &transmit_download_request, - dc); - GNUNET_assert (dc->th != NULL); - } + { + dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client, + sizeof (struct SearchMessage), + GNUNET_CONSTANTS_SERVICE_TIMEOUT, + GNUNET_NO, + &transmit_download_request, + dc); + GNUNET_assert (dc->th != NULL); + } if (GNUNET_NO == dc->in_receive) - { - dc->in_receive = GNUNET_YES; - GNUNET_CLIENT_receive (dc->client, - &receive_results, - dc, - GNUNET_TIME_UNIT_FOREVER_REL); - } + { + dc->in_receive = GNUNET_YES; + GNUNET_CLIENT_receive (dc->client, + &receive_results, dc, GNUNET_TIME_UNIT_FOREVER_REL); + } return msize; } @@ -1479,34 +1340,31 @@ transmit_download_request (void *cls, * @param tc unused */ static void -do_reconnect (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +do_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_CLIENT_Connection *client; - + dc->task = GNUNET_SCHEDULER_NO_TASK; - client = GNUNET_CLIENT_connect ("fs", - dc->h->cfg); + client = GNUNET_CLIENT_connect ("fs", dc->h->cfg); if (NULL == client) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - "Connecting to `%s'-service failed, will try again.\n", - "FS"); - try_reconnect (dc); - return; - } + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + "Connecting to `%s'-service failed, will try again.\n", "FS"); + try_reconnect (dc); + return; + } dc->client = client; if (dc->pending_head != NULL) - { - dc->th = GNUNET_CLIENT_notify_transmit_ready (client, - sizeof (struct SearchMessage), - GNUNET_CONSTANTS_SERVICE_TIMEOUT, - GNUNET_NO, - &transmit_download_request, - dc); - GNUNET_assert (dc->th != NULL); - } + { + dc->th = GNUNET_CLIENT_notify_transmit_ready (client, + sizeof (struct SearchMessage), + GNUNET_CONSTANTS_SERVICE_TIMEOUT, + GNUNET_NO, + &transmit_download_request, + dc); + GNUNET_assert (dc->th != NULL); + } } @@ -1519,18 +1377,14 @@ do_reconnect (void *cls, * @return GNUNET_OK */ static int -retry_entry (void *cls, - const GNUNET_HashCode *key, - void *entry) +retry_entry (void *cls, const GNUNET_HashCode * key, void *entry) { struct GNUNET_FS_DownloadContext *dc = cls; struct DownloadRequest *dr = entry; dr->next = NULL; dr->prev = NULL; - GNUNET_CONTAINER_DLL_insert (dc->pending_head, - dc->pending_tail, - dr); + GNUNET_CONTAINER_DLL_insert (dc->pending_head, dc->pending_tail, dr); dr->is_pending = GNUNET_YES; return GNUNET_OK; } @@ -1546,36 +1400,32 @@ retry_entry (void *cls, static void try_reconnect (struct GNUNET_FS_DownloadContext *dc) { - + if (NULL != dc->client) - { + { #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Moving all requests back to pending list\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Moving all requests back to pending list\n"); #endif - if (NULL != dc->th) - { - GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); - dc->th = NULL; - } - /* full reset of the pending list */ - dc->pending_head = NULL; - dc->pending_tail = NULL; - GNUNET_CONTAINER_multihashmap_iterate (dc->active, - &retry_entry, - dc); - GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO); - dc->in_receive = GNUNET_NO; - dc->client = NULL; + if (NULL != dc->th) + { + GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); + dc->th = NULL; } + /* full reset of the pending list */ + dc->pending_head = NULL; + dc->pending_tail = NULL; + GNUNET_CONTAINER_multihashmap_iterate (dc->active, &retry_entry, dc); + GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO); + dc->in_receive = GNUNET_NO; + dc->client = NULL; + } #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Will try to reconnect in 1s\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will try to reconnect in 1s\n"); #endif dc->task - = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, - &do_reconnect, - dc); + = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, + &do_reconnect, dc); } @@ -1586,15 +1436,13 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc) * @param client handle to use for communcation with FS (we must destroy it!) */ static void -activate_fs_download (void *cls, - struct GNUNET_CLIENT_Connection *client) +activate_fs_download (void *cls, struct GNUNET_CLIENT_Connection *client) { struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_FS_ProgressInfo pi; #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Download activated\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download activated\n"); #endif GNUNET_assert (NULL != client); GNUNET_assert (dc->client == NULL); @@ -1604,23 +1452,21 @@ activate_fs_download (void *cls, GNUNET_FS_download_make_status_ (&pi, dc); dc->pending_head = NULL; dc->pending_tail = NULL; - GNUNET_CONTAINER_multihashmap_iterate (dc->active, - &retry_entry, - dc); + GNUNET_CONTAINER_multihashmap_iterate (dc->active, &retry_entry, dc); #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Asking for transmission to FS service\n"); + "Asking for transmission to FS service\n"); #endif if (dc->pending_head != NULL) - { - dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client, - sizeof (struct SearchMessage), - GNUNET_CONSTANTS_SERVICE_TIMEOUT, - GNUNET_NO, - &transmit_download_request, - dc); - GNUNET_assert (dc->th != NULL); - } + { + dc->th = GNUNET_CLIENT_notify_transmit_ready (dc->client, + sizeof (struct SearchMessage), + GNUNET_CONSTANTS_SERVICE_TIMEOUT, + GNUNET_NO, + &transmit_download_request, + dc); + GNUNET_assert (dc->th != NULL); + } } @@ -1636,20 +1482,19 @@ deactivate_fs_download (void *cls) struct GNUNET_FS_ProgressInfo pi; #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Download deactivated\n"); -#endif + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Download deactivated\n"); +#endif if (NULL != dc->th) - { - GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); - dc->th = NULL; - } + { + GNUNET_CLIENT_notify_transmit_ready_cancel (dc->th); + dc->th = NULL; + } if (NULL != dc->client) - { - GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO); - dc->in_receive = GNUNET_NO; - dc->client = NULL; - } + { + GNUNET_CLIENT_disconnect (dc->client, GNUNET_NO); + dc->in_receive = GNUNET_NO; + dc->client = NULL; + } dc->pending_head = NULL; dc->pending_tail = NULL; pi.status = GNUNET_FS_STATUS_DOWNLOAD_INACTIVE; @@ -1677,54 +1522,55 @@ deactivate_fs_download (void *cls) */ static struct DownloadRequest * create_download_request (struct DownloadRequest *parent, - unsigned int depth, - uint64_t dr_offset, - uint64_t file_start_offset, - uint64_t desired_length) + unsigned int depth, + uint64_t dr_offset, + uint64_t file_start_offset, uint64_t desired_length) { struct DownloadRequest *dr; unsigned int i; unsigned int head_skip; uint64_t child_block_size; - + dr = GNUNET_malloc (sizeof (struct DownloadRequest)); dr->parent = parent; dr->depth = depth; dr->offset = dr_offset; if (depth > 0) - { - child_block_size = GNUNET_FS_tree_compute_tree_size (depth - 1); - - /* calculate how many blocks at this level are not interesting - from the start (rounded down), either because of the requested - file offset or because this IBlock is further along */ - if (dr_offset < file_start_offset) - head_skip = file_start_offset / child_block_size; - else - head_skip = dr_offset / child_block_size; - - /* calculate index of last block at this level that is interesting (rounded up) */ - dr->num_children = file_start_offset + desired_length / child_block_size; - if (dr->num_children * child_block_size < file_start_offset + desired_length) - dr->num_children++; /* round up */ - - /* now we can get the total number of children for this block */ - dr->num_children -= head_skip; - if (dr->num_children > CHK_PER_INODE) - dr->num_children = CHK_PER_INODE; /* cap at max */ - - /* why else would we have gotten here to begin with? (that'd be a bad logic error) */ - GNUNET_assert (dr->num_children > 0); - - dr->children = GNUNET_malloc (dr->num_children * - sizeof (struct DownloadRequest *)); - for (i=0;i<dr->num_children;i++) - dr->children[i] = create_download_request (dr, - depth - 1, - dr_offset + i * child_block_size, - file_start_offset, - desired_length); - } + { + child_block_size = GNUNET_FS_tree_compute_tree_size (depth - 1); + + /* calculate how many blocks at this level are not interesting + * from the start (rounded down), either because of the requested + * file offset or because this IBlock is further along */ + if (dr_offset < file_start_offset) + head_skip = file_start_offset / child_block_size; + else + head_skip = dr_offset / child_block_size; + + /* calculate index of last block at this level that is interesting (rounded up) */ + dr->num_children = file_start_offset + desired_length / child_block_size; + if (dr->num_children * child_block_size < + file_start_offset + desired_length) + dr->num_children++; /* round up */ + + /* now we can get the total number of children for this block */ + dr->num_children -= head_skip; + if (dr->num_children > CHK_PER_INODE) + dr->num_children = CHK_PER_INODE; /* cap at max */ + + /* why else would we have gotten here to begin with? (that'd be a bad logic error) */ + GNUNET_assert (dr->num_children > 0); + + dr->children = GNUNET_malloc (dr->num_children * + sizeof (struct DownloadRequest *)); + for (i = 0; i < dr->num_children; i++) + dr->children[i] = create_download_request (dr, + depth - 1, + dr_offset + + i * child_block_size, + file_start_offset, + desired_length); + } return dr; } @@ -1737,30 +1583,28 @@ create_download_request (struct DownloadRequest *parent, * @param tc scheduler context */ static void -reconstruct_cont (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +reconstruct_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_DownloadContext *dc = cls; /* clean up state from tree encoder */ if (dc->te != NULL) - { - GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); - dc->te = NULL; - } + { + GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); + dc->te = NULL; + } if (dc->task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (dc->task); - dc->task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (dc->task); + dc->task = GNUNET_SCHEDULER_NO_TASK; + } if (dc->rfh != NULL) - { - GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (dc->rfh)); - dc->rfh = NULL; - } + { + GNUNET_break (GNUNET_OK == GNUNET_DISK_file_close (dc->rfh)); + dc->rfh = NULL; + } /* start "normal" download */ - schedule_block_download (dc, - dc->top_request); + schedule_block_download (dc, dc->top_request); } @@ -1771,8 +1615,7 @@ reconstruct_cont (void *cls, * @param tc task context */ static void -get_next_block (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +get_next_block (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) { struct GNUNET_FS_DownloadContext *dc = cls; @@ -1799,14 +1642,13 @@ get_next_block (void *cls, * @param block the (encrypted) block * @param block_size size of block (in bytes) */ -static void +static void reconstruct_cb (void *cls, - const struct ContentHashKey *chk, - uint64_t offset, - unsigned int depth, - enum GNUNET_BLOCK_Type type, - const void *block, - uint16_t block_size) + const struct ContentHashKey *chk, + uint64_t offset, + unsigned int depth, + enum GNUNET_BLOCK_Type type, + const void *block, uint16_t block_size) { struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_FS_ProgressInfo pi; @@ -1817,67 +1659,62 @@ reconstruct_cb (void *cls, /* find corresponding request entry */ dr = dc->top_request; while (dr->depth > depth) - { - blen = GNUNET_FS_tree_compute_tree_size (dr->depth); - chld = (offset - dr->offset) / blen; - GNUNET_assert (chld < dr->num_children); - dr = dr->children[chld]; - } + { + blen = GNUNET_FS_tree_compute_tree_size (dr->depth); + chld = (offset - dr->offset) / blen; + GNUNET_assert (chld < dr->num_children); + dr = dr->children[chld]; + } switch (dr->state) - { - case BRS_INIT: - break; - case BRS_RECONSTRUCT_DOWN: - break; - case BRS_RECONSTRUCT_META_UP: - break; - case BRS_RECONSTRUCT_UP: - break; - case BRS_CHK_SET: - if (0 == memcmp (chk, - &dr->chk, - sizeof (struct ContentHashKey))) - { - /* block matches, hence tree below matches; - this request is done! */ - dr->state = BRS_DOWNLOAD_UP; - /* calculate how many bytes of payload this block - corresponds to */ - blen = GNUNET_FS_tree_compute_tree_size (dr->depth); - /* how many of those bytes are in the requested range? */ - blen = GNUNET_MIN (blen, - dc->length + dc->offset - dr->offset); - /* signal progress */ - dc->completed += blen; - pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS; - pi.value.download.specifics.progress.data = NULL; - pi.value.download.specifics.progress.offset = offset; - pi.value.download.specifics.progress.data_len = 0; - pi.value.download.specifics.progress.depth = 0; - GNUNET_FS_download_make_status_ (&pi, dc); - } - else - { - } - break; - case BRS_DOWNLOAD_DOWN: - break; - case BRS_DOWNLOAD_UP: - break; - case BRS_ERROR: - break; - default: - GNUNET_assert (0); - break; - } - if ( (dr == dc->top_request) && - (dr->state == BRS_DOWNLOAD_UP) ) - { - check_completed (dc); - return; + { + case BRS_INIT: + break; + case BRS_RECONSTRUCT_DOWN: + break; + case BRS_RECONSTRUCT_META_UP: + break; + case BRS_RECONSTRUCT_UP: + break; + case BRS_CHK_SET: + if (0 == memcmp (chk, &dr->chk, sizeof (struct ContentHashKey))) + { + /* block matches, hence tree below matches; + * this request is done! */ + dr->state = BRS_DOWNLOAD_UP; + /* calculate how many bytes of payload this block + * corresponds to */ + blen = GNUNET_FS_tree_compute_tree_size (dr->depth); + /* how many of those bytes are in the requested range? */ + blen = GNUNET_MIN (blen, dc->length + dc->offset - dr->offset); + /* signal progress */ + dc->completed += blen; + pi.status = GNUNET_FS_STATUS_DOWNLOAD_PROGRESS; + pi.value.download.specifics.progress.data = NULL; + pi.value.download.specifics.progress.offset = offset; + pi.value.download.specifics.progress.data_len = 0; + pi.value.download.specifics.progress.depth = 0; + GNUNET_FS_download_make_status_ (&pi, dc); } - dc->task = GNUNET_SCHEDULER_add_now (&get_next_block, - dc); + else + { + } + break; + case BRS_DOWNLOAD_DOWN: + break; + case BRS_DOWNLOAD_UP: + break; + case BRS_ERROR: + break; + default: + GNUNET_assert (0); + break; + } + if ((dr == dc->top_request) && (dr->state == BRS_DOWNLOAD_UP)) + { + check_completed (dc); + return; + } + dc->task = GNUNET_SCHEDULER_add_now (&get_next_block, dc); } @@ -1894,31 +1731,24 @@ reconstruct_cb (void *cls, * @return number of bytes copied to buf, 0 on error */ static size_t -fh_reader (void *cls, - uint64_t offset, - size_t max, - void *buf, - char **emsg) +fh_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg) { struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_DISK_FileHandle *fh = dc->rfh; ssize_t ret; *emsg = NULL; - if (offset != - GNUNET_DISK_file_seek (fh, - offset, - GNUNET_DISK_SEEK_SET)) - { - *emsg = GNUNET_strdup (strerror (errno)); - return 0; - } + if (offset != GNUNET_DISK_file_seek (fh, offset, GNUNET_DISK_SEEK_SET)) + { + *emsg = GNUNET_strdup (strerror (errno)); + return 0; + } ret = GNUNET_DISK_file_read (fh, buf, max); if (ret < 0) - { - *emsg = GNUNET_strdup (strerror (errno)); - return 0; - } + { + *emsg = GNUNET_strdup (strerror (errno)); + return 0; + } return ret; } @@ -1932,149 +1762,141 @@ fh_reader (void *cls, */ void GNUNET_FS_download_start_task_ (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) + const struct GNUNET_SCHEDULER_TaskContext *tc) { - struct GNUNET_FS_DownloadContext *dc = cls; + struct GNUNET_FS_DownloadContext *dc = cls; struct GNUNET_FS_ProgressInfo pi; struct GNUNET_DISK_FileHandle *fh; #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Start task running...\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start task running...\n"); #endif dc->task = GNUNET_SCHEDULER_NO_TASK; if (dc->length == 0) - { - /* no bytes required! */ - if (dc->filename != NULL) - { - fh = GNUNET_DISK_file_open (dc->filename, - GNUNET_DISK_OPEN_READWRITE | - GNUNET_DISK_OPEN_CREATE | - ( (0 == GNUNET_FS_uri_chk_get_file_size (dc->uri)) - ? GNUNET_DISK_OPEN_TRUNCATE : 0), - GNUNET_DISK_PERM_USER_READ | - GNUNET_DISK_PERM_USER_WRITE | - GNUNET_DISK_PERM_GROUP_READ | - GNUNET_DISK_PERM_OTHER_READ); - GNUNET_DISK_file_close (fh); - } - GNUNET_FS_download_sync_ (dc); - check_completed (dc); - return; + { + /* no bytes required! */ + if (dc->filename != NULL) + { + fh = GNUNET_DISK_file_open (dc->filename, + GNUNET_DISK_OPEN_READWRITE | + GNUNET_DISK_OPEN_CREATE | + ((0 == + GNUNET_FS_uri_chk_get_file_size (dc->uri)) ? + GNUNET_DISK_OPEN_TRUNCATE : 0), + GNUNET_DISK_PERM_USER_READ | + GNUNET_DISK_PERM_USER_WRITE | + GNUNET_DISK_PERM_GROUP_READ | + GNUNET_DISK_PERM_OTHER_READ); + GNUNET_DISK_file_close (fh); } - if (dc->emsg != NULL) + GNUNET_FS_download_sync_ (dc); + check_completed (dc); + return; + } + if (dc->emsg != NULL) return; if (dc->top_request == NULL) - { - dc->top_request = create_download_request (NULL, dc->treedepth - 1, 0, - dc->offset, dc->length); - dc->top_request->state = BRS_CHK_SET; - dc->top_request->chk = (dc->uri->type == chk) - ? dc->uri->data.chk.chk - : dc->uri->data.loc.fi.chk; - /* signal start */ - GNUNET_FS_download_sync_ (dc); - pi.status = GNUNET_FS_STATUS_DOWNLOAD_START; - pi.value.download.specifics.start.meta = dc->meta; - GNUNET_FS_download_make_status_ (&pi, dc); - } + { + dc->top_request = create_download_request (NULL, dc->treedepth - 1, 0, + dc->offset, dc->length); + dc->top_request->state = BRS_CHK_SET; + dc->top_request->chk = (dc->uri->type == chk) + ? dc->uri->data.chk.chk : dc->uri->data.loc.fi.chk; + /* signal start */ + GNUNET_FS_download_sync_ (dc); + pi.status = GNUNET_FS_STATUS_DOWNLOAD_START; + pi.value.download.specifics.start.meta = dc->meta; + GNUNET_FS_download_make_status_ (&pi, dc); + } GNUNET_FS_download_start_downloading_ (dc); /* attempt reconstruction from disk */ - if (GNUNET_YES == GNUNET_DISK_file_test (dc->filename)) + if (GNUNET_YES == GNUNET_DISK_file_test (dc->filename)) dc->rfh = GNUNET_DISK_file_open (dc->filename, - GNUNET_DISK_OPEN_READ, - GNUNET_DISK_PERM_NONE); + GNUNET_DISK_OPEN_READ, + GNUNET_DISK_PERM_NONE); if (dc->top_request->state == BRS_CHK_SET) + { + if (dc->rfh != NULL) { - if (dc->rfh != NULL) - { - /* first, try top-down */ + /* first, try top-down */ #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Trying top-down reconstruction for `%s'\n", - dc->filename); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Trying top-down reconstruction for `%s'\n", dc->filename); #endif - try_top_down_reconstruction (dc, dc->top_request); - switch (dc->top_request->state) - { - case BRS_CHK_SET: - break; /* normal */ - case BRS_DOWNLOAD_DOWN: - break; /* normal, some blocks already down */ - case BRS_DOWNLOAD_UP: - /* already done entirely, party! */ - if (dc->rfh != NULL) - { - /* avoid hanging on to file handle longer than - necessary */ - GNUNET_DISK_file_close (dc->rfh); - dc->rfh = NULL; - } - return; - case BRS_ERROR: - GNUNET_asprintf (&dc->emsg, - _("Invalid URI")); - GNUNET_FS_download_sync_ (dc); - pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; - pi.value.download.specifics.error.message = dc->emsg; - GNUNET_FS_download_make_status_ (&pi, dc); - return; - default: - GNUNET_assert (0); - break; - } - } - } + try_top_down_reconstruction (dc, dc->top_request); + switch (dc->top_request->state) + { + case BRS_CHK_SET: + break; /* normal */ + case BRS_DOWNLOAD_DOWN: + break; /* normal, some blocks already down */ + case BRS_DOWNLOAD_UP: + /* already done entirely, party! */ + if (dc->rfh != NULL) + { + /* avoid hanging on to file handle longer than + * necessary */ + GNUNET_DISK_file_close (dc->rfh); + dc->rfh = NULL; + } + return; + case BRS_ERROR: + GNUNET_asprintf (&dc->emsg, _("Invalid URI")); + GNUNET_FS_download_sync_ (dc); + pi.status = GNUNET_FS_STATUS_DOWNLOAD_ERROR; + pi.value.download.specifics.error.message = dc->emsg; + GNUNET_FS_download_make_status_ (&pi, dc); + return; + default: + GNUNET_assert (0); + break; + } + } + } /* attempt reconstruction from meta data */ - if ( (GNUNET_FS_uri_chk_get_file_size (dc->uri) <= MAX_INLINE_SIZE) && - (NULL != dc->meta) ) - { + if ((GNUNET_FS_uri_chk_get_file_size (dc->uri) <= MAX_INLINE_SIZE) && + (NULL != dc->meta)) + { #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Trying to find embedded meta data for download of size %llu with %u bytes MD\n", - (unsigned long long) GNUNET_FS_uri_chk_get_file_size (dc->uri), - (unsigned int) GNUNET_CONTAINER_meta_data_get_serialized_size (dc->meta)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Trying to find embedded meta data for download of size %llu with %u bytes MD\n", + (unsigned long long) GNUNET_FS_uri_chk_get_file_size (dc->uri), + (unsigned int) + GNUNET_CONTAINER_meta_data_get_serialized_size (dc->meta)); #endif - GNUNET_CONTAINER_meta_data_iterate (dc->meta, - &match_full_data, - dc); - if (dc->top_request->state == BRS_DOWNLOAD_UP) - { - if (dc->rfh != NULL) - { - /* avoid hanging on to file handle longer than - necessary */ - GNUNET_DISK_file_close (dc->rfh); - dc->rfh = NULL; - } - return; /* finished, status update was already done for us */ - } - } - if (dc->rfh != NULL) + GNUNET_CONTAINER_meta_data_iterate (dc->meta, &match_full_data, dc); + if (dc->top_request->state == BRS_DOWNLOAD_UP) { - /* finally, try bottom-up */ + if (dc->rfh != NULL) + { + /* avoid hanging on to file handle longer than + * necessary */ + GNUNET_DISK_file_close (dc->rfh); + dc->rfh = NULL; + } + return; /* finished, status update was already done for us */ + } + } + if (dc->rfh != NULL) + { + /* finally, try bottom-up */ #if DEBUG_DOWNLOAD - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Trying bottom-up reconstruction of file `%s'\n", - dc->filename); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Trying bottom-up reconstruction of file `%s'\n", dc->filename); #endif - dc->te = GNUNET_FS_tree_encoder_create (dc->h, - dc->old_file_size, - dc, - &fh_reader, - &reconstruct_cb, - NULL, - &reconstruct_cont); - dc->task = GNUNET_SCHEDULER_add_now (&get_next_block, - dc); - } + dc->te = GNUNET_FS_tree_encoder_create (dc->h, + dc->old_file_size, + dc, + &fh_reader, + &reconstruct_cb, + NULL, &reconstruct_cont); + dc->task = GNUNET_SCHEDULER_add_now (&get_next_block, dc); + } else - { - /* simple, top-level download */ - schedule_block_download (dc, - dc->top_request); - } + { + /* simple, top-level download */ + schedule_block_download (dc, dc->top_request); + } if (dc->top_request->state == BRS_DOWNLOAD_UP) check_completed (dc); } @@ -2095,44 +1917,43 @@ GNUNET_FS_download_signal_suspend_ (void *cls) if (dc->top != NULL) GNUNET_FS_end_top (dc->h, dc->top); while (NULL != dc->child_head) - GNUNET_FS_download_signal_suspend_ (dc->child_head); + GNUNET_FS_download_signal_suspend_ (dc->child_head); if (dc->search != NULL) - { - dc->search->download = NULL; - dc->search = NULL; - } + { + dc->search->download = NULL; + dc->search = NULL; + } if (dc->job_queue != NULL) - { - GNUNET_FS_dequeue_ (dc->job_queue); - dc->job_queue = NULL; - } + { + GNUNET_FS_dequeue_ (dc->job_queue); + dc->job_queue = NULL; + } if (dc->parent != NULL) GNUNET_CONTAINER_DLL_remove (dc->parent->child_head, - dc->parent->child_tail, - dc); + dc->parent->child_tail, dc); if (dc->task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (dc->task); - dc->task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (dc->task); + dc->task = GNUNET_SCHEDULER_NO_TASK; + } pi.status = GNUNET_FS_STATUS_DOWNLOAD_SUSPEND; GNUNET_FS_download_make_status_ (&pi, dc); if (dc->te != NULL) - { - GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); - dc->te = NULL; - } + { + GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); + dc->te = NULL; + } if (dc->rfh != NULL) - { - GNUNET_DISK_file_close (dc->rfh); - dc->rfh = NULL; - } + { + GNUNET_DISK_file_close (dc->rfh); + dc->rfh = NULL; + } GNUNET_FS_free_download_request_ (dc->top_request); if (dc->active != NULL) - { - GNUNET_CONTAINER_multihashmap_destroy (dc->active); - dc->active = NULL; - } + { + GNUNET_CONTAINER_multihashmap_destroy (dc->active); + dc->active = NULL; + } GNUNET_free_non_null (dc->filename); GNUNET_CONTAINER_meta_data_destroy (dc->meta); GNUNET_FS_uri_destroy (dc->uri); @@ -2174,87 +1995,77 @@ GNUNET_FS_download_signal_suspend_ (void *cls) */ struct GNUNET_FS_DownloadContext * GNUNET_FS_download_start (struct GNUNET_FS_Handle *h, - const struct GNUNET_FS_Uri *uri, - const struct GNUNET_CONTAINER_MetaData *meta, - const char *filename, - const char *tempname, - uint64_t offset, - uint64_t length, - uint32_t anonymity, - enum GNUNET_FS_DownloadOptions options, - void *cctx, - struct GNUNET_FS_DownloadContext *parent) + const struct GNUNET_FS_Uri *uri, + const struct GNUNET_CONTAINER_MetaData *meta, + const char *filename, + const char *tempname, + uint64_t offset, + uint64_t length, + uint32_t anonymity, + enum GNUNET_FS_DownloadOptions options, + void *cctx, struct GNUNET_FS_DownloadContext *parent) { struct GNUNET_FS_DownloadContext *dc; - GNUNET_assert (GNUNET_FS_uri_test_chk (uri) || - GNUNET_FS_uri_test_loc (uri) ); - - if ( (offset + length < offset) || - (offset + length > GNUNET_FS_uri_chk_get_file_size (uri)) ) - { - GNUNET_break (0); - return NULL; - } + GNUNET_assert (GNUNET_FS_uri_test_chk (uri) || GNUNET_FS_uri_test_loc (uri)); + + if ((offset + length < offset) || + (offset + length > GNUNET_FS_uri_chk_get_file_size (uri))) + { + GNUNET_break (0); + return NULL; + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Starting download `%s' of %llu bytes\n", - filename, - (unsigned long long) length); + "Starting download `%s' of %llu bytes\n", + filename, (unsigned long long) length); #endif - dc = GNUNET_malloc (sizeof(struct GNUNET_FS_DownloadContext)); + dc = GNUNET_malloc (sizeof (struct GNUNET_FS_DownloadContext)); dc->h = h; dc->parent = parent; if (parent != NULL) - { - GNUNET_CONTAINER_DLL_insert (parent->child_head, - parent->child_tail, - dc); - } + { + GNUNET_CONTAINER_DLL_insert (parent->child_head, parent->child_tail, dc); + } dc->uri = GNUNET_FS_uri_dup (uri); dc->meta = GNUNET_CONTAINER_meta_data_duplicate (meta); dc->client_info = cctx; dc->start_time = GNUNET_TIME_absolute_get (); if (NULL != filename) - { - dc->filename = GNUNET_strdup (filename); - if (GNUNET_YES == GNUNET_DISK_file_test (filename)) - GNUNET_DISK_file_size (filename, - &dc->old_file_size, - GNUNET_YES); - } + { + dc->filename = GNUNET_strdup (filename); + if (GNUNET_YES == GNUNET_DISK_file_test (filename)) + GNUNET_DISK_file_size (filename, &dc->old_file_size, GNUNET_YES); + } if (GNUNET_FS_uri_test_loc (dc->uri)) GNUNET_assert (GNUNET_OK == - GNUNET_FS_uri_loc_get_peer_identity (dc->uri, - &dc->target)); + GNUNET_FS_uri_loc_get_peer_identity (dc->uri, &dc->target)); dc->offset = offset; dc->length = length; dc->anonymity = anonymity; dc->options = options; - dc->active = GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE)); - dc->treedepth = GNUNET_FS_compute_depth (GNUNET_FS_uri_chk_get_file_size(dc->uri)); - if ( (filename == NULL) && - (is_recursive_download (dc) ) ) - { - if (tempname != NULL) - dc->temp_filename = GNUNET_strdup (tempname); - else - dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp"); - } + dc->active = + GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE)); + dc->treedepth = + GNUNET_FS_compute_depth (GNUNET_FS_uri_chk_get_file_size (dc->uri)); + if ((filename == NULL) && (is_recursive_download (dc))) + { + if (tempname != NULL) + dc->temp_filename = GNUNET_strdup (tempname); + else + dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp"); + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Download tree has depth %u\n", - dc->treedepth); + "Download tree has depth %u\n", dc->treedepth); #endif if (parent == NULL) - { - dc->top = GNUNET_FS_make_top (dc->h, - &GNUNET_FS_download_signal_suspend_, - dc); - } - dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, - dc); + { + dc->top = GNUNET_FS_make_top (dc->h, + &GNUNET_FS_download_signal_suspend_, dc); + } + dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, dc); return dc; } @@ -2295,85 +2106,79 @@ GNUNET_FS_download_start (struct GNUNET_FS_Handle *h, */ struct GNUNET_FS_DownloadContext * GNUNET_FS_download_start_from_search (struct GNUNET_FS_Handle *h, - struct GNUNET_FS_SearchResult *sr, - const char *filename, - const char *tempname, - uint64_t offset, - uint64_t length, - uint32_t anonymity, - enum GNUNET_FS_DownloadOptions options, - void *cctx) + struct GNUNET_FS_SearchResult *sr, + const char *filename, + const char *tempname, + uint64_t offset, + uint64_t length, + uint32_t anonymity, + enum GNUNET_FS_DownloadOptions options, + void *cctx) { struct GNUNET_FS_DownloadContext *dc; - if ( (sr == NULL) || - (sr->download != NULL) ) - { - GNUNET_break (0); - return NULL; - } + if ((sr == NULL) || (sr->download != NULL)) + { + GNUNET_break (0); + return NULL; + } GNUNET_assert (GNUNET_FS_uri_test_chk (sr->uri) || - GNUNET_FS_uri_test_loc (sr->uri) ); - if ( (offset + length < offset) || - (offset + length > sr->uri->data.chk.file_length) ) - { - GNUNET_break (0); - return NULL; - } + GNUNET_FS_uri_test_loc (sr->uri)); + if ((offset + length < offset) || + (offset + length > sr->uri->data.chk.file_length)) + { + GNUNET_break (0); + return NULL; + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Starting download `%s' of %llu bytes\n", - filename, - (unsigned long long) length); + "Starting download `%s' of %llu bytes\n", + filename, (unsigned long long) length); #endif - dc = GNUNET_malloc (sizeof(struct GNUNET_FS_DownloadContext)); + dc = GNUNET_malloc (sizeof (struct GNUNET_FS_DownloadContext)); dc->h = h; dc->search = sr; sr->download = dc; if (sr->probe_ctx != NULL) - { - GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES); - sr->probe_ctx = NULL; - } + { + GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES); + sr->probe_ctx = NULL; + } dc->uri = GNUNET_FS_uri_dup (sr->uri); dc->meta = GNUNET_CONTAINER_meta_data_duplicate (sr->meta); dc->client_info = cctx; dc->start_time = GNUNET_TIME_absolute_get (); if (NULL != filename) - { - dc->filename = GNUNET_strdup (filename); - if (GNUNET_YES == GNUNET_DISK_file_test (filename)) - GNUNET_DISK_file_size (filename, - &dc->old_file_size, - GNUNET_YES); - } + { + dc->filename = GNUNET_strdup (filename); + if (GNUNET_YES == GNUNET_DISK_file_test (filename)) + GNUNET_DISK_file_size (filename, &dc->old_file_size, GNUNET_YES); + } if (GNUNET_FS_uri_test_loc (dc->uri)) GNUNET_assert (GNUNET_OK == - GNUNET_FS_uri_loc_get_peer_identity (dc->uri, - &dc->target)); + GNUNET_FS_uri_loc_get_peer_identity (dc->uri, &dc->target)); dc->offset = offset; dc->length = length; dc->anonymity = anonymity; dc->options = options; - dc->active = GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE)); - dc->treedepth = GNUNET_FS_compute_depth (GNUNET_ntohll(dc->uri->data.chk.file_length)); - if ( (filename == NULL) && - (is_recursive_download (dc) ) ) - { - if (tempname != NULL) - dc->temp_filename = GNUNET_strdup (tempname); - else - dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp"); - } + dc->active = + GNUNET_CONTAINER_multihashmap_create (1 + 2 * (length / DBLOCK_SIZE)); + dc->treedepth = + GNUNET_FS_compute_depth (GNUNET_ntohll (dc->uri->data.chk.file_length)); + if ((filename == NULL) && (is_recursive_download (dc))) + { + if (tempname != NULL) + dc->temp_filename = GNUNET_strdup (tempname); + else + dc->temp_filename = GNUNET_DISK_mktemp ("gnunet-directory-download-tmp"); + } #if DEBUG_DOWNLOAD GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Download tree has depth %u\n", - dc->treedepth); + "Download tree has depth %u\n", dc->treedepth); #endif - dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, - dc); - return dc; + dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, dc); + return dc; } @@ -2388,11 +2193,12 @@ GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc) if (dc->completed == dc->length) return; GNUNET_assert (dc->job_queue == NULL); - dc->job_queue = GNUNET_FS_queue_ (dc->h, - &activate_fs_download, - &deactivate_fs_download, - dc, - (dc->length + DBLOCK_SIZE-1) / DBLOCK_SIZE); + dc->job_queue = GNUNET_FS_queue_ (dc->h, + &activate_fs_download, + &deactivate_fs_download, + dc, + (dc->length + DBLOCK_SIZE - + 1) / DBLOCK_SIZE); } @@ -2403,8 +2209,7 @@ GNUNET_FS_download_start_downloading_ (struct GNUNET_FS_DownloadContext *dc) * @param do_delete delete files of incomplete downloads */ void -GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, - int do_delete) +GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete) { struct GNUNET_FS_ProgressInfo pi; int have_children; @@ -2414,77 +2219,71 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, if (dc->task != GNUNET_SCHEDULER_NO_TASK) - { - GNUNET_SCHEDULER_cancel (dc->task); - dc->task = GNUNET_SCHEDULER_NO_TASK; - } + { + GNUNET_SCHEDULER_cancel (dc->task); + dc->task = GNUNET_SCHEDULER_NO_TASK; + } if (dc->search != NULL) - { - dc->search->download = NULL; - dc->search = NULL; - } + { + dc->search->download = NULL; + dc->search = NULL; + } if (dc->job_queue != NULL) - { - GNUNET_FS_dequeue_ (dc->job_queue); - dc->job_queue = NULL; - } + { + GNUNET_FS_dequeue_ (dc->job_queue); + dc->job_queue = NULL; + } if (dc->te != NULL) - { - GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); - dc->te = NULL; - } + { + GNUNET_FS_tree_encoder_finish (dc->te, NULL, NULL); + dc->te = NULL; + } have_children = (NULL != dc->child_head) ? GNUNET_YES : GNUNET_NO; while (NULL != dc->child_head) - GNUNET_FS_download_stop (dc->child_head, - do_delete); + GNUNET_FS_download_stop (dc->child_head, do_delete); if (dc->parent != NULL) GNUNET_CONTAINER_DLL_remove (dc->parent->child_head, - dc->parent->child_tail, - dc); + dc->parent->child_tail, dc); if (dc->serialization != NULL) GNUNET_FS_remove_sync_file_ (dc->h, - ( (dc->parent != NULL) || (dc->search != NULL) ) - ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD - : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD , - dc->serialization); - if ( (GNUNET_YES == have_children) && - (dc->parent == NULL) ) - GNUNET_FS_remove_sync_dir_ (dc->h, - (dc->search != NULL) - ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD - : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, - dc->serialization); + ((dc->parent != NULL) || (dc->search != NULL)) + ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD + : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, + dc->serialization); + if ((GNUNET_YES == have_children) && (dc->parent == NULL)) + GNUNET_FS_remove_sync_dir_ (dc->h, + (dc->search != NULL) + ? GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD + : GNUNET_FS_SYNC_PATH_MASTER_DOWNLOAD, + dc->serialization); pi.status = GNUNET_FS_STATUS_DOWNLOAD_STOPPED; GNUNET_FS_download_make_status_ (&pi, dc); GNUNET_FS_free_download_request_ (dc->top_request); dc->top_request = NULL; if (dc->active != NULL) - { - GNUNET_CONTAINER_multihashmap_destroy (dc->active); - dc->active = NULL; - } + { + GNUNET_CONTAINER_multihashmap_destroy (dc->active); + dc->active = NULL; + } if (dc->filename != NULL) + { + if ((dc->completed != dc->length) && (GNUNET_YES == do_delete)) { - if ( (dc->completed != dc->length) && - (GNUNET_YES == do_delete) ) - { - if (0 != UNLINK (dc->filename)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, - "unlink", - dc->filename); - } - GNUNET_free (dc->filename); + if (0 != UNLINK (dc->filename)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, + "unlink", dc->filename); } + GNUNET_free (dc->filename); + } GNUNET_CONTAINER_meta_data_destroy (dc->meta); GNUNET_FS_uri_destroy (dc->uri); if (NULL != dc->temp_filename) - { - if (0 != UNLINK (dc->temp_filename)) - GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, - "unlink", - dc->temp_filename); - GNUNET_free (dc->temp_filename); - } + { + if (0 != UNLINK (dc->temp_filename)) + GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, + "unlink", dc->temp_filename); + GNUNET_free (dc->temp_filename); + } GNUNET_free_non_null (dc->serialization); GNUNET_free (dc); } |