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
* TODO:
* - add support for pushing "already seen" information
* to FS service for bloomfilter (can wait)
- * - handle availability probes (can wait)
- * - make operations persistent (can wait)
*/
#include "platform.h"
#define DEBUG_SEARCH GNUNET_NO
-
-
/**
- * Fill in all of the generic fields for
- * a search event.
+ * Fill in all of the generic fields for a search event and
+ * call the callback.
*
* @param pi structure to fill in
* @param sc overall search context
* @return value returned by the callback
*/
-static void *
-make_search_status (struct GNUNET_FS_ProgressInfo *pi,
- struct GNUNET_FS_SearchContext *sc)
-{
+void *
+GNUNET_FS_search_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
+ struct GNUNET_FS_SearchContext *sc)
+{
+ void *ret;
pi->value.search.sc = sc;
pi->value.search.cctx
= sc->client_info;
pi->value.search.pctx
- = (sc->parent == NULL) ? NULL : sc->parent->client_info;
+ = (sc->psearch_result == NULL) ? NULL : sc->psearch_result->client_info;
pi->value.search.query
= sc->uri;
pi->value.search.duration = GNUNET_TIME_absolute_get_duration (sc->start_time);
pi->value.search.anonymity = sc->anonymity;
- return sc->h->upcb (sc->h->upcb_cls,
+ ret = sc->h->upcb (sc->h->upcb_cls,
pi);
+ return ret;
}
*
* @param cls points to the URI we check against
* @param key not used
- * @param value a "struct SearchResult" who's URI we
+ * @param value a "struct GNUNET_FS_SearchResult" who's URI we
* should compare with
* @return GNUNET_SYSERR if the result is present,
* GNUNET_OK otherwise
void *value)
{
const struct GNUNET_FS_Uri *uri = cls;
- struct SearchResult *sr = value;
+ struct GNUNET_FS_SearchResult *sr = value;
if (GNUNET_FS_uri_test_equal (uri,
sr->uri))
*/
static void
notify_client_chk_result (struct GNUNET_FS_SearchContext *sc,
- struct SearchResult *sr)
+ struct GNUNET_FS_SearchResult *sr)
{
struct GNUNET_FS_ProgressInfo pi;
pi.status = GNUNET_FS_STATUS_SEARCH_RESULT;
pi.value.search.specifics.result.meta = sr->meta;
pi.value.search.specifics.result.uri = sr->uri;
- sr->client_info = make_search_status (&pi, sc);
+ pi.value.search.specifics.result.result = sr;
+ pi.value.search.specifics.result.applicability_rank = sr->optional_support;
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
}
*/
static void
notify_client_chk_update (struct GNUNET_FS_SearchContext *sc,
- struct SearchResult *sr)
+ struct GNUNET_FS_SearchResult *sr)
{
struct GNUNET_FS_ProgressInfo pi;
= sr->availability_trials;
pi.value.search.specifics.update.applicability_rank
= sr->optional_support;
- sr->client_info = make_search_status (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
}
* Where to store a pointer to the search
* result struct if we found a match.
*/
- struct SearchResult *sr;
+ struct GNUNET_FS_SearchResult *sr;
};
*
* @param cls a "struct GetResultContext"
* @param key not used
- * @param value a "struct SearchResult" who's URI we
+ * @param value a "struct GNUNET_FS_SearchResult" who's URI we
* should compare with
* @return GNUNET_OK
*/
void *value)
{
struct GetResultContext *grc = cls;
- struct SearchResult *sr = value;
+ struct GNUNET_FS_SearchResult *sr = value;
if (GNUNET_FS_uri_test_equal (grc->uri,
sr->uri))
}
-/**
- * Start download probes for the given search result.
- *
- * @param sr the search result
- */
-static void
-start_probe (struct SearchResult *sr);
-
-
/**
* Signal result of last probe to client and then schedule next
* probe.
*/
static void
-signal_probe_result (struct SearchResult *sr)
+signal_probe_result (struct GNUNET_FS_SearchResult *sr)
{
struct GNUNET_FS_ProgressInfo pi;
pi.value.search.specifics.update.availability_rank = sr->availability_success;
pi.value.search.specifics.update.availability_certainty = sr->availability_trials;
pi.value.search.specifics.update.applicability_rank = sr->optional_support;
- sr->sc->client_info = make_search_status (&pi, sr->sc);
- start_probe (sr);
+ sr->sc->client_info = GNUNET_FS_search_make_status_ (&pi, sr->sc);
+ GNUNET_FS_search_start_probe_ (sr);
}
/**
* Handle the case where we have failed to receive a response for our probe.
*
- * @param cls our 'struct SearchResult*'
+ * @param cls our 'struct GNUNET_FS_SearchResult*'
* @param tc scheduler context
*/
static void
probe_failure_handler (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct SearchResult *sr = cls;
+ struct GNUNET_FS_SearchResult *sr = cls;
sr->availability_trials++;
+ GNUNET_FS_search_result_sync_ (sr);
signal_probe_result (sr);
}
/**
* Handle the case where we have gotten a response for our probe.
*
- * @param cls our 'struct SearchResult*'
+ * @param cls our 'struct GNUNET_FS_SearchResult*'
* @param tc scheduler context
*/
static void
probe_success_handler (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct SearchResult *sr = cls;
+ struct GNUNET_FS_SearchResult *sr = cls;
sr->availability_trials++;
sr->availability_success++;
+ GNUNET_FS_search_result_sync_ (sr);
signal_probe_result (sr);
}
GNUNET_FS_search_probe_progress_ (void *cls,
const struct GNUNET_FS_ProgressInfo *info)
{
- struct SearchResult *sr = info->value.download.cctx;
+ struct GNUNET_FS_SearchResult *sr = info->value.download.cctx;
struct GNUNET_TIME_Relative dur;
switch (info->status)
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_success_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
- /* FIXME: clean up? schedule next probe? or already done? */
+ if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
+ sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ }
sr = NULL;
break;
case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
GNUNET_assert (sr->probe_cancel_task == GNUNET_SCHEDULER_NO_TASK);
sr->probe_active_time = GNUNET_TIME_absolute_get ();
- sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->sc->h->sched,
- sr->remaining_probe_time,
+ sr->probe_cancel_task = GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler,
sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
{
- GNUNET_SCHEDULER_cancel (sr->sc->h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
}
dur = GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
sr->remaining_probe_time = GNUNET_TIME_relative_subtract (sr->remaining_probe_time,
dur);
+ GNUNET_FS_search_result_sync_ (sr);
break;
default:
GNUNET_break (0);
*
* @param sr the search result
*/
-static void
-start_probe (struct SearchResult *sr)
+void
+GNUNET_FS_search_start_probe_ (struct GNUNET_FS_SearchResult *sr)
{
uint64_t off;
uint64_t len;
if (sr->probe_ctx != NULL)
return;
+ if (sr->download != NULL)
+ return;
if (0 == (sr->sc->h->flags & GNUNET_FS_FLAGS_DO_PROBES))
return;
if (sr->availability_trials > AVAILABILITY_TRIALS_MAX)
const struct GNUNET_CONTAINER_MetaData *meta)
{
GNUNET_HashCode key;
- struct SearchResult *sr;
+ struct GNUNET_FS_SearchResult *sr;
struct GetResultContext grc;
int is_new;
is_new = (NULL == sr) || (sr->mandatory_missing > 0);
if (NULL == sr)
{
- sr = GNUNET_malloc (sizeof (struct SearchResult));
+ sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
sr->sc = sc;
sr->uri = GNUNET_FS_uri_dup (uri);
sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
sr->mandatory_missing = sc->mandatory_count;
+ sr->key = key;
GNUNET_CONTAINER_multihashmap_put (sc->master_result_map,
&key,
sr,
notify_client_chk_result (sc, sr);
else
notify_client_chk_update (sc, sr);
- start_probe (sr);
+ GNUNET_FS_search_result_sync_ (sr);
+ GNUNET_FS_search_start_probe_ (sr);
}
* @param anonymity desired level of anonymity
* @param options options for the search
* @param cctx client context
- * @param parent parent search (for namespace update searches)
+ * @param psearch parent search result (for namespace update searches)
* @return context that can be used to control the search
*/
static struct GNUNET_FS_SearchContext *
uint32_t anonymity,
enum GNUNET_FS_SearchOptions options,
void *cctx,
- struct GNUNET_FS_SearchContext *parent);
+ struct GNUNET_FS_SearchResult *psearch);
/**
{
struct GNUNET_FS_Uri uu;
GNUNET_HashCode key;
- struct SearchResult *sr;
+ struct GNUNET_FS_SearchResult *sr;
/* check if new */
GNUNET_FS_uri_to_key (uri, &key);
&test_result_present,
(void*) uri))
return; /* duplicate result */
- sr = GNUNET_malloc (sizeof (struct SearchResult));
+ sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
sr->sc = sc;
sr->uri = GNUNET_FS_uri_dup (uri);
sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+ sr->key = key;
GNUNET_CONTAINER_multihashmap_put (sc->master_result_map,
&key,
sr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- start_probe (sr);
+ GNUNET_FS_search_result_sync_ (sr);
+ GNUNET_FS_search_start_probe_ (sr);
/* notify client */
notify_client_chk_result (sc, sr);
/* search for updates */
uu.type = sks;
uu.data.sks.namespace = sc->uri->data.sks.namespace;
uu.data.sks.identifier = GNUNET_strdup (id_update);
- /* FIXME: should attach update search
- to the individual result, not
- the entire SKS search! */
- search_start (sc->h,
- &uu,
- sc->anonymity,
- sc->options,
- NULL,
- sc);
+ (void) search_start (sc->h,
+ &uu,
+ sc->anonymity,
+ sc->options,
+ NULL,
+ sr);
+ GNUNET_free (uu.data.sks.identifier);
}
}
/* decrypt */
GNUNET_CRYPTO_hash_to_aes_key (&sc->requests[i].key, &skey, &iv);
- GNUNET_CRYPTO_aes_decrypt (&kb[1],
- size - sizeof (struct KBlock),
- &skey,
- &iv,
- pt);
+ if (-1 == GNUNET_CRYPTO_aes_decrypt (&kb[1],
+ size - sizeof (struct KBlock),
+ &skey,
+ &iv,
+ pt))
+ {
+ GNUNET_break (0);
+ return;
+ }
/* parse */
eos = memchr (pt, 0, sizeof (pt));
if (NULL == eos)
}
/* decrypt */
GNUNET_CRYPTO_hash_to_aes_key (&sc->requests[i].key, &skey, &iv);
- GNUNET_CRYPTO_aes_decrypt (&nb[1],
- size - sizeof (struct NBlock),
- &skey,
- &iv,
- pt);
+ if (-1 == GNUNET_CRYPTO_aes_decrypt (&nb[1],
+ size - sizeof (struct NBlock),
+ &skey,
+ &iv,
+ pt))
+ {
+ GNUNET_break (0);
+ return;
+ }
/* parse */
eos = memchr (pt, 0, sizeof (pt));
if (NULL == eos)
strlen (identifier),
&key);
GNUNET_CRYPTO_hash_to_aes_key (&key, &skey, &iv);
- GNUNET_CRYPTO_aes_decrypt (&sb[1],
- len,
- &skey,
- &iv,
- pt);
+ if (-1 == GNUNET_CRYPTO_aes_decrypt (&sb[1],
+ len,
+ &skey,
+ &iv,
+ pt))
+ {
+ GNUNET_break (0);
+ return;
+ }
/* parse */
off = GNUNET_STRINGS_buffer_tokenize (pt,
len,
const void *data,
size_t size)
{
- if (GNUNET_TIME_absolute_get_duration (expiration).value > 0)
+ if (GNUNET_TIME_absolute_get_duration (expiration).rel_value > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Result received has already expired.\n");
}
switch (type)
{
- case GNUNET_BLOCK_TYPE_KBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_KBLOCK:
if (! GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_break (0);
}
process_kblock (sc, data, size);
break;
- case GNUNET_BLOCK_TYPE_SBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_SBLOCK:
if (! GNUNET_FS_uri_test_sks (sc->uri))
{
GNUNET_break (0);
}
process_sblock (sc, data, size);
break;
- case GNUNET_BLOCK_TYPE_NBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_NBLOCK:
if (! GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_break (0);
process_nblock (sc, data, size);
break;
case GNUNET_BLOCK_TYPE_ANY:
- case GNUNET_BLOCK_TYPE_DBLOCK:
- case GNUNET_BLOCK_TYPE_ONDEMAND:
- case GNUNET_BLOCK_TYPE_IBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_DBLOCK:
+ case GNUNET_BLOCK_TYPE_FS_ONDEMAND:
+ case GNUNET_BLOCK_TYPE_FS_IBLOCK:
GNUNET_break (0);
break;
default:
sm[i].type = htonl (GNUNET_BLOCK_TYPE_ANY);
sm[i].anonymity_level = htonl (sc->anonymity);
sm[i].query = sc->requests[i].query;
+ /* FIXME: should transmit hash codes of all already-known results here!
+ (and if they do not fit, add another message with the same
+ header and additional already-seen results!) */
}
}
else
sm->options = htonl (1);
else
sm->options = htonl (0);
- sm->type = htonl (GNUNET_BLOCK_TYPE_SBLOCK);
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_SBLOCK);
sm->anonymity_level = htonl (sc->anonymity);
sm->target = sc->uri->data.sks.namespace;
identifier = sc->uri->data.sks.identifier;
GNUNET_CRYPTO_hash_xor (&idh,
&sm->target,
&sm->query);
+ /* FIXME: should transmit hash codes of all already-known results here!
+ (and if they do not fit, add another message with the same
+ header and additional already-seen results!) */
}
GNUNET_CLIENT_receive (sc->client,
&receive_results,
size_t size;
sc->task = GNUNET_SCHEDULER_NO_TASK;
- client = GNUNET_CLIENT_connect (sc->h->sched,
- "fs",
+ client = GNUNET_CLIENT_connect ("fs",
sc->h->cfg);
if (NULL == client)
{
sc->client = NULL;
}
sc->task
- = GNUNET_SCHEDULER_add_delayed (sc->h->sched,
- GNUNET_TIME_UNIT_SECONDS,
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS,
&do_reconnect,
sc);
}
* @param anonymity desired level of anonymity
* @param options options for the search
* @param cctx initial value for the client context
- * @param parent parent search (for namespace update searches)
+ * @param psearch parent search result (for namespace update searches)
* @return context that can be used to control the search
*/
static struct GNUNET_FS_SearchContext *
uint32_t anonymity,
enum GNUNET_FS_SearchOptions options,
void *cctx,
- struct GNUNET_FS_SearchContext *parent)
+ struct GNUNET_FS_SearchResult *psearch)
{
struct GNUNET_FS_SearchContext *sc;
- struct GNUNET_CLIENT_Connection *client;
struct GNUNET_FS_ProgressInfo pi;
- size_t size;
+
+ sc = GNUNET_malloc (sizeof(struct GNUNET_FS_SearchContext));
+ sc->h = h;
+ sc->options = options;
+ sc->uri = GNUNET_FS_uri_dup (uri);
+ sc->anonymity = anonymity;
+ sc->start_time = GNUNET_TIME_absolute_get ();
+ if (psearch != NULL)
+ {
+ sc->psearch_result = psearch;
+ psearch->update_search = sc;
+ }
+ sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
+ sc->client_info = cctx;
+ if (GNUNET_OK !=
+ GNUNET_FS_search_start_searching_ (sc))
+ {
+ GNUNET_FS_uri_destroy (sc->uri);
+ GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
+ GNUNET_free (sc);
+ return NULL;
+ }
+ GNUNET_FS_search_sync_ (sc);
+ pi.status = GNUNET_FS_STATUS_SEARCH_START;
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ return sc;
+}
+
+
+/**
+ * Build the request and actually initiate the search using the
+ * GNUnet FS service.
+ *
+ * @param sc search context
+ * @return GNUNET_OK on success, GNUNET_SYSERR on error
+ */
+int
+GNUNET_FS_search_start_searching_ (struct GNUNET_FS_SearchContext *sc)
+{
unsigned int i;
const char *keyword;
GNUNET_HashCode hc;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
struct GNUNET_CRYPTO_RsaPrivateKey *pk;
+ size_t size;
- if (GNUNET_FS_uri_test_ksk (uri))
+ GNUNET_assert (NULL == sc->client);
+ if (GNUNET_FS_uri_test_ksk (sc->uri))
{
- size = sizeof (struct SearchMessage) * uri->data.ksk.keywordCount;
+ size = sizeof (struct SearchMessage) * sc->uri->data.ksk.keywordCount;
}
else
{
- GNUNET_assert (GNUNET_FS_uri_test_sks (uri));
+ GNUNET_assert (GNUNET_FS_uri_test_sks (sc->uri));
size = sizeof (struct SearchMessage);
}
if (size >= GNUNET_SERVER_MAX_MESSAGE_SIZE)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Too many keywords specified for a single search."));
- return NULL;
+ return GNUNET_SYSERR;
}
- client = GNUNET_CLIENT_connect (h->sched,
- "fs",
- h->cfg);
- if (NULL == client)
- return NULL;
- sc = GNUNET_malloc (sizeof(struct GNUNET_FS_SearchContext));
- sc->h = h;
- sc->options = options;
- sc->uri = GNUNET_FS_uri_dup (uri);
- sc->anonymity = anonymity;
- sc->start_time = GNUNET_TIME_absolute_get ();
- sc->client = client;
- sc->parent = parent;
- sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
- sc->client_info = cctx;
- if (GNUNET_FS_uri_test_ksk (uri))
+ if (GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_assert (0 != sc->uri->data.ksk.keywordCount);
sc->requests = GNUNET_malloc (sizeof (struct SearchRequestEntry) *
keyword = &sc->uri->data.ksk.keywords[i][1];
GNUNET_CRYPTO_hash (keyword, strlen (keyword), &hc);
pk = GNUNET_CRYPTO_rsa_key_create_from_hash (&hc);
+ GNUNET_assert (pk != NULL);
GNUNET_CRYPTO_rsa_key_get_public (pk, &pub);
GNUNET_CRYPTO_rsa_key_free (pk);
GNUNET_CRYPTO_hash (&pub,
&sc->requests[i].key);
}
}
- if (NULL != parent)
- GNUNET_CONTAINER_DLL_insert (parent->child_head,
- parent->child_tail,
- sc);
- pi.status = GNUNET_FS_STATUS_SEARCH_START;
- sc->client_info = make_search_status (&pi, sc);
- GNUNET_CLIENT_notify_transmit_ready (client,
+ sc->client = GNUNET_CLIENT_connect ("fs",
+ sc->h->cfg);
+ if (NULL == sc->client)
+ return GNUNET_SYSERR;
+ GNUNET_CLIENT_notify_transmit_ready (sc->client,
size,
GNUNET_CONSTANTS_SERVICE_TIMEOUT,
GNUNET_NO,
&transmit_search_request,
- sc);
- return sc;
+ sc);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Freeze probes for the given search result.
+ *
+ * @param cls the global FS handle
+ * @param key the key for the search result (unused)
+ * @param value the search result to free
+ * @return GNUNET_OK
+ */
+static int
+search_result_freeze_probes (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct GNUNET_FS_SearchResult *sr = value;
+
+ if (sr->probe_ctx != NULL)
+ {
+ GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
+ sr->probe_ctx = NULL;
+ }
+ if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
+ {
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
+ sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ }
+ if (sr->update_search != NULL)
+ GNUNET_FS_search_pause (sr->update_search);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Resume probes for the given search result.
+ *
+ * @param cls the global FS handle
+ * @param key the key for the search result (unused)
+ * @param value the search result to free
+ * @return GNUNET_OK
+ */
+static int
+search_result_resume_probes (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct GNUNET_FS_SearchResult *sr = value;
+
+ GNUNET_FS_search_start_probe_ (sr);
+ if (sr->update_search != NULL)
+ GNUNET_FS_search_continue (sr->update_search);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Signal suspend and free the given search result.
+ *
+ * @param cls the global FS handle
+ * @param key the key for the search result (unused)
+ * @param value the search result to free
+ * @return GNUNET_OK
+ */
+static int
+search_result_suspend (void *cls,
+ const GNUNET_HashCode * key,
+ void *value)
+{
+ struct GNUNET_FS_SearchContext *sc = cls;
+ struct GNUNET_FS_SearchResult *sr = value;
+ struct GNUNET_FS_ProgressInfo pi;
+
+ if (sr->download != NULL)
+ GNUNET_FS_download_signal_suspend_ (sr->download);
+ if (sr->update_search != NULL)
+ GNUNET_FS_search_signal_suspend_ (sr->update_search);
+ pi.status = GNUNET_FS_STATUS_SEARCH_RESULT_SUSPEND;
+ pi.value.search.specifics.result_suspend.cctx = sr->client_info;
+ pi.value.search.specifics.result_suspend.meta = sr->meta;
+ pi.value.search.specifics.result_suspend.uri = sr->uri;
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ GNUNET_break (NULL == sr->client_info);
+ GNUNET_free_non_null (sr->serialization);
+ GNUNET_FS_uri_destroy (sr->uri);
+ GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+ if (sr->probe_ctx != NULL)
+ GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
+ if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
+ GNUNET_free (sr);
+ return GNUNET_OK;
+}
+
+
+/**
+ * Create SUSPEND event for the given search operation
+ * and then clean up our state (without stop signal).
+ *
+ * @param cls the 'struct GNUNET_FS_SearchContext' to signal for
+ */
+void
+GNUNET_FS_search_signal_suspend_ (void *cls)
+{
+ struct GNUNET_FS_SearchContext *sc = cls;
+ struct GNUNET_FS_ProgressInfo pi;
+ unsigned int i;
+
+ GNUNET_FS_end_top (sc->h, sc->top);
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &search_result_suspend,
+ sc);
+ pi.status = GNUNET_FS_STATUS_SEARCH_SUSPEND;
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ GNUNET_break (NULL == sc->client_info);
+ if (sc->task != GNUNET_SCHEDULER_NO_TASK)
+ GNUNET_SCHEDULER_cancel (sc->task);
+ if (NULL != sc->client)
+ GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+ GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
+ if (sc->requests != NULL)
+ {
+ GNUNET_assert (GNUNET_FS_uri_test_ksk (sc->uri));
+ for (i=0;i<sc->uri->data.ksk.keywordCount;i++)
+ GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results);
+ }
+ GNUNET_free_non_null (sc->requests);
+ GNUNET_free_non_null (sc->emsg);
+ GNUNET_FS_uri_destroy (sc->uri);
+ GNUNET_free_non_null (sc->serialization);
+ GNUNET_free (sc);
}
enum GNUNET_FS_SearchOptions options,
void *cctx)
{
- return search_start (h, uri, anonymity, options, cctx, NULL);
+ struct GNUNET_FS_SearchContext *ret;
+ ret = search_start (h, uri, anonymity, options, cctx, NULL);
+ if (ret == NULL)
+ return NULL;
+ ret->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, ret);
+ return ret;
}
struct GNUNET_FS_ProgressInfo pi;
if (sc->task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sc->h->sched,
- sc->task);
+ GNUNET_SCHEDULER_cancel (sc->task);
sc->task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != sc->client)
GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
sc->client = NULL;
- // FIXME: make persistent!
- // FIXME: should this freeze all active probes?
+ GNUNET_FS_search_sync_ (sc);
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &search_result_freeze_probes,
+ sc);
pi.status = GNUNET_FS_STATUS_SEARCH_PAUSED;
- sc->client_info = make_search_status (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
}
GNUNET_assert (sc->client == NULL);
GNUNET_assert (sc->task == GNUNET_SCHEDULER_NO_TASK);
do_reconnect (sc, NULL);
- // FIXME: make persistent!
+ GNUNET_FS_search_sync_ (sc);
pi.status = GNUNET_FS_STATUS_SEARCH_CONTINUED;
- sc->client_info = make_search_status (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &search_result_resume_probes,
+ sc);
}
void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
- struct GNUNET_FS_Handle *h = sc->h;
- struct SearchResult *sr = value;
+ struct GNUNET_FS_SearchResult *sr = value;
struct GNUNET_FS_ProgressInfo pi;
+ if (NULL != sr->download)
+ {
+ sr->download->search = NULL;
+ sr->download->top = GNUNET_FS_make_top (sr->download->h,
+ &GNUNET_FS_download_signal_suspend_,
+ sr->download);
+ if (NULL != sr->download->serialization)
+ {
+ GNUNET_FS_remove_sync_file_ (sc->h,
+ GNUNET_FS_SYNC_PATH_CHILD_DOWNLOAD,
+ sr->download->serialization);
+ GNUNET_free (sr->download->serialization);
+ sr->download->serialization = NULL;
+ }
+ pi.status = GNUNET_FS_STATUS_DOWNLOAD_LOST_PARENT;
+ GNUNET_FS_download_make_status_ (&pi,
+ sr->download);
+ GNUNET_FS_download_sync_ (sr->download);
+ sr->download = NULL;
+ }
+ if (NULL != sr->update_search)
+ {
+ GNUNET_FS_search_stop (sr->update_search);
+ GNUNET_assert (sr->update_search == NULL);
+ }
pi.status = GNUNET_FS_STATUS_SEARCH_RESULT_STOPPED;
pi.value.search.specifics.result_stopped.cctx = sr->client_info;
pi.value.search.specifics.result_stopped.meta = sr->meta;
pi.value.search.specifics.result_stopped.uri = sr->uri;
- sr->client_info = make_search_status (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
GNUNET_break (NULL == sr->client_info);
-
+ GNUNET_free_non_null (sr->serialization);
GNUNET_FS_uri_destroy (sr->uri);
GNUNET_CONTAINER_meta_data_destroy (sr->meta);
if (sr->probe_ctx != NULL)
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (h->sched,
- sr->probe_cancel_task);
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
GNUNET_free (sr);
return GNUNET_OK;
}
{
struct GNUNET_FS_ProgressInfo pi;
unsigned int i;
- struct GNUNET_FS_SearchContext *parent;
- // FIXME: make un-persistent!
- if (NULL != (parent = sc->parent))
- {
- GNUNET_CONTAINER_DLL_remove (parent->child_head,
- parent->child_tail,
- sc);
- sc->parent = NULL;
- }
- while (NULL != sc->child_head)
- GNUNET_FS_search_stop (sc->child_head);
+ if (sc->top != NULL)
+ GNUNET_FS_end_top (sc->h, sc->top);
+ if (sc->psearch_result != NULL)
+ sc->psearch_result->update_search = NULL;
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
&search_result_free,
sc);
+ if (sc->serialization != NULL)
+ {
+ GNUNET_FS_remove_sync_file_ (sc->h,
+ (sc->psearch_result != NULL)
+ ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH
+ : GNUNET_FS_SYNC_PATH_MASTER_SEARCH,
+ sc->serialization);
+ GNUNET_FS_remove_sync_dir_ (sc->h,
+ (sc->psearch_result != NULL)
+ ? GNUNET_FS_SYNC_PATH_CHILD_SEARCH
+ : GNUNET_FS_SYNC_PATH_MASTER_SEARCH,
+ sc->serialization);
+ GNUNET_free (sc->serialization);
+ }
pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED;
- sc->client_info = make_search_status (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
GNUNET_break (NULL == sc->client_info);
if (sc->task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel (sc->h->sched,
- sc->task);
+ GNUNET_SCHEDULER_cancel (sc->task);
if (NULL != sc->client)
GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results);
}
GNUNET_free_non_null (sc->requests);
+ GNUNET_free_non_null (sc->emsg);
GNUNET_FS_uri_destroy (sc->uri);
GNUNET_free (sc);
}