Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @file fs/fs_publish.c
* @brief publish a file or directory in GNUnet
* @author Krista Bennett
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_constants.h"
#include "gnunet_signatures.h"
#include "gnunet_util_lib.h"
#include "gnunet_fs_service.h"
-#include "fs.h"
+#include "fs_api.h"
#include "fs_tree.h"
-#define DEBUG_PUBLISH GNUNET_NO
-
/**
- * Fill in all of the generic fields for
+ * Fill in all of the generic fields for
* a publish event and call the callback.
*
* @param pi structure to fill in
pi->value.publish.cctx = p->client_info;
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) ? 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);
+ pi->value.publish.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);
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);
}
/**
* Cleanup the publish context, we're done with it.
*
- * @param cls struct to clean up after
- * @param tc scheduler context
+ * @param pc struct to clean up
*/
static void
-publish_cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+publish_cleanup (struct GNUNET_FS_PublishContext *pc)
{
- struct GNUNET_FS_PublishContext *pc = cls;
-
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up publish context (done!)\n");
-#endif
- 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->client)
{
- GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (pc->client);
pc->client = NULL;
}
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
* 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, const char *msg)
+ds_put_cont (void *cls, int success,
+ struct GNUNET_TIME_Absolute min_expiration,
+ const char *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_ProgressInfo pi;
pc->qre = NULL;
- if (GNUNET_SYSERR == pc->in_network_wait)
- {
- /* we were aborted in the meantime, finish shutdown! */
- GNUNET_SCHEDULER_add_continuation (&publish_cleanup,
- pc, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
- return;
- }
- GNUNET_assert (GNUNET_YES == pc->in_network_wait);
- pc->in_network_wait = GNUNET_NO;
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_NO) &&
+ if ((pc->fi_pos->is_directory != GNUNET_YES) &&
(pc->fi_pos->filename != NULL) &&
(pc->fi_pos->data.file.do_index == GNUNET_YES))
{
}
}
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- pc->upload_task
- =
+ pc->upload_task =
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
&GNUNET_FS_publish_main_, pc);
}
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;
- p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p,
- GNUNET_ntohll (p->
- chk_uri->data.
- chk.file_length));
+ pi.value.publish.specifics.completed.sks_uri = p->sks_uri;
+ p->client_info =
+ GNUNET_FS_publish_make_status_ (&pi, pc, p,
+ p->data.file.file_size);
}
*/
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;
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_NO) &&
- (p->filename != NULL) && (p->data.file.do_index == GNUNET_YES))
+ if ((p->is_directory != GNUNET_YES) && (p->filename != NULL) &&
+ (p->data.file.do_index == GNUNET_YES))
{
/* run unindex to clean up */
GNUNET_FS_unindex_start (pc->h, p->filename, NULL);
/**
* 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, const char *msg)
+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;
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Releasing reserve done!\n");
-#endif
+ 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);
* 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, const char *emsg)
+ const struct GNUNET_FS_Uri *uri,
+ const char *emsg)
{
struct GNUNET_FS_PublishContext *pc = cls;
+ pc->sks_pc = NULL;
if (NULL != emsg)
{
signal_publish_error (pc->fi, pc, emsg);
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);
+ pc->qre =
+ GNUNET_DATASTORE_release_reserve (pc->dsh, pc->rid, UINT_MAX, UINT_MAX,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &finish_release_reserve, pc);
}
else
{
- finish_release_reserve (pc, GNUNET_OK, NULL);
+ finish_release_reserve (pc, GNUNET_OK, GNUNET_TIME_UNIT_ZERO_ABS, NULL);
}
}
static void
publish_sblock (struct GNUNET_FS_PublishContext *pc)
{
- if (NULL != pc->namespace)
- 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);
}
* 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, const char *emsg)
+ const struct GNUNET_FS_Uri *uri,
+ const char *emsg)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p = pc->fi_pos;
+ pc->ksk_pc = NULL;
if (NULL != emsg)
{
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error uploading KSK blocks: %s\n", emsg);
-#endif
+ "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);
- pc->upload_task
- =
- GNUNET_SCHEDULER_add_with_priority
- (GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc);
+ pc->upload_task =
+ GNUNET_SCHEDULER_add_with_priority
+ (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
+ &GNUNET_FS_publish_main_,
+ pc);
return;
}
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"KSK blocks published, moving on to next file\n");
-#endif
if (NULL != p->dir)
signal_publish_completion (p, pc);
/* move on to next file */
pc->fi_pos = p->dir;
GNUNET_FS_publish_sync_ (pc);
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- pc->upload_task
- =
+ pc->upload_task =
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
&GNUNET_FS_publish_main_, pc);
}
* @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)
+ if (GNUNET_YES == p->is_directory)
{
pt_size = GNUNET_MIN (max, p->data.dir.dir_size - offset);
dd = p->data.dir.dir_data;
}
else
{
+ if (UINT64_MAX == offset)
+ {
+ 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)
- return 0; /* calling reader with pt_size==0
+ if (0 == pt_size)
+ return 0; /* calling reader with pt_size==0
* might free buf, so don't! */
if (pt_size !=
- p->data.file.reader (p->data.file.reader_cls,
- offset, pt_size, buf, emsg))
+ p->data.file.reader (p->data.file.reader_cls, offset, pt_size, buf,
+ emsg))
return 0;
}
return pt_size;
* @param tc scheduler's task context (not used)
*/
static void
-encode_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+encode_cont (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p;
char *emsg;
uint64_t flen;
+ 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)
{
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg);
-#endif
- 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;
pi.value.publish.specifics.error.message = p->emsg;
p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0);
}
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished with tree encoder\n");
-#endif
- /* final progress event */
- flen = GNUNET_FS_uri_chk_get_file_size (p->chk_uri);
- pi.status = GNUNET_FS_STATUS_PUBLISH_PROGRESS;
- pi.value.publish.specifics.progress.data = NULL;
- pi.value.publish.specifics.progress.offset = flen;
- pi.value.publish.specifics.progress.data_len = 0;
- pi.value.publish.specifics.progress.depth = GNUNET_FS_compute_depth (flen);
- p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, flen);
-
- /* continue with main */
+ else
+ {
+ /* 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;
+ pi.value.publish.specifics.progress.data = NULL;
+ pi.value.publish.specifics.progress.offset = flen;
+ pi.value.publish.specifics.progress.data_len = 0;
+ pi.value.publish.specifics.progress.depth = GNUNET_FS_compute_depth (flen);
+ p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, flen);
+ }
+ /* continue with main */ /* continue with main */
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- pc->upload_task
- =
+ pc->upload_task =
GNUNET_SCHEDULER_add_with_priority (GNUNET_SCHEDULER_PRIORITY_BACKGROUND,
&GNUNET_FS_publish_main_, pc);
}
/**
* 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
+ * @param chk content hash key for the block
* @param offset offset of the block in the file
* @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, uint16_t block_size)
+ enum GNUNET_BLOCK_Type type,
+ const void *block,
+ uint16_t block_size)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p;
p = pc->fi_pos;
if (NULL == pc->dsh)
{
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Waiting for datastore connection\n");
-#endif
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- pc->upload_task
- =
+ pc->upload_task =
GNUNET_SCHEDULER_add_with_priority
(GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, pc);
return;
}
- GNUNET_assert (GNUNET_NO == pc->in_network_wait);
- pc->in_network_wait = GNUNET_YES;
- if ((!p->is_directory) &&
- (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) )
{
-#if DEBUG_PUBLISH
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));
-#endif
+ GNUNET_h2s (&chk->query), (unsigned long long) offset,
+ 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) ? 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,
- &ds_put_cont, pc);
+ pc->qre =
+ 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,
+ &ds_put_cont, pc);
return;
}
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Publishing block `%s' for offset %llu with size %u\n",
- GNUNET_h2s (&chk->query),
- (unsigned long long) offset, (unsigned int) block_size);
-#endif
+ 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) ? 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, pc);
+ 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,
+ pc);
}
* @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, unsigned int depth)
+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;
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);
+
+ }
}
uint64_t size;
p = pc->fi_pos;
- GNUNET_assert (p != NULL);
+ GNUNET_assert (NULL != p);
if (NULL == p->te)
{
- if (p->is_directory)
+ if (GNUNET_YES == p->is_directory)
{
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating directory\n");
-#endif
db = GNUNET_FS_directory_builder_create (p->meta);
dirpos = p->data.dir.entries;
while (NULL != dirpos)
{
- if (dirpos->is_directory)
+ if (GNUNET_YES == dirpos->is_directory)
{
raw_data = dirpos->data.dir.dir_data;
dirpos->data.dir.dir_data = NULL;
raw_data = GNUNET_malloc (dirpos->data.file.file_size);
emsg = NULL;
if (dirpos->data.file.file_size !=
- dirpos->data.file.reader (dirpos->data.file.reader_cls,
- 0,
- dirpos->data.file.file_size,
- raw_data, &emsg))
+ dirpos->data.file.reader (dirpos->data.file.reader_cls, 0,
+ dirpos->data.file.file_size, raw_data,
+ &emsg))
{
GNUNET_free_non_null (emsg);
GNUNET_free (raw_data);
raw_data = NULL;
}
+ dirpos->data.file.reader (dirpos->data.file.reader_cls, UINT64_MAX, 0, 0, NULL);
}
}
- GNUNET_FS_directory_builder_add (db,
- dirpos->chk_uri,
- dirpos->meta, raw_data);
+ GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta,
+ raw_data);
GNUNET_free_non_null (raw_data);
dirpos = dirpos->next;
}
GNUNET_free_non_null (p->data.dir.dir_data);
p->data.dir.dir_data = NULL;
p->data.dir.dir_size = 0;
- GNUNET_FS_directory_builder_finish (db,
- &p->data.dir.dir_size,
+ GNUNET_FS_directory_builder_finish (db, &p->data.dir.dir_size,
&p->data.dir.dir_data);
GNUNET_FS_file_information_sync_ (p);
}
- size = (p->is_directory) ? p->data.dir.dir_size : p->data.file.file_size;
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Creating tree encoder\n");
-#endif
- p->te = GNUNET_FS_tree_encoder_create (pc->h,
- size,
- pc,
- &block_reader,
- &block_proc,
- &progress_proc, &encode_cont);
+ 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);
}
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Processing next block from tree\n");
-#endif
+ 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.
*
- * @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)
+process_index_start_response (void *cls,
+ const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_FileInformation *p;
const char *emsg;
uint16_t msize;
- GNUNET_CLIENT_disconnect (pc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (pc->client);
pc->client = NULL;
p = pc->fi_pos;
- if (msg == NULL)
+ if (NULL == msg)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _
- ("Can not index file `%s': %s. Will try to insert instead.\n"),
+ _("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;
* @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_FS_FileInformation *p;
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);
publish_content (pc);
return;
}
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Hash of indexed file `%s' is `%s'\n",
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Hash of indexed file `%s' is `%s'\n",
p->filename, GNUNET_h2s (res));
-#endif
if (0 != (pc->options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
{
p->data.file.file_id = *res;
if (NULL == client)
{
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);
ism->device = GNUNET_htonll (dev);
ism->inode = GNUNET_htonll (ino);
}
-#if DEBUG_PUBLISH
else
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Failed to get file identifiers for `%s'\n"), p->filename);
}
-#endif
ism->file_id = *res;
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_CLIENT_transmit_and_get_response (client, &ism->header,
GNUNET_TIME_UNIT_FOREVER_REL,
GNUNET_YES,
&process_index_start_response,
/**
* Main function that performs the upload.
*
- * @param cls "struct GNUNET_FS_PublishContext" identifies the upload
+ * @param cls `struct GNUNET_FS_PublishContext *` identifies the upload
* @param tc task context
*/
void
p = pc->fi_pos;
if (NULL == p)
{
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Publishing complete, now publishing SKS and KSK blocks.\n");
-#endif
/* upload of entire hierarchy complete,
* publish namespace entries */
GNUNET_FS_publish_sync_ (pc);
return;
}
/* find starting position */
- while ((p->is_directory) &&
- (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;
/* abort on error */
if (NULL != p->emsg)
{
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error uploading: %s\n", p->emsg);
-#endif
+ 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)
p = p->dir;
if (fn != NULL)
{
- GNUNET_asprintf (&p->emsg,
- _("Recursive upload failed at `%s': %s"), fn, p->emsg);
+ GNUNET_asprintf (&p->emsg, _("Recursive upload failed at `%s': %s"), fn,
+ p->emsg);
GNUNET_free (fn);
}
else
/* handle completion */
if (NULL != p->chk_uri)
{
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"File upload complete, now publishing KSK blocks.\n");
-#endif
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);
+ pc->h->cfg,
+ p->bo.expiration_time);
GNUNET_FS_uri_destroy (p->chk_uri);
p->chk_uri = loc;
+ GNUNET_FS_file_information_sync_ (p);
}
GNUNET_FS_publish_sync_ (pc);
/* upload of "p" complete, publish KBlocks! */
- if (p->keywords != NULL)
+ if (NULL != p->keywords)
{
- GNUNET_FS_publish_ksk (pc->h,
- p->keywords,
- p->meta,
- p->chk_uri,
- &p->bo, pc->options, &publish_kblocks_cont, pc);
+ 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
{
}
return;
}
- if ((!p->is_directory) && (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"),
- "<no-name>", _("needs to be an actual file"));
+ _("Can not index file `%s': %s. Will try to insert instead.\n"),
+ "<no-name>",
+ _("needs to be an actual file"));
GNUNET_FS_file_information_sync_ (p);
publish_content (pc);
return;
else
{
p->start_time = GNUNET_TIME_absolute_get ();
- pc->fhc = GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE,
- p->filename,
- HASHING_BLOCKSIZE,
- &hash_for_index_cb, pc);
+ pc->fhc =
+ GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE, p->filename,
+ HASHING_BLOCKSIZE, &hash_for_index_cb, pc);
}
return;
}
* 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)
* @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,
+ struct GNUNET_FS_FileInformation *fi,
uint64_t length,
- struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_CONTAINER_MetaData *meta,
struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo,
- int *do_index, void **client_info)
+ struct GNUNET_FS_BlockOptions *bo,
+ int *do_index,
+ void **client_info)
{
struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_ProgressInfo pi;
unsigned int kc;
uint64_t left;
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting publish operation\n");
-#endif
+ if (GNUNET_YES == pc->skip_next_fi_callback)
+ {
+ pc->skip_next_fi_callback = GNUNET_NO;
+ return GNUNET_OK;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting publish operation\n");
if (*do_index)
{
/* space for on-demand blocks */
pi.status = GNUNET_FS_STATUS_PUBLISH_START;
*client_info = GNUNET_FS_publish_make_status_ (&pi, pc, fi, 0);
GNUNET_FS_file_information_sync_ (fi);
+ if ((fi->is_directory) && (fi->dir != NULL))
+ {
+ /* We are a directory, and we are not top-level; process entries in directory */
+ pc->skip_next_fi_callback = GNUNET_YES;
+ GNUNET_FS_file_information_inspect (fi, &fip_signal_start, pc);
+ }
return GNUNET_OK;
}
/**
- * Signal the FS's progress function that we are suspending
+ * 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 length length of the file or directory
- * @param meta metadata for the file or directory (can be modified)
- * @param uri pointer to the keywords that will be used for this entry (can be modified)
- * @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)
+ * @param pc the publish context of which a file is being suspended
*/
-static int
-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, void **client_info)
+static void
+suspend_operation (struct GNUNET_FS_FileInformation *fi,
+ struct GNUNET_FS_PublishContext *pc)
{
- struct GNUNET_FS_PublishContext *pc = cls;
struct GNUNET_FS_ProgressInfo pi;
uint64_t off;
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Suspending publish operation\n");
-#endif
+ if (NULL != pc->ksk_pc)
+ {
+ GNUNET_FS_publish_ksk_cancel (pc->ksk_pc);
+ pc->ksk_pc = NULL;
+ }
+ if (NULL != pc->sks_pc)
+ {
+ GNUNET_FS_publish_sks_cancel (pc->sks_pc);
+ pc->sks_pc = NULL;
+ }
+ 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 : length;
+ 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));
- *client_info = NULL;
if (NULL != pc->qre)
{
GNUNET_DATASTORE_cancel (pc->qre);
pc->dsh = NULL;
}
pc->rid = 0;
+}
+
+
+/**
+ * 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 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)
+ * @param uri pointer to the keywords that will be used for this entry (can be modified)
+ * @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)
+ */
+static int
+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,
+ void **client_info)
+{
+ struct GNUNET_FS_PublishContext *pc = cls;
+
+ if (GNUNET_YES == pc->skip_next_fi_callback)
+ {
+ pc->skip_next_fi_callback = GNUNET_NO;
+ return GNUNET_OK;
+ }
+ if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta))
+ {
+ /* process entries in directory */
+ pc->skip_next_fi_callback = GNUNET_YES;
+ GNUNET_FS_file_information_inspect (fi, &fip_signal_suspend, pc);
+ }
+ suspend_operation (fi, pc);
+ *client_info = NULL;
return GNUNET_OK;
}
* 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)
GNUNET_SCHEDULER_cancel (pc->upload_task);
pc->upload_task = GNUNET_SCHEDULER_NO_TASK;
}
+ pc->skip_next_fi_callback = GNUNET_YES;
GNUNET_FS_file_information_inspect (pc->fi, &fip_signal_suspend, pc);
+ suspend_operation (pc->fi, pc);
GNUNET_FS_end_top (pc->h, pc->top);
pc->top = NULL;
- publish_cleanup (pc, NULL);
+ publish_cleanup (pc);
}
/**
* 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, const char *msg)
+finish_reserve (void *cls, int success,
+ struct GNUNET_TIME_Absolute min_expiration,
+ const char *msg)
{
struct GNUNET_FS_PublishContext *pc = cls;
pc->qre = NULL;
-#if DEBUG_PUBLISH
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Reservation complete (%d)!\n", success);
-#endif
if ((msg != NULL) || (success <= 0))
{
GNUNET_asprintf (&pc->fi->emsg,
- _("Insufficient space for publishing: %s"), msg);
+ _("Insufficient space for publishing: %s"),
+ msg);
signal_publish_error (pc->fi, pc, pc->fi->emsg);
return;
}
pc->rid = success;
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == pc->upload_task);
- 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
+ * @param nuid update-identifier that will be used for future updates
* (can be NULL, must be NULL if namespace or nid is NULL)
- * @param options options for the publication
+ * @param options options for the publication
* @return context that can be used to control the publish operation
*/
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)
{
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);
{
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;
{
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,
+ UINT_MAX, UINT_MAX,
+ GNUNET_TIME_UNIT_FOREVER_REL,
+ &finish_reserve,
ret);
}
else
{
GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == ret->upload_task);
- ret->upload_task
- =
+ ret->upload_task =
GNUNET_SCHEDULER_add_with_priority
(GNUNET_SCHEDULER_PRIORITY_BACKGROUND, &GNUNET_FS_publish_main_, ret);
}
* 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)
* @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_ProgressInfo pi;
uint64_t off;
+ if (GNUNET_YES == pc->skip_next_fi_callback)
+ {
+ pc->skip_next_fi_callback = GNUNET_NO;
+ return GNUNET_OK;
+ }
+ if (GNUNET_YES == GNUNET_FS_meta_data_test_for_directory (meta))
+ {
+ /* process entries in directory first */
+ pc->skip_next_fi_callback = GNUNET_YES;
+ GNUNET_FS_file_information_inspect (fi, &fip_signal_stop, pc);
+ }
if (fi->serialization != NULL)
{
- GNUNET_FS_remove_sync_file_ (pc->h,
- GNUNET_FS_SYNC_PATH_FILE_INFO,
+ GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_FILE_INFO,
fi->serialization);
GNUNET_free (fi->serialization);
fi->serialization = NULL;
/**
- * Stop an upload. Will abort incomplete uploads (but
+ * Stop an upload. Will abort incomplete uploads (but
* not remove blocks that have already been publishd) or
* simply clean up the state for completed uploads.
* Must NOT be called from within the event callback!
void
GNUNET_FS_publish_stop (struct GNUNET_FS_PublishContext *pc)
{
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Publish stop called\n");
-#endif
+ struct GNUNET_FS_ProgressInfo pi;
+ uint64_t off;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Publish stop called\n");
GNUNET_FS_end_top (pc->h, pc->top);
- if (NULL != pc->qre)
+ if (NULL != pc->ksk_pc)
{
- GNUNET_DATASTORE_cancel (pc->qre);
- pc->qre = NULL;
+ GNUNET_FS_publish_ksk_cancel (pc->ksk_pc);
+ pc->ksk_pc = NULL;
}
- if (NULL != pc->dsh)
+ if (NULL != pc->sks_pc)
{
- GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
- pc->dsh = NULL;
+ GNUNET_FS_publish_sks_cancel (pc->sks_pc);
+ pc->sks_pc = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != pc->upload_task)
{
GNUNET_SCHEDULER_cancel (pc->upload_task);
pc->upload_task = GNUNET_SCHEDULER_NO_TASK;
}
- if (pc->serialization != NULL)
- {
- GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH,
- pc->serialization);
- GNUNET_free (pc->serialization);
- pc->serialization = NULL;
- }
+ pc->skip_next_fi_callback = GNUNET_YES;
GNUNET_FS_file_information_inspect (pc->fi, &fip_signal_stop, pc);
- if (GNUNET_YES == pc->in_network_wait)
- {
- pc->in_network_wait = GNUNET_SYSERR;
- return;
- }
- publish_cleanup (pc, NULL);
-}
-
-
-/**
- * Context for the KSK publication.
- */
-struct PublishKskContext
-{
-
- /**
- * Keywords to use.
- */
- struct GNUNET_FS_Uri *ksk_uri;
-
- /**
- * Global FS context.
- */
- struct GNUNET_FS_Handle *h;
-
- /**
- * The master block that we are sending
- * (in plaintext), has "mdsize+slen" more
- * bytes than the struct would suggest.
- */
- struct KBlock *kb;
-
- /**
- * Buffer of the same size as "kb" for
- * the encrypted version.
- */
- struct KBlock *cpy;
-
- /**
- * Handle to the datastore, NULL if we are just
- * simulating.
- */
- struct GNUNET_DATASTORE_Handle *dsh;
- /**
- * Handle to datastore PUT request.
- */
- struct GNUNET_DATASTORE_QueueEntry *qre;
-
- /**
- * Function to call once we're done.
- */
- GNUNET_FS_PublishContinuation cont;
-
- /**
- * Closure for cont.
- */
- void *cont_cls;
-
- /**
- * When should the KBlocks expire?
- */
- struct GNUNET_FS_BlockOptions bo;
-
- /**
- * Size of the serialized metadata.
- */
- ssize_t mdsize;
-
- /**
- * Size of the (CHK) URI as a string.
- */
- size_t slen;
-
- /**
- * Keyword that we are currently processing.
- */
- unsigned int i;
-
-};
-
-
-/**
- * Continuation of "GNUNET_FS_publish_ksk" that performs
- * the actual publishing operation (iterating over all
- * of the keywords).
- *
- * @param cls closure of type "struct PublishKskContext*"
- * @param tc unused
- */
-static void
-publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
-
-
-/**
- * Function called by the datastore API with
- * the result from the PUT request.
- *
- * @param cls closure of type "struct PublishKskContext*"
- * @param success GNUNET_OK on success
- * @param msg error message (or NULL)
- */
-static void
-kb_put_cont (void *cls, int success, const char *msg)
-{
- struct PublishKskContext *pkc = cls;
-
- pkc->qre = NULL;
- if (GNUNET_OK != success)
- {
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "KB PUT operation complete\n");
-#endif
- if (NULL != pkc->dsh)
- {
- GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
- pkc->dsh = NULL;
- }
- GNUNET_free (pkc->cpy);
- GNUNET_free (pkc->kb);
- pkc->cont (pkc->cont_cls, NULL, msg);
- GNUNET_FS_uri_destroy (pkc->ksk_uri);
- GNUNET_free (pkc);
- return;
- }
- GNUNET_SCHEDULER_add_continuation (&publish_ksk_cont,
- pkc, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
-}
-
-
-/**
- * Continuation of "GNUNET_FS_publish_ksk" that performs the actual
- * publishing operation (iterating over all of the keywords).
- *
- * @param cls closure of type "struct PublishKskContext*"
- * @param tc unused
- */
-static void
-publish_ksk_cont (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct PublishKskContext *pkc = cls;
- const char *keyword;
- GNUNET_HashCode key;
- GNUNET_HashCode query;
- struct GNUNET_CRYPTO_AesSessionKey skey;
- struct GNUNET_CRYPTO_AesInitializationVector iv;
- struct GNUNET_CRYPTO_RsaPrivateKey *pk;
-
-
- if ((pkc->i == pkc->ksk_uri->data.ksk.keywordCount) || (NULL == pkc->dsh))
+ if (NULL != pc->fi->serialization)
{
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "KSK PUT operation complete\n");
-#endif
- if (NULL != pkc->dsh)
- {
- GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
- pkc->dsh = NULL;
- }
- GNUNET_free (pkc->cpy);
- GNUNET_free (pkc->kb);
- pkc->cont (pkc->cont_cls, pkc->ksk_uri, NULL);
- GNUNET_FS_uri_destroy (pkc->ksk_uri);
- GNUNET_free (pkc);
- return;
+ 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;
}
- keyword = pkc->ksk_uri->data.ksk.keywords[pkc->i++];
-#if DEBUG_PUBLISH
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Publishing under keyword `%s'\n", keyword);
-#endif
- /* first character of keyword indicates if it is
- * mandatory or not -- ignore for hashing */
- GNUNET_CRYPTO_hash (&keyword[1], strlen (&keyword[1]), &key);
- GNUNET_CRYPTO_hash_to_aes_key (&key, &skey, &iv);
- GNUNET_CRYPTO_aes_encrypt (&pkc->kb[1],
- pkc->slen + pkc->mdsize, &skey, &iv, &pkc->cpy[1]);
- pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&key);
- GNUNET_assert (NULL != pk);
- GNUNET_CRYPTO_rsa_key_get_public (pk, &pkc->cpy->keyspace);
- GNUNET_CRYPTO_hash (&pkc->cpy->keyspace,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &query);
- GNUNET_assert (GNUNET_OK ==
- GNUNET_CRYPTO_rsa_sign (pk,
- &pkc->cpy->purpose,
- &pkc->cpy->signature));
- GNUNET_CRYPTO_rsa_key_free (pk);
- pkc->qre = GNUNET_DATASTORE_put (pkc->dsh,
- 0,
- &query,
- pkc->mdsize +
- sizeof (struct KBlock) +
- pkc->slen,
- pkc->cpy,
- GNUNET_BLOCK_TYPE_FS_KBLOCK,
- pkc->bo.content_priority,
- pkc->bo.anonymity_level,
- pkc->bo.replication_level,
- pkc->bo.expiration_time,
- -2, 1,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &kb_put_cont, pkc);
-}
-
+ off = (NULL == pc->fi->chk_uri) ? 0 : GNUNET_ntohll (pc->fi->chk_uri->data.chk.file_length);
-/**
- * Publish a CHK under various keywords on GNUnet.
- *
- * @param h handle to the file sharing subsystem
- * @param ksk_uri keywords to use
- * @param meta metadata to use
- * @param uri URI to refer to in the KBlock
- * @param bo per-block options
- * @param options publication options
- * @param cont continuation
- * @param cont_cls closure for cont
- */
-void
-GNUNET_FS_publish_ksk (struct GNUNET_FS_Handle *h,
- const struct GNUNET_FS_Uri *ksk_uri,
- const struct GNUNET_CONTAINER_MetaData *meta,
- const struct GNUNET_FS_Uri *uri,
- const struct GNUNET_FS_BlockOptions *bo,
- enum GNUNET_FS_PublishOptions options,
- GNUNET_FS_PublishContinuation cont, void *cont_cls)
-{
- struct PublishKskContext *pkc;
- char *uris;
- size_t size;
- char *kbe;
- char *sptr;
-
- GNUNET_assert (NULL != uri);
- pkc = GNUNET_malloc (sizeof (struct PublishKskContext));
- pkc->h = h;
- pkc->bo = *bo;
- pkc->cont = cont;
- pkc->cont_cls = cont_cls;
- if (0 == (options & GNUNET_FS_PUBLISH_OPTION_SIMULATE_ONLY))
- {
- pkc->dsh = GNUNET_DATASTORE_connect (h->cfg);
- if (pkc->dsh == NULL)
- {
- cont (cont_cls, NULL, _("Could not connect to datastore."));
- GNUNET_free (pkc);
- return;
- }
- }
- if (meta == NULL)
- pkc->mdsize = 0;
- else
- pkc->mdsize = GNUNET_CONTAINER_meta_data_get_serialized_size (meta);
- GNUNET_assert (pkc->mdsize >= 0);
- uris = GNUNET_FS_uri_to_string (uri);
- pkc->slen = strlen (uris) + 1;
- size = pkc->mdsize + sizeof (struct KBlock) + pkc->slen;
- if (size > MAX_KBLOCK_SIZE)
+ if (NULL != pc->serialization)
{
- size = MAX_KBLOCK_SIZE;
- pkc->mdsize = size - sizeof (struct KBlock) - pkc->slen;
+ GNUNET_FS_remove_sync_file_ (pc->h, GNUNET_FS_SYNC_PATH_MASTER_PUBLISH,
+ pc->serialization);
+ GNUNET_free (pc->serialization);
+ pc->serialization = NULL;
}
- pkc->kb = GNUNET_malloc (size);
- kbe = (char *) &pkc->kb[1];
- memcpy (kbe, uris, pkc->slen);
- GNUNET_free (uris);
- sptr = &kbe[pkc->slen];
- if (meta != NULL)
- pkc->mdsize = GNUNET_CONTAINER_meta_data_serialize (meta,
- &sptr,
- pkc->mdsize,
- GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
- if (pkc->mdsize == -1)
+ if (NULL != pc->qre)
{
- GNUNET_break (0);
- GNUNET_free (pkc->kb);
- if (pkc->dsh != NULL)
- {
- GNUNET_DATASTORE_disconnect (pkc->dsh, GNUNET_NO);
- pkc->dsh = NULL;
- }
- cont (cont_cls, NULL, _("Internal error."));
- GNUNET_free (pkc);
- return;
+ GNUNET_DATASTORE_cancel (pc->qre);
+ pc->qre = NULL;
}
- size = sizeof (struct KBlock) + pkc->slen + pkc->mdsize;
-
- pkc->cpy = GNUNET_malloc (size);
- pkc->cpy->purpose.size =
- htonl (sizeof (struct GNUNET_CRYPTO_RsaSignaturePurpose) +
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) +
- pkc->mdsize + pkc->slen);
- pkc->cpy->purpose.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_FS_KBLOCK);
- pkc->ksk_uri = GNUNET_FS_uri_dup (ksk_uri);
- GNUNET_SCHEDULER_add_continuation (&publish_ksk_cont,
- pkc, GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ pi.status = GNUNET_FS_STATUS_PUBLISH_STOPPED;
+ GNUNET_break (NULL == GNUNET_FS_publish_make_status_ (&pi, pc, pc->fi, off));
+ publish_cleanup (pc);
}
projects / oweals / gnunet.git / blobdiff