/**
* @file fs/fs_unindex.c
- * @author Krista Bennett
+ * @author Krista Grothoff
* @author Christian Grothoff
* @brief Unindex file.
- *
- * TODO:
- * - code cleanup (share more with upload.c)
*/
#include "platform.h"
#include "gnunet_constants.h"
}
+/**
+ * Fill in all of the generic fields for
+ * an unindex event.
+ *
+ * @param pi structure to fill in
+ * @param uc overall unindex context
+ * @param offset where we are in the file (for progress)
+ */
+static void
+make_unindex_status (struct GNUNET_FS_ProgressInfo *pi,
+ struct GNUNET_FS_UnindexContext *uc,
+ uint64_t offset)
+{
+ pi->value.unindex.uc = uc;
+ pi->value.unindex.cctx = uc->client_info;
+ pi->value.unindex.filename = uc->filename;
+ pi->value.unindex.size = uc->file_size;
+ pi->value.unindex.eta
+ = GNUNET_TIME_calculate_eta (uc->start_time,
+ offset,
+ uc->file_size);
+ pi->value.unindex.duration = GNUNET_TIME_absolute_get_duration (uc->start_time);
+ pi->value.unindex.completed = offset;
+}
+
+
+/**
+ * Function called with information about our
+ * progress in computing the tree encoding.
+ *
+ * @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 depth depth of the block in the tree
+ */
+static void
+unindex_progress (void *cls,
+ uint64_t offset,
+ const void *pt_block,
+ size_t pt_size,
+ unsigned int depth)
+{
+ struct GNUNET_FS_UnindexContext *uc = cls;
+ struct GNUNET_FS_ProgressInfo pi;
+
+ pi.status = GNUNET_FS_STATUS_UNINDEX_PROGRESS;
+ make_unindex_status (&pi, uc, offset);
+ pi.value.unindex.specifics.progress.data = pt_block;
+ pi.value.unindex.specifics.progress.offset = offset;
+ pi.value.unindex.specifics.progress.data_len = pt_size;
+ pi.value.unindex.specifics.progress.depth = depth;
+ uc->client_info
+ = uc->h->upcb (uc->h->upcb_cls,
+ &pi);
+}
+
+
+/**
+ * We've encountered an error during
+ * unindexing. Signal the client.
+ *
+ * @param uc context for the failed unindexing operation
+ * @param emsg the error message
+ */
+static void
+signal_unindex_error (struct GNUNET_FS_UnindexContext *uc,
+ const char *emsg)
+{
+ struct GNUNET_FS_ProgressInfo pi;
+
+ pi.status = GNUNET_FS_STATUS_UNINDEX_ERROR;
+ make_unindex_status (&pi, uc, 0);
+ pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
+ pi.value.unindex.specifics.error.message = emsg;
+ uc->client_info
+ = uc->h->upcb (uc->h->upcb_cls,
+ &pi);
+}
+
+
/**
* Continuation called to notify client about result of the
* datastore removal operation.
const char *msg)
{
struct GNUNET_FS_UnindexContext *uc = cls;
- // FIXME: may want to check for errors
- // OTHER than content-not-present!
+ if (success == GNUNET_SYSERR)
+ {
+ signal_unindex_error (uc,
+ msg);
+ return;
+ }
+
GNUNET_FS_tree_encoder_next (uc->tc);
}
unindex_process (void *cls,
const GNUNET_HashCode *query,
uint64_t offset,
- unsigned int type,
+ uint32_t type,
const void *block,
uint16_t block_size)
{
else /* on-demand encoded DBLOCK */
{
size = sizeof(struct OnDemandBlock);
- odb.offset = offset;
+ odb.offset = GNUNET_htonll (offset);
odb.file_id = uc->file_id;
data = &odb;
}
GNUNET_DATASTORE_remove (uc->dsh,
query,
- block_size,
- block,
+ size,
+ data,
&process_cont,
uc,
GNUNET_CONSTANTS_SERVICE_TIMEOUT);
}
-
-
-/**
- * Function called with information about our
- * progress in computing the tree encoding.
- *
- * @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 depth depth of the block in the tree
- */
-static void
-unindex_progress (void *cls,
- uint64_t offset,
- const void *pt_block,
- size_t pt_size,
- unsigned int depth)
-{
- struct GNUNET_FS_UnindexContext *uc = cls;
- // FIXME: call callback!
-}
-
-
-
-/**
- * Fill in all of the generic fields for
- * an unindex event.
- *
- * @param pc structure to fill in
- * @param sc overall unindex context
- */
-static void
-make_unindex_status (struct GNUNET_FS_ProgressInfo *pi,
- struct GNUNET_FS_UnindexContext *uc,
- uint64_t offset)
-{
- pi->value.unindex.uc = uc;
- pi->value.unindex.cctx = uc->client_info;
- pi->value.unindex.filename = uc->filename;
- pi->value.unindex.size = uc->file_size;
- pi->value.unindex.eta
- = GNUNET_TIME_calculate_eta (uc->start_time,
- offset,
- uc->file_size);
- pi->value.publish.duration = GNUNET_TIME_absolute_get_duration (uc->start_time);
- pi->value.publish.completed = offset;
-}
-
-
-/**
- * We've encountered an error during
- * unindexing. Signal the client.
- *
- * @param uc context for the failed unindexing operation
- * @param emsg the error message
- */
-static void
-signal_unindex_error (struct GNUNET_FS_UnindexContext *uc,
- const char *emsg)
-{
- struct GNUNET_FS_ProgressInfo pi;
-
- pi.status = GNUNET_FS_STATUS_UNINDEX_ERROR;
- make_unindex_status (&pi, uc, 0);
- pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
- pi.value.unindex.specifics.error.message = emsg;
- uc->client_info
- = uc->h->upcb (uc->h->upcb_cls,
- &pi);
-}
/**
{
struct GNUNET_FS_UnindexContext *uc = cls;
- GNUNET_CLIENT_disconnect (uc->client);
+ GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
uc->client = NULL;
if (uc->state != UNINDEX_STATE_FS_NOTIFY)
{
return;
}
uc->fh = GNUNET_DISK_file_open (uc->filename,
- GNUNET_DISK_OPEN_READ);
+ GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
if (NULL == uc->fh)
{
GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
req.header.type = htons (GNUNET_MESSAGE_TYPE_FS_UNINDEX);
req.reserved = 0;
req.file_id = *file_id;
- GNUNET_CLIENT_transmit_and_get_response (uc->client,
- &req.header,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &process_fs_response,
- uc);
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CLIENT_transmit_and_get_response (uc->client,
+ &req.header,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+ GNUNET_YES,
+ &process_fs_response,
+ uc));
}
*
* @param h handle to the file sharing subsystem
* @param filename file to unindex
+ * @param cctx initial value for the client context
* @return NULL on error, otherwise handle
*/
struct GNUNET_FS_UnindexContext *
-GNUNET_FS_unindex (struct GNUNET_FS_Handle *h,
- const char *filename)
+GNUNET_FS_unindex_start (struct GNUNET_FS_Handle *h,
+ const char *filename,
+ void *cctx)
{
struct GNUNET_FS_UnindexContext *ret;
struct GNUNET_FS_ProgressInfo pi;
ret->filename = GNUNET_strdup (filename);
ret->start_time = GNUNET_TIME_absolute_get ();
ret->file_size = size;
+ ret->client_info = cctx;
// FIXME: make persistent!
pi.status = GNUNET_FS_STATUS_UNINDEX_START;
&pi);
GNUNET_CRYPTO_hash_file (h->sched,
GNUNET_SCHEDULER_PRIORITY_IDLE,
- GNUNET_NO,
filename,
HASHING_BLOCKSIZE,
&process_hash,
projects / oweals / gnunet.git / blobdiff