X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ffs_publish.c;h=759467ba426c599eabf2d1119b9bffed2d45336a;hb=0d8487a744066dce7d097fb91ae0f965033c79ea;hp=167a6dc07e0388ae9b70cc64f87d3430f7928221;hpb=45729373b4b4ba643a90991503cac3da21a2796f;p=oweals%2Fgnunet.git diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c index 167a6dc07..759467ba4 100644 --- a/src/fs/fs_publish.c +++ b/src/fs/fs_publish.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009, 2010 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2010 GNUnet e.V. GNUnet is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published @@ -14,10 +14,9 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ - /** * @file fs/fs_publish.c * @brief publish a file or directory in GNUnet @@ -25,7 +24,6 @@ * @author Krista Bennett * @author Christian Grothoff */ - #include "platform.h" #include "gnunet_constants.h" #include "gnunet_signatures.h" @@ -57,13 +55,15 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi, pi->value.publish.pctx = (NULL == p->dir) ? NULL : p->dir->client_info; pi->value.publish.filename = p->filename; pi->value.publish.size = - (p->is_directory == GNUNET_YES) ? p->data.dir.dir_size : p->data.file.file_size; + (GNUNET_YES == p->is_directory) ? p->data.dir.dir_size : p->data.file.file_size; pi->value.publish.eta = - GNUNET_TIME_calculate_eta (p->start_time, offset, pi->value.publish.size); + GNUNET_TIME_calculate_eta (p->start_time, offset, + pi->value.publish.size); pi->value.publish.completed = offset; pi->value.publish.duration = GNUNET_TIME_absolute_get_duration (p->start_time); pi->value.publish.anonymity = p->bo.anonymity_level; + pi->fsh = pc->h; return pc->h->upcb (pc->h->upcb_cls, pi); } @@ -76,32 +76,28 @@ GNUNET_FS_publish_make_status_ (struct GNUNET_FS_ProgressInfo *pi, static void publish_cleanup (struct GNUNET_FS_PublishContext *pc) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up publish context (done!)\n"); - if (pc->fhc != NULL) + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Cleaning up publish context (done!)\n"); + if (NULL != pc->fhc) { GNUNET_CRYPTO_hash_file_cancel (pc->fhc); pc->fhc = NULL; } GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL); - if (pc->namespace != NULL) - { - GNUNET_FS_namespace_delete (pc->namespace, GNUNET_NO); - pc->namespace = NULL; - } GNUNET_free_non_null (pc->nid); GNUNET_free_non_null (pc->nuid); GNUNET_free_non_null (pc->serialization); - if (pc->dsh != NULL) + if (NULL != pc->dsh) { GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO); pc->dsh = NULL; } - if (pc->client != NULL) + if (NULL != pc->mq) { - GNUNET_CLIENT_disconnect (pc->client); - pc->client = NULL; + GNUNET_MQ_destroy (pc->mq); + pc->mq = NULL; } - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_assert (NULL == pc->upload_task); GNUNET_free (pc); } @@ -110,13 +106,14 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc) * Function called by the datastore API with * the result from the PUT request. * - * @param cls the 'struct GNUNET_FS_PublishContext' - * @param success GNUNET_OK on success + * @param cls the `struct GNUNET_FS_PublishContext *` + * @param success #GNUNET_OK on success * @param min_expiration minimum expiration time required for content to be stored * @param msg error message (or NULL) */ static void -ds_put_cont (void *cls, int success, +ds_put_cont (void *cls, + int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg) { @@ -126,21 +123,28 @@ ds_put_cont (void *cls, int success, pc->qre = NULL; if (GNUNET_SYSERR == success) { - GNUNET_asprintf (&pc->fi_pos->emsg, _("Publishing failed: %s"), msg); + GNUNET_asprintf (&pc->fi_pos->emsg, + _("Publishing failed: %s"), + msg); pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR; pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL; pi.value.publish.specifics.error.message = pc->fi_pos->emsg; pc->fi_pos->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, pc->fi_pos, 0); - if ((pc->fi_pos->is_directory != GNUNET_YES) && - (pc->fi_pos->filename != NULL) && - (pc->fi_pos->data.file.do_index == GNUNET_YES)) + if ((GNUNET_YES != pc->fi_pos->is_directory) && + (NULL != pc->fi_pos->filename) && + (GNUNET_YES == pc->any_done) && + (GNUNET_YES == pc->fi_pos->data.file.do_index)) { /* run unindex to clean up */ - GNUNET_FS_unindex_start (pc->h, pc->fi_pos->filename, NULL); + GNUNET_FS_unindex_start (pc->h, + pc->fi_pos->filename, + NULL); } + return; } - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + pc->any_done = GNUNET_YES; + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); @@ -164,10 +168,10 @@ signal_publish_completion (struct GNUNET_FS_FileInformation *p, pi.status = GNUNET_FS_STATUS_PUBLISH_COMPLETED; pi.value.publish.eta = GNUNET_TIME_UNIT_ZERO; pi.value.publish.specifics.completed.chk_uri = p->chk_uri; + pi.value.publish.specifics.completed.sks_uri = p->sks_uri; p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, - GNUNET_ntohll (p->chk_uri->data. - chk.file_length)); + p->data.file.file_size); } @@ -182,7 +186,8 @@ signal_publish_completion (struct GNUNET_FS_FileInformation *p, */ static void signal_publish_error (struct GNUNET_FS_FileInformation *p, - struct GNUNET_FS_PublishContext *pc, const char *emsg) + struct GNUNET_FS_PublishContext *pc, + const char *emsg) { struct GNUNET_FS_ProgressInfo pi; @@ -191,11 +196,15 @@ signal_publish_error (struct GNUNET_FS_FileInformation *p, pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL; pi.value.publish.specifics.error.message = emsg; p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0); - if ((p->is_directory != GNUNET_YES) && (p->filename != NULL) && + if ((p->is_directory != GNUNET_YES) && + (NULL != p->filename) && + (GNUNET_YES == pc->any_done) && (p->data.file.do_index == GNUNET_YES)) { /* run unindex to clean up */ - GNUNET_FS_unindex_start (pc->h, p->filename, NULL); + GNUNET_FS_unindex_start (pc->h, + p->filename, + NULL); } } @@ -204,20 +213,21 @@ signal_publish_error (struct GNUNET_FS_FileInformation *p, /** * Datastore returns from reservation cancel request. * - * @param cls the 'struct GNUNET_FS_PublishContext' + * @param cls the `struct GNUNET_FS_PublishContext *` * @param success success code (not used) * @param min_expiration minimum expiration time required for content to be stored * @param msg error message (typically NULL, not used) */ static void -finish_release_reserve (void *cls, int success, +finish_release_reserve (void *cls, int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg) { struct GNUNET_FS_PublishContext *pc = cls; pc->qre = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Releasing reserve done!\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Releasing reserve done!\n"); signal_publish_completion (pc->fi, pc); pc->all_done = GNUNET_YES; GNUNET_FS_publish_sync_ (pc); @@ -228,12 +238,13 @@ finish_release_reserve (void *cls, int success, * We've finished publishing the SBlock as part of a larger upload. * Check the result and complete the larger upload. * - * @param cls the "struct GNUNET_FS_PublishContext*" of the larger upload + * @param cls the `struct GNUNET_FS_PublishContext *` of the larger upload * @param uri URI of the published SBlock * @param emsg NULL on success, otherwise error message */ static void -publish_sblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, +publish_sblocks_cont (void *cls, + const struct GNUNET_FS_Uri *uri, const char *emsg) { struct GNUNET_FS_PublishContext *pc = cls; @@ -245,12 +256,16 @@ publish_sblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, GNUNET_FS_publish_sync_ (pc); return; } + if (NULL != uri) + { + /* sks publication, remember namespace URI */ + pc->fi->sks_uri = GNUNET_FS_uri_dup (uri); + } GNUNET_assert (pc->qre == NULL); if ((pc->dsh != NULL) && (pc->rid != 0)) { pc->qre = GNUNET_DATASTORE_release_reserve (pc->dsh, pc->rid, UINT_MAX, UINT_MAX, - GNUNET_TIME_UNIT_FOREVER_REL, &finish_release_reserve, pc); } else @@ -269,10 +284,16 @@ publish_sblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, static void publish_sblock (struct GNUNET_FS_PublishContext *pc) { - if (NULL != pc->namespace) - pc->sks_pc = GNUNET_FS_publish_sks (pc->h, pc->namespace, pc->nid, pc->nuid, - pc->fi->meta, pc->fi->chk_uri, &pc->fi->bo, - pc->options, &publish_sblocks_cont, pc); + if (NULL != pc->ns) + pc->sks_pc = GNUNET_FS_publish_sks (pc->h, + pc->ns, + pc->nid, + pc->nuid, + pc->fi->meta, + pc->fi->chk_uri, + &pc->fi->bo, + pc->options, + &publish_sblocks_cont, pc); else publish_sblocks_cont (pc, NULL, NULL); } @@ -282,13 +303,14 @@ publish_sblock (struct GNUNET_FS_PublishContext *pc) * We've finished publishing a KBlock as part of a larger upload. * Check the result and continue the larger upload. * - * @param cls the "struct GNUNET_FS_PublishContext*" + * @param cls the `struct GNUNET_FS_PublishContext *` * of the larger upload * @param uri URI of the published blocks * @param emsg NULL on success, otherwise error message */ static void -publish_kblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, +publish_kblocks_cont (void *cls, + const struct GNUNET_FS_Uri *uri, const char *emsg) { struct GNUNET_FS_PublishContext *pc = cls; @@ -297,15 +319,18 @@ publish_kblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, pc->ksk_pc = NULL; if (NULL != emsg) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error uploading KSK blocks: %s\n", + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Error uploading KSK blocks: %s\n", emsg); signal_publish_error (p, pc, emsg); GNUNET_FS_file_information_sync_ (p); GNUNET_FS_publish_sync_ (pc); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority - (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); + (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, + &GNUNET_FS_publish_main_, + pc); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, @@ -318,7 +343,7 @@ publish_kblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, else pc->fi_pos = p->dir; GNUNET_FS_publish_sync_ (pc); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); @@ -339,26 +364,37 @@ publish_kblocks_cont (void *cls, const struct GNUNET_FS_Uri *uri, * @return number of bytes copied to buf, 0 on error */ static size_t -block_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg) +block_reader (void *cls, + uint64_t offset, + size_t max, + void *buf, + char **emsg) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_FileInformation *p; - size_t pt_size; const char *dd; + size_t pt_size; p = pc->fi_pos; - if (p->is_directory == GNUNET_YES) + if (GNUNET_YES == p->is_directory) { pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset); dd = p->data.dir.dir_data; - memcpy (buf, &dd[offset], pt_size); + GNUNET_memcpy (buf, &dd[offset], pt_size); } else { if (UINT64_MAX == offset) - return p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL); + { + if (&GNUNET_FS_data_reader_file_ == p->data.file.reader) + { + /* force closing the file to avoid keeping too many files open */ + p->data.file.reader (p->data.file.reader_cls, offset, 0, NULL, NULL); + } + return 0; + } pt_size = GNUNET_MIN (max, p->data.file.file_size - offset); - if (pt_size == 0) + if (0 == pt_size) return 0; /* calling reader with pt_size==0 * might free buf, so don't! */ if (pt_size != @@ -376,10 +412,9 @@ block_reader (void *cls, uint64_t offset, size_t max, void *buf, char **emsg) * the final result. * * @param cls our publishing context - * @param tc scheduler's task context (not used) */ static void -encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +encode_cont (void *cls) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_FileInformation *p; @@ -387,14 +422,21 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) char *emsg; uint64_t flen; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished with tree encoder\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Finished with tree encoder\n"); p = pc->fi_pos; - GNUNET_FS_tree_encoder_finish (p->te, &p->chk_uri, &emsg); + p->chk_uri = GNUNET_FS_tree_encoder_get_uri (p->te); + GNUNET_FS_file_information_sync_ (p); + GNUNET_FS_tree_encoder_finish (p->te, &emsg); p->te = NULL; if (NULL != emsg) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg); - GNUNET_asprintf (&p->emsg, _("Publishing failed: %s"), emsg); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Error during tree walk: %s\n", + emsg); + GNUNET_asprintf (&p->emsg, + _("Publishing failed: %s"), + emsg); GNUNET_free (emsg); pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR; pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL; @@ -403,7 +445,7 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) } else { - /* final progress event */ + /* final progress event */ GNUNET_assert (NULL != p->chk_uri); flen = GNUNET_FS_uri_chk_get_file_size (p->chk_uri); pi.status = GNUNET_FS_STATUS_PUBLISH_PROGRESS; @@ -413,9 +455,8 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) pi.value.publish.specifics.progress.depth = GNUNET_FS_compute_depth (flen); p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, flen); } - GNUNET_FS_file_information_sync_ (p); - /* continue with main */ - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + /* continue with main */ /* continue with main */ + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); @@ -425,8 +466,8 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) /** * Function called asking for the current (encoded) * block to be processed. After processing the - * client should either call "GNUNET_FS_tree_encode_next" - * or (on error) "GNUNET_FS_tree_encode_finish". + * client should either call #GNUNET_FS_tree_encoder_next + * or (on error) #GNUNET_FS_tree_encoder_finish. * * @param cls closure * @param chk content hash key for the block @@ -434,11 +475,15 @@ encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) * @param depth depth of the block in the file, 0 for DBLOCK * @param type type of the block (IBLOCK or DBLOCK) * @param block the (encrypted) block - * @param block_size size of block (in bytes) + * @param block_size size of @a block (in bytes) */ static void -block_proc (void *cls, const struct ContentHashKey *chk, uint64_t offset, - unsigned int depth, enum GNUNET_BLOCK_Type type, const void *block, +block_proc (void *cls, + 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_PublishContext *pc = cls; @@ -448,45 +493,60 @@ block_proc (void *cls, const struct ContentHashKey *chk, uint64_t offset, p = pc->fi_pos; if (NULL == pc->dsh) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting for datastore connection\n"); - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Waiting for datastore connection\n"); + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); return; } - if ((p->is_directory != GNUNET_YES) && (GNUNET_YES == p->data.file.do_index) && - (type == GNUNET_BLOCK_TYPE_FS_DBLOCK)) + if ( (GNUNET_YES != p->is_directory) && + (GNUNET_YES == p->data.file.do_index) && + (GNUNET_BLOCK_TYPE_FS_DBLOCK == type) ) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Indexing block `%s' for offset %llu with index size %u\n", - GNUNET_h2s (&chk->query), (unsigned long long) offset, - sizeof (struct OnDemandBlock)); + GNUNET_h2s (&chk->query), + (unsigned long long) offset, + (unsigned int) sizeof (struct OnDemandBlock)); odb.offset = GNUNET_htonll (offset); odb.file_id = p->data.file.file_id; GNUNET_assert (pc->qre == NULL); pc->qre = - GNUNET_DATASTORE_put (pc->dsh, (p->is_directory == GNUNET_YES) ? 0 : pc->rid, - &chk->query, sizeof (struct OnDemandBlock), &odb, + GNUNET_DATASTORE_put (pc->dsh, + (p->is_directory == GNUNET_YES) ? 0 : pc->rid, + &chk->query, + sizeof (struct OnDemandBlock), + &odb, GNUNET_BLOCK_TYPE_FS_ONDEMAND, - p->bo.content_priority, p->bo.anonymity_level, - p->bo.replication_level, p->bo.expiration_time, - -2, 1, GNUNET_CONSTANTS_SERVICE_TIMEOUT, + p->bo.content_priority, + p->bo.anonymity_level, + p->bo.replication_level, + p->bo.expiration_time, + -2, 1, &ds_put_cont, pc); return; } GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publishing block `%s' for offset %llu with size %u\n", - GNUNET_h2s (&chk->query), (unsigned long long) offset, + GNUNET_h2s (&chk->query), + (unsigned long long) offset, (unsigned int) block_size); GNUNET_assert (pc->qre == NULL); pc->qre = GNUNET_DATASTORE_put (pc->dsh, (p->is_directory == GNUNET_YES) ? 0 : pc->rid, - &chk->query, block_size, block, type, - p->bo.content_priority, p->bo.anonymity_level, - p->bo.replication_level, p->bo.expiration_time, -2, - 1, GNUNET_CONSTANTS_SERVICE_TIMEOUT, &ds_put_cont, + &chk->query, + block_size, + block, + type, + p->bo.content_priority, + p->bo.anonymity_level, + p->bo.replication_level, + p->bo.expiration_time, + -2, 1, + &ds_put_cont, pc); } @@ -498,15 +558,18 @@ block_proc (void *cls, const struct ContentHashKey *chk, uint64_t offset, * @param cls closure * @param offset where are we in the file * @param pt_block plaintext of the currently processed block - * @param pt_size size of pt_block + * @param pt_size size of @a pt_block * @param depth depth of the block in the tree, 0 for DBLOCK */ static void -progress_proc (void *cls, uint64_t offset, const void *pt_block, size_t pt_size, +progress_proc (void *cls, uint64_t offset, + const void *pt_block, + size_t pt_size, unsigned int depth) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_FileInformation *p; + struct GNUNET_FS_FileInformation *par; struct GNUNET_FS_ProgressInfo pi; p = pc->fi_pos; @@ -516,6 +579,23 @@ progress_proc (void *cls, uint64_t offset, const void *pt_block, size_t pt_size, pi.value.publish.specifics.progress.data_len = pt_size; pi.value.publish.specifics.progress.depth = depth; p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, offset); + if ( (0 != depth) || + (GNUNET_YES == p->is_directory) ) + return; + while (NULL != (par = p->dir)) + { + p = par; + GNUNET_assert (GNUNET_YES == par->is_directory); + p->data.dir.contents_completed += pt_size; + pi.status = GNUNET_FS_STATUS_PUBLISH_PROGRESS_DIRECTORY; + pi.value.publish.specifics.progress_directory.completed = p->data.dir.contents_completed; + pi.value.publish.specifics.progress_directory.total = p->data.dir.contents_size; + pi.value.publish.specifics.progress_directory.eta = GNUNET_TIME_calculate_eta (p->start_time, + p->data.dir.contents_completed, + p->data.dir.contents_size); + p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0); + + } } @@ -537,17 +617,17 @@ publish_content (struct GNUNET_FS_PublishContext *pc) uint64_t size; p = pc->fi_pos; - GNUNET_assert (p != NULL); + GNUNET_assert (NULL != p); if (NULL == p->te) { - if (p->is_directory == GNUNET_YES) + if (GNUNET_YES == p->is_directory) { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating directory\n"); db = GNUNET_FS_directory_builder_create (p->meta); dirpos = p->data.dir.entries; while (NULL != dirpos) { - if (dirpos->is_directory == GNUNET_YES) + if (GNUNET_YES == dirpos->is_directory) { raw_data = dirpos->data.dir.dir_data; dirpos->data.dir.dir_data = NULL; @@ -584,67 +664,121 @@ publish_content (struct GNUNET_FS_PublishContext *pc) &p->data.dir.dir_data); GNUNET_FS_file_information_sync_ (p); } - size = (p->is_directory == GNUNET_YES) ? p->data.dir.dir_size : p->data.file.file_size; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating tree encoder\n"); + size = (GNUNET_YES == p->is_directory) ? p->data.dir.dir_size : p->data.file.file_size; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Creating tree encoder\n"); p->te = GNUNET_FS_tree_encoder_create (pc->h, size, pc, &block_reader, &block_proc, &progress_proc, &encode_cont); } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Processing next block from tree\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Processing next block from tree\n"); GNUNET_FS_tree_encoder_next (p->te); } /** - * Process the response (or lack thereof) from - * the "fs" service to our 'start index' request. + * Check the response from the "fs" service to our 'start index' + * request. + * + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) + * @param msg the response we got + */ +static int +check_index_start_failed (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + size_t msize = ntohs (msg->size) - sizeof (*msg); + const char *emsg = (const char *) &msg[1]; + + if (emsg[msize - sizeof (struct GNUNET_MessageHeader) - 1] != '\0') + { + GNUNET_break (0); + return GNUNET_SYSERR; + } + return GNUNET_OK; +} + + +/** + * Process the response from the "fs" service to our 'start index' + * request. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*"_) + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) * @param msg the response we got */ static void -process_index_start_response (void *cls, const struct GNUNET_MessageHeader *msg) +handle_index_start_failed (void *cls, + const struct GNUNET_MessageHeader *msg) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_FileInformation *p; - const char *emsg; - uint16_t msize; + const char *emsg = (const char *) &msg[1]; - GNUNET_CLIENT_disconnect (pc->client); - pc->client = NULL; + GNUNET_MQ_destroy (pc->mq); + pc->mq = NULL; p = pc->fi_pos; - if (msg == NULL) + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Can not index file `%s': %s. Will try to insert instead.\n"), + p->filename, + gettext (emsg)); + p->data.file.do_index = GNUNET_NO; + GNUNET_FS_file_information_sync_ (p); + publish_content (pc); +} + + +/** + * Process the response from the "fs" service to our 'start index' + * request. + * + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) + * @param msg the response we got + */ +static void +handle_index_start_ok (void *cls, + const struct GNUNET_MessageHeader *msg) +{ + struct GNUNET_FS_PublishContext *pc = cls; + struct GNUNET_FS_FileInformation *p; + + GNUNET_MQ_destroy (pc->mq); + pc->mq = NULL; + p = pc->fi_pos; + p->data.file.index_start_confirmed = GNUNET_YES; + GNUNET_FS_file_information_sync_ (p); + publish_content (pc); +} + + +/** + * Generic error handler, called with the appropriate error code and + * the same closure specified at the creation of the message queue. + * Not every message queue implementation supports an error handler. + * + * @param cls closure with the `struct GNUNET_FS_PublishContext *` + * @param error error code + */ +static void +index_mq_error_handler (void *cls, + enum GNUNET_MQ_Error error) +{ + struct GNUNET_FS_PublishContext *pc = cls; + struct GNUNET_FS_FileInformation *p; + + if (NULL != pc->mq) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Can not index file `%s': %s. Will try to insert instead.\n"), - p->filename, - _("timeout on index-start request to `fs' service")); - p->data.file.do_index = GNUNET_NO; - GNUNET_FS_file_information_sync_ (p); - publish_content (pc); - return; + GNUNET_MQ_destroy (pc->mq); + pc->mq = NULL; } - if (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK) - { - msize = ntohs (msg->size); - emsg = (const char *) &msg[1]; - if ((msize <= sizeof (struct GNUNET_MessageHeader)) || - (emsg[msize - sizeof (struct GNUNET_MessageHeader) - 1] != '\0')) - emsg = gettext_noop ("unknown error"); - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Can not index file `%s': %s. Will try to insert instead.\n"), - p->filename, gettext (emsg)); - p->data.file.do_index = GNUNET_NO; - GNUNET_FS_file_information_sync_ (p); - publish_content (pc); - return; - } - p->data.file.index_start_confirmed = GNUNET_YES; - /* success! continue with indexing */ + p = pc->fi_pos; + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Can not index file `%s': %s. Will try to insert instead.\n"), + p->filename, + _("error on index-start request to `fs' service")); + p->data.file.do_index = GNUNET_NO; GNUNET_FS_file_information_sync_ (p); publish_content (pc); } @@ -658,13 +792,25 @@ process_index_start_response (void *cls, const struct GNUNET_MessageHeader *msg) * @param res resulting hash, NULL on error */ static void -hash_for_index_cb (void *cls, const GNUNET_HashCode * res) +hash_for_index_cb (void *cls, + const struct GNUNET_HashCode *res) { struct GNUNET_FS_PublishContext *pc = cls; + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (index_start_ok, + GNUNET_MESSAGE_TYPE_FS_INDEX_START_OK, + struct GNUNET_MessageHeader, + pc), + GNUNET_MQ_hd_var_size (index_start_failed, + GNUNET_MESSAGE_TYPE_FS_INDEX_START_FAILED, + struct GNUNET_MessageHeader, + pc), + GNUNET_MQ_handler_end () + }; struct GNUNET_FS_FileInformation *p; + struct GNUNET_MQ_Envelope *env; struct IndexStartMessage *ism; size_t slen; - struct GNUNET_CLIENT_Connection *client; uint64_t dev; uint64_t ino; char *fn; @@ -674,9 +820,9 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) if (NULL == res) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Can not index file `%s': %s. Will try to insert instead.\n"), - p->filename, _("failed to compute hash")); + _("Can not index file `%s': %s. Will try to insert instead.\n"), + p->filename, + _("failed to compute hash")); p->data.file.do_index = GNUNET_NO; GNUNET_FS_file_information_sync_ (p); publish_content (pc); @@ -691,7 +837,7 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) GNUNET_assert (fn != NULL); slen = strlen (fn) + 1; if (slen >= - GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct IndexStartMessage)) + GNUNET_MAX_MESSAGE_SIZE - sizeof (struct IndexStartMessage)) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, _ @@ -703,8 +849,10 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) publish_content (pc); return; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hash of indexed file `%s' is `%s'\n", - p->filename, GNUNET_h2s (res)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Hash of indexed file `%s' is `%s'\n", + p->filename, + GNUNET_h2s (res)); if (0 != (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) { p->data.file.file_id = *res; @@ -715,13 +863,17 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) GNUNET_free (fn); return; } - client = GNUNET_CLIENT_connect ("fs", pc->h->cfg); - if (NULL == client) + pc->mq = GNUNET_CLIENT_connect (pc->h->cfg, + "fs", + handlers, + &index_mq_error_handler, + pc); + if (NULL == pc->mq) { GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Can not index file `%s': %s. Will try to insert instead.\n"), - p->filename, _("could not connect to `fs' service")); + _("Can not index file `%s': %s. Will try to insert instead.\n"), + p->filename, + _("could not connect to `fs' service")); p->data.file.do_index = GNUNET_NO; publish_content (pc); GNUNET_free (fn); @@ -733,10 +885,13 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) p->data.file.have_hash = GNUNET_YES; GNUNET_FS_file_information_sync_ (p); } - ism = GNUNET_malloc (sizeof (struct IndexStartMessage) + slen); - ism->header.size = htons (sizeof (struct IndexStartMessage) + slen); - ism->header.type = htons (GNUNET_MESSAGE_TYPE_FS_INDEX_START); - if (GNUNET_OK == GNUNET_DISK_file_get_identifiers (p->filename, &dev, &ino)) + env = GNUNET_MQ_msg_extra (ism, + slen, + GNUNET_MESSAGE_TYPE_FS_INDEX_START); + if (GNUNET_OK == + GNUNET_DISK_file_get_identifiers (p->filename, + &dev, + &ino)) { ism->device = GNUNET_htonll (dev); ism->inode = GNUNET_htonll (ino); @@ -744,39 +899,161 @@ hash_for_index_cb (void *cls, const GNUNET_HashCode * res) else { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - _("Failed to get file identifiers for `%s'\n"), p->filename); + _("Failed to get file identifiers for `%s'\n"), + p->filename); } ism->file_id = *res; - memcpy (&ism[1], fn, slen); + GNUNET_memcpy (&ism[1], + fn, + slen); GNUNET_free (fn); - pc->client = client; - GNUNET_break (GNUNET_YES == - GNUNET_CLIENT_transmit_and_get_response (client, &ism->header, - GNUNET_TIME_UNIT_FOREVER_REL, - GNUNET_YES, - &process_index_start_response, - pc)); - GNUNET_free (ism); + GNUNET_MQ_send (pc->mq, + env); +} + + +/** + * We've computed the CHK/LOC URI, now publish the KSKs (if applicable). + * + * @param pc publishing context to do this for + */ +static void +publish_kblocks (struct GNUNET_FS_PublishContext *pc) +{ + struct GNUNET_FS_FileInformation *p; + + p = pc->fi_pos; + /* upload of "p" complete, publish KBlocks! */ + if (NULL != p->keywords) + { + pc->ksk_pc = GNUNET_FS_publish_ksk (pc->h, + p->keywords, + p->meta, + p->chk_uri, + &p->bo, + pc->options, + &publish_kblocks_cont, + pc); + } + else + { + publish_kblocks_cont (pc, p->chk_uri, NULL); + } +} + + +/** + * Process the response from the "fs" service to our LOC sign request. + * + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) + * @param sig the response we got + */ +static void +handle_signature_response (void *cls, + const struct ResponseLocSignatureMessage *sig) +{ + struct GNUNET_FS_PublishContext *pc = cls; + struct GNUNET_FS_FileInformation *p; + + p = pc->fi_pos; + p->chk_uri->type = GNUNET_FS_URI_LOC; + /* p->data.loc.fi kept from CHK before */ + p->chk_uri->data.loc.peer = sig->peer; + p->chk_uri->data.loc.expirationTime + = GNUNET_TIME_absolute_ntoh (sig->expiration_time); + p->chk_uri->data.loc.contentSignature = sig->signature; + GNUNET_FS_file_information_sync_ (p); + GNUNET_FS_publish_sync_ (pc); + publish_kblocks (pc); +} + + +/** + * Generic error handler, called with the appropriate error code and + * the same closure specified at the creation of the message queue. + * Not every message queue implementation supports an error handler. + * + * @param cls closure with the `struct GNUNET_FS_PublishContext *` + * @param error error code + */ +static void +loc_mq_error_handler (void *cls, + enum GNUNET_MQ_Error error) +{ + struct GNUNET_FS_PublishContext *pc = cls; + + if (NULL != pc->mq) + { + GNUNET_MQ_destroy (pc->mq); + pc->mq = NULL; + } + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Can not create LOC URI. Will continue with CHK instead.\n")); + publish_kblocks (pc); +} + + +/** + * We're publishing without anonymity. Contact the FS service + * to create a signed LOC URI for further processing, then + * continue with KSKs. + * + * @param pc the publishing context do to this for + */ +static void +create_loc_uri (struct GNUNET_FS_PublishContext *pc) +{ + struct GNUNET_MQ_MessageHandler handlers[] = { + GNUNET_MQ_hd_fixed_size (signature_response, + GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGNATURE, + struct ResponseLocSignatureMessage, + pc), + GNUNET_MQ_handler_end () + }; + struct GNUNET_MQ_Envelope *env; + struct RequestLocSignatureMessage *req; + struct GNUNET_FS_FileInformation *p; + + if (NULL != pc->mq) + GNUNET_MQ_destroy (pc->mq); + pc->mq = GNUNET_CLIENT_connect (pc->h->cfg, + "fs", + handlers, + &loc_mq_error_handler, + pc); + if (NULL == pc->mq) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Can not create LOC URI. Will continue with CHK instead.\n")); + publish_kblocks (pc); + return; + } + p = pc->fi_pos; + env = GNUNET_MQ_msg (req, + GNUNET_MESSAGE_TYPE_FS_REQUEST_LOC_SIGN); + req->purpose = htonl (GNUNET_SIGNATURE_PURPOSE_PEER_PLACEMENT); + req->expiration_time = GNUNET_TIME_absolute_hton (p->bo.expiration_time); + req->chk = p->chk_uri->data.chk.chk; + req->file_length = GNUNET_htonll (p->chk_uri->data.chk.file_length); + GNUNET_MQ_send (pc->mq, + env); } /** * Main function that performs the upload. * - * @param cls "struct GNUNET_FS_PublishContext" identifies the upload - * @param tc task context + * @param cls `struct GNUNET_FS_PublishContext *` identifies the upload */ void -GNUNET_FS_publish_main_ (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +GNUNET_FS_publish_main_ (void *cls) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_ProgressInfo pi; struct GNUNET_FS_FileInformation *p; - struct GNUNET_FS_Uri *loc; char *fn; - pc->upload_task = GNUNET_SCHEDULER_NO_TASK; + pc->upload_task = NULL; p = pc->fi_pos; if (NULL == p) { @@ -789,8 +1066,10 @@ GNUNET_FS_publish_main_ (void *cls, return; } /* find starting position */ - while ((p->is_directory == GNUNET_YES) && (NULL != p->data.dir.entries) && (NULL == p->emsg) - && (NULL == p->data.dir.entries->chk_uri)) + while ( (GNUNET_YES == p->is_directory) && + (NULL != p->data.dir.entries) && + (NULL == p->emsg) && + (NULL == p->data.dir.entries->chk_uri) ) { p = p->data.dir.entries; pc->fi_pos = p; @@ -799,7 +1078,9 @@ GNUNET_FS_publish_main_ (void *cls, /* abort on error */ if (NULL != p->emsg) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error uploading: %s\n", p->emsg); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Error uploading: %s\n", + p->emsg); /* error with current file, abort all * related files as well! */ while (NULL != p->dir) @@ -809,13 +1090,17 @@ GNUNET_FS_publish_main_ (void *cls, p = p->dir; if (fn != NULL) { - GNUNET_asprintf (&p->emsg, _("Recursive upload failed at `%s': %s"), fn, + GNUNET_asprintf (&p->emsg, + _("Recursive upload failed at `%s': %s"), + fn, p->emsg); GNUNET_free (fn); } else { - GNUNET_asprintf (&p->emsg, _("Recursive upload failed: %s"), p->emsg); + GNUNET_asprintf (&p->emsg, + _("Recursive upload failed: %s"), + p->emsg); } pi.status = GNUNET_FS_STATUS_PUBLISH_ERROR; pi.value.publish.eta = GNUNET_TIME_UNIT_FOREVER_REL; @@ -831,37 +1116,30 @@ GNUNET_FS_publish_main_ (void *cls, { GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "File upload complete, now publishing KSK blocks.\n"); - if (0 == p->bo.anonymity_level) - { - /* zero anonymity, box CHK URI in LOC URI */ - loc = - GNUNET_FS_uri_loc_create (p->chk_uri, pc->h->cfg, - p->bo.expiration_time); - GNUNET_FS_uri_destroy (p->chk_uri); - p->chk_uri = loc; - } GNUNET_FS_publish_sync_ (pc); - /* upload of "p" complete, publish KBlocks! */ - if (p->keywords != NULL) + + if ( (0 == p->bo.anonymity_level) && + (GNUNET_YES != + GNUNET_FS_uri_test_loc (p->chk_uri)) ) { - pc->ksk_pc = GNUNET_FS_publish_ksk (pc->h, p->keywords, p->meta, p->chk_uri, &p->bo, - pc->options, &publish_kblocks_cont, pc); + /* zero anonymity, box CHK URI in LOC URI */ + create_loc_uri (pc); } else { - publish_kblocks_cont (pc, p->chk_uri, NULL); + publish_kblocks (pc); } return; } - if ((p->is_directory != GNUNET_YES) && (p->data.file.do_index)) + if ((GNUNET_YES != p->is_directory) && (p->data.file.do_index)) { if (NULL == p->filename) { p->data.file.do_index = GNUNET_NO; GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _ - ("Can not index file `%s': %s. Will try to insert instead.\n"), - "", _("needs to be an actual file")); + _("Can not index file `%s': %s. Will try to insert instead.\n"), + "", + _("needs to be an actual file")); GNUNET_FS_file_information_sync_ (p); publish_content (pc); return; @@ -887,7 +1165,7 @@ GNUNET_FS_publish_main_ (void *cls, * Signal the FS's progress function that we are starting * an upload. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*") + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) * @param fi the entry in the publish-structure * @param length length of the file or directory * @param meta metadata for the file or directory (can be modified) @@ -895,13 +1173,17 @@ GNUNET_FS_publish_main_ (void *cls, * @param bo block options * @param do_index should we index? * @param client_info pointer to client context set upon creation (can be modified) - * @return GNUNET_OK to continue (always) + * @return #GNUNET_OK to continue (always) */ static int -fip_signal_start (void *cls, struct GNUNET_FS_FileInformation *fi, - uint64_t length, struct GNUNET_CONTAINER_MetaData *meta, - struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions *bo, - int *do_index, void **client_info) +fip_signal_start (void *cls, + struct GNUNET_FS_FileInformation *fi, + uint64_t length, + struct GNUNET_CONTAINER_MetaData *meta, + struct GNUNET_FS_Uri **uri, + struct GNUNET_FS_BlockOptions *bo, + int *do_index, + void **client_info) { struct GNUNET_FS_PublishContext *pc = cls; struct GNUNET_FS_ProgressInfo pi; @@ -913,7 +1195,8 @@ fip_signal_start (void *cls, struct GNUNET_FS_FileInformation *fi, pc->skip_next_fi_callback = GNUNET_NO; return GNUNET_OK; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting publish operation\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Starting publish operation\n"); if (*do_index) { /* space for on-demand blocks */ @@ -943,7 +1226,7 @@ fip_signal_start (void *cls, struct GNUNET_FS_FileInformation *fi, { kc = GNUNET_FS_uri_ksk_get_keyword_count (*uri); pc->reserve_entries += kc; - pc->reserve_space += GNUNET_SERVER_MAX_MESSAGE_SIZE * kc; + pc->reserve_space += GNUNET_MAX_MESSAGE_SIZE * kc; } pi.status = GNUNET_FS_STATUS_PUBLISH_START; *client_info = GNUNET_FS_publish_make_status_ (&pi, pc, fi, 0); @@ -962,8 +1245,8 @@ fip_signal_start (void *cls, struct GNUNET_FS_FileInformation *fi, * Actually signal the FS's progress function that we are suspending * an upload. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*") * @param fi the entry in the publish-structure + * @param pc the publish context of which a file is being suspended */ static void suspend_operation (struct GNUNET_FS_FileInformation *fi, @@ -982,10 +1265,11 @@ suspend_operation (struct GNUNET_FS_FileInformation *fi, GNUNET_FS_publish_sks_cancel (pc->sks_pc); pc->sks_pc = NULL; } - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suspending publish operation\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Suspending publish operation\n"); GNUNET_free_non_null (fi->serialization); fi->serialization = NULL; - off = (fi->chk_uri == NULL) ? 0 : (fi->is_directory == GNUNET_YES) ? fi->data.dir.dir_size : fi->data.file.file_size; + off = (NULL == fi->chk_uri) ? 0 : (GNUNET_YES == fi->is_directory) ? fi->data.dir.dir_size : fi->data.file.file_size; pi.status = GNUNET_FS_STATUS_PUBLISH_SUSPEND; GNUNET_break (NULL == GNUNET_FS_publish_make_status_ (&pi, pc, fi, off)); if (NULL != pc->qre) @@ -1006,7 +1290,7 @@ suspend_operation (struct GNUNET_FS_FileInformation *fi, * Signal the FS's progress function that we are suspending * an upload. Performs the recursion. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*") + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) * @param fi the entry in the publish-structure * @param length length of the file or directory * @param meta metadata for the file or directory (can be modified) @@ -1014,13 +1298,16 @@ suspend_operation (struct GNUNET_FS_FileInformation *fi, * @param bo block options * @param do_index should we index? * @param client_info pointer to client context set upon creation (can be modified) - * @return GNUNET_OK to continue (always) + * @return #GNUNET_OK to continue (always) */ static int -fip_signal_suspend (void *cls, struct GNUNET_FS_FileInformation *fi, - uint64_t length, struct GNUNET_CONTAINER_MetaData *meta, +fip_signal_suspend (void *cls, + struct GNUNET_FS_FileInformation *fi, + uint64_t length, + struct GNUNET_CONTAINER_MetaData *meta, struct GNUNET_FS_Uri **uri, - struct GNUNET_FS_BlockOptions *bo, int *do_index, + struct GNUNET_FS_BlockOptions *bo, + int *do_index, void **client_info) { struct GNUNET_FS_PublishContext *pc = cls; @@ -1046,17 +1333,17 @@ fip_signal_suspend (void *cls, struct GNUNET_FS_FileInformation *fi, * Create SUSPEND event for the given publish operation * and then clean up our state (without stop signal). * - * @param cls the 'struct GNUNET_FS_PublishContext' to signal for + * @param cls the `struct GNUNET_FS_PublishContext` to signal for */ void GNUNET_FS_publish_signal_suspend_ (void *cls) { struct GNUNET_FS_PublishContext *pc = cls; - if (GNUNET_SCHEDULER_NO_TASK != pc->upload_task) + if (NULL != pc->upload_task) { GNUNET_SCHEDULER_cancel (pc->upload_task); - pc->upload_task = GNUNET_SCHEDULER_NO_TASK; + pc->upload_task = NULL; } pc->skip_next_fi_callback = GNUNET_YES; GNUNET_FS_file_information_inspect (pc->fi, &fip_signal_suspend, pc); @@ -1071,41 +1358,64 @@ GNUNET_FS_publish_signal_suspend_ (void *cls) * We have gotten a reply for our space reservation request. * Either fail (insufficient space) or start publishing for good. * - * @param cls the 'struct GNUNET_FS_PublishContext*' + * @param cls the `struct GNUNET_FS_PublishContext *` * @param success positive reservation ID on success * @param min_expiration minimum expiration time required for content to be stored * @param msg error message on error, otherwise NULL */ static void -finish_reserve (void *cls, int success, +finish_reserve (void *cls, + int success, struct GNUNET_TIME_Absolute min_expiration, const char *msg) { struct GNUNET_FS_PublishContext *pc = cls; pc->qre = NULL; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation complete (%d)!\n", success); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Reservation complete (%d)!\n", + success); if ((msg != NULL) || (success <= 0)) { - GNUNET_asprintf (&pc->fi->emsg, _("Insufficient space for publishing: %s"), + GNUNET_asprintf (&pc->fi->emsg, + _("Datastore failure: %s"), msg); signal_publish_error (pc->fi, pc, pc->fi->emsg); return; } pc->rid = success; - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task); + GNUNET_assert (NULL == pc->upload_task); pc->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc); } +/** + * Calculate the total size of all of the files in the directory structure. + * + * @param fi file structure to traverse + */ +static uint64_t +compute_contents_size (struct GNUNET_FS_FileInformation *fi) +{ + struct GNUNET_FS_FileInformation *ent; + + if (GNUNET_YES != fi->is_directory) + return fi->data.file.file_size; + fi->data.dir.contents_size = 0; + for (ent = fi->data.dir.entries; NULL != ent; ent = ent->next) + fi->data.dir.contents_size += compute_contents_size (ent); + return fi->data.dir.contents_size; +} + + /** * Publish a file or directory. * * @param h handle to the file sharing subsystem * @param fi information about the file or directory structure to publish - * @param namespace namespace to publish the file in, NULL for no namespace + * @param ns namespace to publish the file in, NULL for no namespace * @param nid identifier to use for the publishd content in the namespace * (can be NULL, must be NULL if namespace is NULL) * @param nuid update-identifier that will be used for future updates @@ -1116,7 +1426,8 @@ finish_reserve (void *cls, int success, struct GNUNET_FS_PublishContext * GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, struct GNUNET_FS_FileInformation *fi, - struct GNUNET_FS_Namespace *namespace, const char *nid, + const struct GNUNET_CRYPTO_EcdsaPrivateKey *ns, + const char *nid, const char *nuid, enum GNUNET_FS_PublishOptions options) { @@ -1124,6 +1435,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, struct GNUNET_DATASTORE_Handle *dsh; GNUNET_assert (NULL != h); + compute_contents_size (fi); if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY)) { dsh = GNUNET_DATASTORE_connect (h->cfg); @@ -1134,20 +1446,20 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, { dsh = NULL; } - ret = GNUNET_malloc (sizeof (struct GNUNET_FS_PublishContext)); + ret = GNUNET_new (struct GNUNET_FS_PublishContext); ret->dsh = dsh; ret->h = h; ret->fi = fi; - ret->namespace = namespace; - ret->options = options; - if (namespace != NULL) + if (NULL != ns) { - namespace->rc++; + ret->ns = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey); + *ret->ns = *ns; GNUNET_assert (NULL != nid); ret->nid = GNUNET_strdup (nid); if (NULL != nuid) ret->nuid = GNUNET_strdup (nuid); } + ret->options = options; /* signal start */ GNUNET_FS_file_information_inspect (ret->fi, &fip_signal_start, ret); ret->fi_pos = ret->fi; @@ -1157,19 +1469,18 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, { GNUNET_assert (NULL == ret->qre); GNUNET_log (GNUNET_ERROR_TYPE_INFO, - _ - ("Reserving space for %u entries and %llu bytes for publication\n"), + _("Reserving space for %u entries and %llu bytes for publication\n"), (unsigned int) ret->reserve_entries, (unsigned long long) ret->reserve_space); ret->qre = GNUNET_DATASTORE_reserve (ret->dsh, ret->reserve_space, - ret->reserve_entries, UINT_MAX, UINT_MAX, - GNUNET_TIME_UNIT_FOREVER_REL, &finish_reserve, + ret->reserve_entries, + &finish_reserve, ret); } else { - GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == ret->upload_task); + GNUNET_assert (NULL == ret->upload_task); ret->upload_task = GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, ret); @@ -1182,7 +1493,7 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, * Signal the FS's progress function that we are stopping * an upload. * - * @param cls closure (of type "struct GNUNET_FS_PublishContext*") + * @param cls closure (of type `struct GNUNET_FS_PublishContext *`) * @param fi the entry in the publish-structure * @param length length of the file or directory * @param meta metadata for the file or directory (can be modified) @@ -1190,12 +1501,15 @@ GNUNET_FS_publish_start (struct GNUNET_FS_Handle *h, * @param bo block options (can be modified) * @param do_index should we index? * @param client_info pointer to client context set upon creation (can be modified) - * @return GNUNET_OK to continue (always) + * @return #GNUNET_OK to continue (always) */ static int -fip_signal_stop (void *cls, struct GNUNET_FS_FileInformation *fi, - uint64_t length, struct GNUNET_CONTAINER_MetaData *meta, - struct GNUNET_FS_Uri **uri, struct GNUNET_FS_BlockOptions *bo, +fip_signal_stop (void *cls, + struct GNUNET_FS_FileInformation *fi, + uint64_t length, + struct GNUNET_CONTAINER_MetaData *meta, + struct GNUNET_FS_Uri **uri, + struct GNUNET_FS_BlockOptions *bo, int *do_index, void **client_info) { struct GNUNET_FS_PublishContext *pc = cls; @@ -1213,7 +1527,7 @@ fip_signal_stop (void *cls, struct GNUNET_FS_FileInformation *fi, pc->skip_next_fi_callback = GNUNET_YES; GNUNET_FS_file_information_inspect (fi, &fip_signal_stop, pc); } - if (fi->serialization != NULL) + if (NULL != fi->serialization) { GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_FILE_INFO, fi->serialization); @@ -1242,7 +1556,8 @@ GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc) struct GNUNET_FS_ProgressInfo pi; uint64_t off; - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publish stop called\n"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Publish stop called\n"); GNUNET_FS_end_top (pc->h, pc->top); if (NULL != pc->ksk_pc) { @@ -1254,24 +1569,24 @@ GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc) GNUNET_FS_publish_sks_cancel (pc->sks_pc); pc->sks_pc = NULL; } - if (GNUNET_SCHEDULER_NO_TASK != pc->upload_task) + if (NULL != pc->upload_task) { GNUNET_SCHEDULER_cancel (pc->upload_task); - pc->upload_task = GNUNET_SCHEDULER_NO_TASK; + pc->upload_task = NULL; } pc->skip_next_fi_callback = GNUNET_YES; GNUNET_FS_file_information_inspect (pc->fi, &fip_signal_stop, pc); - if (pc->fi->serialization != NULL) + if (NULL != pc->fi->serialization) { GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_FILE_INFO, pc->fi->serialization); GNUNET_free (pc->fi->serialization); pc->fi->serialization = NULL; } - off = (pc->fi->chk_uri == NULL) ? 0 : GNUNET_ntohll (pc->fi->chk_uri->data.chk.file_length); + off = (NULL == pc->fi->chk_uri) ? 0 : GNUNET_ntohll (pc->fi->chk_uri->data.chk.file_length); - if (pc->serialization != NULL) + if (NULL != pc->serialization) { GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH, pc->serialization); @@ -1289,5 +1604,4 @@ GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc) } - /* end of fs_publish.c */