GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#include "fs.h"
#include "fs_tree.h"
+#define DEBUG_UNINDEX GNUNET_NO
/**
* Function called by the tree encoder to obtain
* @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
+ * @param depth depth of the block in the tree, 0 for DBLOCK
*/
static void
unindex_progress (void *cls,
signal_unindex_error (uc);
return;
}
+#if DEBUG_UNINDEX
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Datastore REMOVE operation succeeded\n");
+#endif
GNUNET_FS_tree_encoder_next (uc->tc);
}
* or (on error) "GNUNET_FS_tree_encode_finish".
*
* @param cls closure
- * @param query the query for the block (key for lookup in the datastore)
+ * @param chk content hash key for the block (key for lookup in the datastore)
* @param offset offset of the block
+ * @param depth depth of the block, 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)
*/
static void
unindex_process (void *cls,
- const GNUNET_HashCode *query,
+ const struct ContentHashKey *chk,
uint64_t offset,
+ unsigned int depth,
enum GNUNET_BLOCK_Type type,
const void *block,
uint16_t block_size)
const void *data;
struct OnDemandBlock odb;
- if (type != GNUNET_BLOCK_TYPE_DBLOCK)
+ if (type != GNUNET_BLOCK_TYPE_FS_DBLOCK)
{
size = block_size;
data = block;
odb.file_id = uc->file_id;
data = &odb;
}
+#if DEBUG_UNINDEX
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending REMOVE request to DATASTORE service\n");
+#endif
GNUNET_DATASTORE_remove (uc->dsh,
- query,
+ &chk->query,
size,
data,
+ -2, 1,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
&process_cont,
- uc,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT);
-}
-
-
-/**
- * Function called when the tree encoder has
- * processed all blocks. Clean up.
- *
- * @param cls our unindexing context
- * @param tc not used
- */
-static void
-unindex_finish (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
-{
- struct GNUNET_FS_UnindexContext *uc = cls;
- char *emsg;
- struct GNUNET_FS_Uri *uri;
- struct GNUNET_FS_ProgressInfo pi;
-
- GNUNET_FS_tree_encoder_finish (uc->tc,
- &uri,
- &emsg);
- if (uri != NULL)
- GNUNET_FS_uri_destroy (uri);
- GNUNET_DISK_file_close (uc->fh);
- uc->fh = NULL;
- GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
- uc->dsh = NULL;
- if (emsg != NULL)
- {
- uc->emsg = emsg;
- signal_unindex_error (uc);
- }
- else
- {
- pi.status = GNUNET_FS_STATUS_UNINDEX_COMPLETED;
- pi.value.unindex.eta = GNUNET_TIME_UNIT_ZERO;
- GNUNET_FS_unindex_make_status_ (&pi, uc, uc->file_size);
- }
- GNUNET_FS_unindex_sync_ (uc);
+ uc);
}
const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_UnindexContext *uc = cls;
+ struct GNUNET_FS_ProgressInfo pi;
if (uc->client != NULL)
{
}
if (uc->state != UNINDEX_STATE_FS_NOTIFY)
{
- GNUNET_FS_unindex_stop (uc);
+ uc->state = UNINDEX_STATE_ERROR;
+ uc->emsg = GNUNET_strdup (_("Unexpected time for a response from `fs' service."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
return;
}
if (NULL == msg)
signal_unindex_error (uc);
return;
}
- uc->state = UNINDEX_STATE_DS_REMOVE;
+ uc->state = UNINDEX_STATE_COMPLETE;
+ pi.status = GNUNET_FS_STATUS_UNINDEX_COMPLETED;
+ pi.value.unindex.eta = GNUNET_TIME_UNIT_ZERO;
GNUNET_FS_unindex_sync_ (uc);
- GNUNET_FS_unindex_do_remove_ (uc);
+ GNUNET_FS_unindex_make_status_ (&pi, uc, uc->file_size);
+}
+
+
+/**
+ * Function called when the tree encoder has
+ * processed all blocks. Clean up.
+ *
+ * @param cls our unindexing context
+ * @param tc not used
+ */
+static void
+unindex_finish (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_UnindexContext *uc = cls;
+ char *emsg;
+ struct GNUNET_FS_Uri *uri;
+ struct UnindexMessage req;
+
+ /* generate final progress message */
+ unindex_progress (uc,
+ uc->file_size,
+ NULL,
+ 0, 0);
+ GNUNET_FS_tree_encoder_finish (uc->tc,
+ &uri,
+ &emsg);
+ uc->tc = NULL;
+ if (uri != NULL)
+ GNUNET_FS_uri_destroy (uri);
+ GNUNET_DISK_file_close (uc->fh);
+ uc->fh = NULL;
+ GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
+ uc->dsh = NULL;
+ uc->state = UNINDEX_STATE_FS_NOTIFY;
+ GNUNET_FS_unindex_sync_ (uc);
+ uc->client = GNUNET_CLIENT_connect ("fs",
+ uc->h->cfg);
+ if (uc->client == NULL)
+ {
+ uc->state = UNINDEX_STATE_ERROR;
+ uc->emsg = GNUNET_strdup (_("Failed to connect to FS service for unindexing."));
+ GNUNET_FS_unindex_sync_ (uc);
+ signal_unindex_error (uc);
+ return;
+ }
+#if DEBUG_UNINDEX
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Sending UNINDEX message to FS service\n");
+#endif
+ req.header.size = htons (sizeof (struct UnindexMessage));
+ req.header.type = htons (GNUNET_MESSAGE_TYPE_FS_UNINDEX);
+ req.reserved = 0;
+ req.file_id = uc->file_id;
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CLIENT_transmit_and_get_response (uc->client,
+ &req.header,
+ GNUNET_CONSTANTS_SERVICE_TIMEOUT,
+ GNUNET_YES,
+ &process_fs_response,
+ uc));
}
void
GNUNET_FS_unindex_do_remove_ (struct GNUNET_FS_UnindexContext *uc)
{
- uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg,
- uc->h->sched);
+ uc->dsh = GNUNET_DATASTORE_connect (uc->h->cfg);
if (NULL == uc->dsh)
{
uc->state = UNINDEX_STATE_ERROR;
const GNUNET_HashCode *file_id)
{
struct GNUNET_FS_UnindexContext *uc = cls;
- struct UnindexMessage req;
+ uc->fhc = NULL;
if (uc->state != UNINDEX_STATE_HASHING)
{
GNUNET_FS_unindex_stop (uc);
return;
}
uc->file_id = *file_id;
- uc->state = UNINDEX_STATE_FS_NOTIFY;
+ uc->state = UNINDEX_STATE_DS_REMOVE;
GNUNET_FS_unindex_sync_ (uc);
- uc->client = GNUNET_CLIENT_connect (uc->h->sched,
- "fs",
- uc->h->cfg);
- req.header.size = htons (sizeof (struct UnindexMessage));
- req.header.type = htons (GNUNET_MESSAGE_TYPE_FS_UNINDEX);
- req.reserved = 0;
- req.file_id = *file_id;
- GNUNET_break (GNUNET_OK ==
- GNUNET_CLIENT_transmit_and_get_response (uc->client,
- &req.header,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- GNUNET_YES,
- &process_fs_response,
- uc));
+ GNUNET_FS_unindex_do_remove_ (uc);
}
struct GNUNET_FS_UnindexContext *uc = cls;
struct GNUNET_FS_ProgressInfo pi;
+ if (uc->fhc != NULL)
+ {
+ GNUNET_CRYPTO_hash_file_cancel (uc->fhc);
+ uc->fhc = NULL;
+ }
+ if (uc->client != NULL)
+ {
+ GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+ uc->client = NULL;
+ }
+ if (NULL != uc->dsh)
+ {
+ GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
+ uc->dsh = NULL;
+ }
+ if (NULL != uc->tc)
+ {
+ GNUNET_FS_tree_encoder_finish (uc->tc,
+ NULL,
+ NULL);
+ uc->tc = NULL;
+ }
+ if (uc->fh != NULL)
+ {
+ GNUNET_DISK_file_close (uc->fh);
+ uc->fh = NULL;
+ }
GNUNET_FS_end_top (uc->h, uc->top);
pi.status = GNUNET_FS_STATUS_UNINDEX_SUSPEND;
GNUNET_FS_unindex_make_status_ (&pi, uc,
pi.status = GNUNET_FS_STATUS_UNINDEX_START;
pi.value.unindex.eta = GNUNET_TIME_UNIT_FOREVER_REL;
GNUNET_FS_unindex_make_status_ (&pi, ret, 0);
- /* FIXME: must be able to abort hashing here! */
- GNUNET_CRYPTO_hash_file (h->sched,
- GNUNET_SCHEDULER_PRIORITY_IDLE,
- filename,
- HASHING_BLOCKSIZE,
- &GNUNET_FS_unindex_process_hash_,
- ret);
+ ret->fhc = GNUNET_CRYPTO_hash_file (GNUNET_SCHEDULER_PRIORITY_IDLE,
+ filename,
+ HASHING_BLOCKSIZE,
+ &GNUNET_FS_unindex_process_hash_,
+ ret);
ret->top = GNUNET_FS_make_top (h,
&GNUNET_FS_unindex_signal_suspend_,
ret);
{
struct GNUNET_FS_ProgressInfo pi;
- /* FIXME: stop hashing (if still ongoing) */
- /* FIXME: disconnect uc->client (if still connected) */
- /* FIXME: disconnect from datastore (if still connected) */
- /* FIXME: other termination operations? */
- /* FIXME: must do same cleanup in 'unindex_signal_suspend'! */
- GNUNET_FS_end_top (uc->h, uc->top);
- if ( (uc->state != UNINDEX_STATE_COMPLETE) &&
- (uc->state != UNINDEX_STATE_ERROR) )
+ if (uc->fhc != NULL)
{
- uc->state = UNINDEX_STATE_ABORTED;
- return;
+ GNUNET_CRYPTO_hash_file_cancel (uc->fhc);
+ uc->fhc = NULL;
+ }
+ if (uc->client != NULL)
+ {
+ GNUNET_CLIENT_disconnect (uc->client, GNUNET_NO);
+ uc->client = NULL;
+ }
+ if (NULL != uc->dsh)
+ {
+ GNUNET_DATASTORE_disconnect (uc->dsh, GNUNET_NO);
+ uc->dsh = NULL;
+ }
+ if (NULL != uc->tc)
+ {
+ GNUNET_FS_tree_encoder_finish (uc->tc,
+ NULL,
+ NULL);
+ uc->tc = NULL;
+ }
+ if (uc->fh != NULL)
+ {
+ GNUNET_DISK_file_close (uc->fh);
+ uc->fh = NULL;
}
+ GNUNET_FS_end_top (uc->h, uc->top);
if (uc->serialization != NULL)
{
GNUNET_FS_remove_sync_file_ (uc->h, GNUNET_FS_SYNC_PATH_MASTER_UNINDEX, uc->serialization);
projects / oweals / gnunet.git / blobdiff