/*
This file is part of GNUnet.
- (C) 2001-2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2001-2014 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
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 Tem ple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Boston, MA 02110-1301, USA.
*/
/**
* @file fs/fs_search.c
#include "gnunet_fs_service.h"
#include "gnunet_protocols.h"
#include "fs_api.h"
+#include "fs_publish_ublock.h"
/**
* call the callback.
*
* @param pi structure to fill in
+ * @param h file-sharing handle
* @param sc overall search context
* @return value returned by the callback
*/
void *
GNUNET_FS_search_make_status_ (struct GNUNET_FS_ProgressInfo *pi,
+ struct GNUNET_FS_Handle *h,
struct GNUNET_FS_SearchContext *sc)
{
void *ret;
pi->value.search.sc = sc;
- pi->value.search.cctx = sc->client_info;
+ pi->value.search.cctx = (NULL != sc) ? sc->client_info : NULL;
pi->value.search.pctx =
- (NULL == sc->psearch_result) ? 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;
- ret = sc->h->upcb (sc->h->upcb_cls, pi);
+ ((NULL == sc) || (NULL == sc->psearch_result))
+ ? NULL
+ : sc->psearch_result->client_info;
+ pi->value.search.query = (NULL != sc) ? sc->uri : NULL;
+ pi->value.search.duration = (NULL != sc)
+ ? GNUNET_TIME_absolute_get_duration (sc->start_time)
+ : GNUNET_TIME_UNIT_ZERO;
+ pi->value.search.anonymity = (NULL != sc) ? sc->anonymity : 0;
+ pi->fsh = h;
+ ret = h->upcb (h->upcb_cls, pi);
return ret;
}
/**
- * Check if the given result is identical
- * to the given URI.
+ * Check if the given result is identical to the given URI.
*
* @param cls points to the URI we check against
* @param key not used
- * @param value a "struct GNUNET_FS_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
+ * @return #GNUNET_SYSERR if the result is present,
+ * #GNUNET_OK otherwise
*/
static int
-test_result_present (void *cls, const struct GNUNET_HashCode * key, void *value)
+test_result_present (void *cls,
+ const struct GNUNET_HashCode * key,
+ void *value)
{
const struct GNUNET_FS_Uri *uri = cls;
struct GNUNET_FS_SearchResult *sr = value;
pi.value.search.specifics.result.uri = sr->uri;
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);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
}
struct GNUNET_FS_SearchResult *sr)
{
struct GNUNET_FS_ProgressInfo pi;
-
+
pi.status = GNUNET_FS_STATUS_SEARCH_UPDATE;
pi.value.search.specifics.update.cctx = sr->client_info;
pi.value.search.specifics.update.meta = sr->meta;
pi.value.search.specifics.update.availability_certainty =
sr->availability_trials;
pi.value.search.specifics.update.applicability_rank = sr->optional_support;
- pi.value.search.specifics.update.current_probe_time
+ pi.value.search.specifics.update.current_probe_time
= GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
- sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
}
* Check if the given result is identical to the given URI and if so
* return it.
*
- * @param cls a "struct GetResultContext"
+ * @param cls a `struct GetResultContext`
* @param key not used
- * @param value a "struct GNUNET_FS_SearchResult" who's URI we
+ * @param value a `struct GNUNET_FS_SearchResult` who's URI we
* should compare with
- * @return GNUNET_OK
+ * @return #GNUNET_OK
*/
static int
-get_result_present (void *cls, const struct GNUNET_HashCode * key, void *value)
+get_result_present (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GetResultContext *grc = cls;
struct GNUNET_FS_SearchResult *sr = value;
/**
* Signal result of last probe to client and then schedule next
* probe.
+ *
+ * @param sr search result to signal for
*/
static void
signal_probe_result (struct GNUNET_FS_SearchResult *sr)
pi.value.search.specifics.update.cctx = sr->client_info;
pi.value.search.specifics.update.meta = sr->meta;
pi.value.search.specifics.update.uri = sr->uri;
- pi.value.search.specifics.update.availability_rank
+ pi.value.search.specifics.update.availability_rank
= 2 * sr->availability_success - sr->availability_trials;
- pi.value.search.specifics.update.availability_certainty
+ pi.value.search.specifics.update.availability_certainty
= sr->availability_trials;
pi.value.search.specifics.update.applicability_rank = sr->optional_support;
- pi.value.search.specifics.update.current_probe_time
+ pi.value.search.specifics.update.current_probe_time
= GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
- sr->client_info = GNUNET_FS_search_make_status_ (&pi, sr->sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sr->h, 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 GNUNET_FS_SearchResult*'
- * @param tc scheduler context
+ * @param cls our `struct GNUNET_FS_SearchResult *`
*/
static void
-probe_failure_handler (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+probe_failure_handler (void *cls)
{
struct GNUNET_FS_SearchResult *sr = cls;
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
sr->availability_trials++;
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
sr->probe_ctx = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_ping_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_ping_task);
- sr->probe_ping_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ GNUNET_FS_stop_probe_ping_task_ (sr);
GNUNET_FS_search_result_sync_ (sr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Probe #%u for search result %p failed\n",
/**
* Handle the case where we have gotten a response for our probe.
*
- * @param cls our 'struct GNUNET_FS_SearchResult*'
- * @param tc scheduler context
+ * @param cls our `struct GNUNET_FS_SearchResult *`
*/
static void
-probe_success_handler (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+probe_success_handler (void *cls)
{
struct GNUNET_FS_SearchResult *sr = cls;
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
sr->availability_trials++;
sr->availability_success++;
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
sr->probe_ctx = NULL;
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_ping_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_ping_task);
- sr->probe_ping_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ GNUNET_FS_stop_probe_ping_task_ (sr);
GNUNET_FS_search_result_sync_ (sr);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Probe #%u for search result %p succeeded\n",
/**
* Notification of FS that a search probe has made progress.
* This function is used INSTEAD of the client's event handler
- * for downloads where the GNUNET_FS_DOWNLOAD_IS_PROBE flag is set.
+ * for downloads where the #GNUNET_FS_DOWNLOAD_IS_PROBE flag is set.
*
* @param cls closure, always NULL (!), actual closure
* is in the client-context of the info struct
* for this operation; should be set to NULL for
* SUSPEND and STOPPED events). The value returned
* will be passed to future callbacks in the respective
- * field in the GNUNET_FS_ProgressInfo struct.
+ * field in the `struct GNUNET_FS_ProgressInfo`.
*/
void *
GNUNET_FS_search_probe_progress_ (void *cls,
/* ignore */
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
+ if (NULL != sr->probe_cancel_task)
{
GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
}
sr->probe_cancel_task =
GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler, sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
+ if (NULL != sr->probe_cancel_task)
{
GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
}
sr->probe_cancel_task =
GNUNET_SCHEDULER_add_now (&probe_success_handler, sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
+ if (NULL != sr->probe_cancel_task)
{
GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
}
sr = NULL;
break;
case GNUNET_FS_STATUS_DOWNLOAD_ACTIVE:
- if (GNUNET_SCHEDULER_NO_TASK == sr->probe_cancel_task)
+ if (NULL == sr->probe_cancel_task)
{
sr->probe_active_time = GNUNET_TIME_absolute_get ();
sr->probe_cancel_task =
GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
&probe_failure_handler, sr);
}
- else
- {
- /* should only happen if the cancel task was already
- created on 'DOWNLOAD_INACTIVE' as we were out of time */
- GNUNET_break (0 == sr->remaining_probe_time.rel_value);
- }
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
+ if (NULL != sr->probe_cancel_task)
{
GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
}
dur = GNUNET_TIME_absolute_get_duration (sr->probe_active_time);
sr->remaining_probe_time =
GNUNET_TIME_relative_subtract (sr->remaining_probe_time, dur);
- if (0 == sr->remaining_probe_time.rel_value)
+ if (0 == sr->remaining_probe_time.rel_value_us)
sr->probe_cancel_task =
GNUNET_SCHEDULER_add_now (&probe_failure_handler, sr);
GNUNET_FS_search_result_sync_ (sr);
/**
* Task run periodically to remind clients that a probe is active.
*
- * @param cls the 'struct GNUNET_FS_SearchResult' that we are probing for
- * @param tc scheduler context
+ * @param cls the `struct GNUNET_FS_SearchResult` that we are probing for
*/
static void
-probe_ping_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+probe_ping_task_cb (void *cls)
{
- struct GNUNET_FS_SearchResult *sr = cls;
+ struct GNUNET_FS_Handle *h = cls;
+ struct GNUNET_FS_SearchResult *sr;
- signal_probe_result (sr);
- sr->probe_ping_task
+ for (sr = h->probes_head; NULL != sr; sr = sr->next)
+ if (NULL != sr->probe_ctx->mq)
+ signal_probe_result (sr);
+ h->probe_ping_task
= GNUNET_SCHEDULER_add_delayed (GNUNET_FS_PROBE_UPDATE_FREQUENCY,
- &probe_ping_task,
- sr);
+ &probe_ping_task_cb,
+ h);
+}
+
+
+/**
+ * Start the ping task for this search result.
+ *
+ * @param sr result to start pinging for.
+ */
+static void
+start_probe_ping_task (struct GNUNET_FS_SearchResult *sr)
+{
+ struct GNUNET_FS_Handle *h = sr->h;
+
+ GNUNET_CONTAINER_DLL_insert (h->probes_head,
+ h->probes_tail,
+ sr);
+ if (NULL == h->probe_ping_task)
+ h->probe_ping_task
+ = GNUNET_SCHEDULER_add_now (&probe_ping_task_cb,
+ h);
+}
+
+
+/**
+ * Stop the ping task for this search result.
+ *
+ * @param sr result to start pinging for.
+ */
+void
+GNUNET_FS_stop_probe_ping_task_ (struct GNUNET_FS_SearchResult *sr)
+{
+ struct GNUNET_FS_Handle *h = sr->h;
+
+ GNUNET_CONTAINER_DLL_remove (h->probes_head,
+ h->probes_tail,
+ sr);
+ if (NULL == h->probes_head)
+ {
+ GNUNET_SCHEDULER_cancel (h->probe_ping_task);
+ h->probe_ping_task = NULL;
+ }
}
return;
if (NULL != sr->download)
return;
- if (0 == (sr->sc->h->flags & GNUNET_FS_FLAGS_DO_PROBES))
+ if (0 == (sr->h->flags & GNUNET_FS_FLAGS_DO_PROBES))
return;
if (sr->availability_trials > AVAILABILITY_TRIALS_MAX)
return;
(unsigned long long) off,
sr);
sr->remaining_probe_time =
- GNUNET_TIME_relative_multiply (sr->sc->h->avg_block_latency,
- 2 * (1 + sr->availability_trials));
+ GNUNET_TIME_relative_saturating_multiply (sr->h->avg_block_latency,
+ 2 * (1 + sr->availability_trials));
sr->probe_ctx =
- GNUNET_FS_download_start (sr->sc->h, sr->uri, sr->meta, NULL, NULL, off,
- len, sr->sc->anonymity,
+ GNUNET_FS_download_start (sr->h, sr->uri, sr->meta, NULL, NULL, off,
+ len, sr->anonymity,
GNUNET_FS_DOWNLOAD_NO_TEMPORARIES |
GNUNET_FS_DOWNLOAD_IS_PROBE, sr, NULL);
- sr->probe_ping_task
- = GNUNET_SCHEDULER_add_now (&probe_ping_task,
- sr);
+ start_probe_ping_task (sr);
+}
+
+
+/**
+ * Start download probes for the given search result.
+ *
+ * @param h file-sharing handle to use for the operation
+ * @param uri URI to probe
+ * @param meta meta data associated with the URI
+ * @param client_info client info pointer to use for associated events
+ * @param anonymity anonymity level to use for the probes
+ * @return the search result handle to access the probe activity
+ */
+struct GNUNET_FS_SearchResult *
+GNUNET_FS_probe (struct GNUNET_FS_Handle *h,
+ const struct GNUNET_FS_Uri *uri,
+ const struct GNUNET_CONTAINER_MetaData *meta,
+ void *client_info,
+ uint32_t anonymity)
+{
+ struct GNUNET_FS_SearchResult *sr;
+
+ GNUNET_assert (NULL != h);
+ sr = GNUNET_new (struct GNUNET_FS_SearchResult);
+ sr->h = h;
+ sr->uri = GNUNET_FS_uri_dup (uri);
+ sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
+ sr->client_info = client_info;
+ sr->anonymity = anonymity;
+ GNUNET_FS_search_start_probe_ (sr);
+ return sr;
+}
+
+
+/**
+ * Stop probing activity associated with a search result.
+ *
+ * @param sr search result
+ */
+static void
+GNUNET_FS_search_stop_probe_ (struct GNUNET_FS_SearchResult *sr)
+{
+ if (NULL != sr->probe_ctx)
+ {
+ GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
+ sr->probe_ctx = NULL;
+ GNUNET_FS_stop_probe_ping_task_ (sr);
+ }
+ if (NULL != sr->probe_cancel_task)
+ {
+ GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
+ sr->probe_cancel_task = NULL;
+ }
+}
+
+
+/**
+ * Stop probe activity. Must ONLY be used on values
+ * returned from #GNUNET_FS_probe.
+ *
+ * @param sr search result to stop probing for (freed)
+ * @return the value of the 'client_info' pointer
+ */
+void *
+GNUNET_FS_probe_stop (struct GNUNET_FS_SearchResult *sr)
+{
+ void *client_info;
+
+ GNUNET_assert (NULL == sr->sc);
+ GNUNET_FS_search_stop_probe_ (sr);
+ GNUNET_FS_uri_destroy (sr->uri);
+ GNUNET_CONTAINER_meta_data_destroy (sr->meta);
+ client_info = sr->client_info;
+ GNUNET_free (sr);
+ return client_info;
}
* @param ent entry for the specific keyword
* @param uri the URI that was found
* @param meta metadata associated with the URI
- * under the "ent" keyword
+ * under the @a ent keyword
*/
static void
process_ksk_result (struct GNUNET_FS_SearchContext *sc,
GNUNET_assert (NULL != sc);
GNUNET_FS_uri_to_key (uri, &key);
if (GNUNET_SYSERR ==
- GNUNET_CONTAINER_multihashmap_get_multiple (ent->results, &key,
+ GNUNET_CONTAINER_multihashmap_get_multiple (ent->results,
+ &key,
&test_result_present,
(void *) uri))
return; /* duplicate result */
/* try to find search result in master map */
grc.sr = NULL;
grc.uri = uri;
- GNUNET_CONTAINER_multihashmap_get_multiple (sc->master_result_map, &key,
+ GNUNET_CONTAINER_multihashmap_get_multiple (sc->master_result_map,
+ &key,
&get_result_present, &grc);
sr = grc.sr;
is_new = (NULL == sr) || (sr->mandatory_missing > 0);
if (NULL == sr)
{
- sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+ sr = GNUNET_new (struct GNUNET_FS_SearchResult);
+ sr->h = sc->h;
sr->sc = sc;
+ sr->anonymity = sc->anonymity;
sr->uri = GNUNET_FS_uri_dup (uri);
sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
sr->mandatory_missing = sc->mandatory_count;
{
GNUNET_CONTAINER_meta_data_merge (sr->meta, meta);
}
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (ent->results,
+ &sr->key,
+ sr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+
koff = ent - sc->requests;
- GNUNET_assert ( (ent >= sc->requests) && (koff < sc->uri->data.ksk.keywordCount));
+ GNUNET_assert ( (ent >= sc->requests) &&
+ (koff < sc->uri->data.ksk.keywordCount));
sr->keyword_bitmap[koff / 8] |= (1 << (koff % 8));
/* check if mandatory satisfied */
- if (ent->mandatory)
- sr->mandatory_missing--;
- else
- sr->optional_support++;
+ if (1 <= GNUNET_CONTAINER_multihashmap_size (ent->results))
+ {
+ if (ent->mandatory)
+ {
+ GNUNET_break (sr->mandatory_missing > 0);
+ sr->mandatory_missing--;
+ }
+ else
+ {
+ sr->optional_support++;
+ }
+ }
if (0 != sr->mandatory_missing)
+ {
+ GNUNET_break (NULL == sr->client_info);
return;
+ }
if (is_new)
notify_client_chk_result (sc, sr);
else
* @return context that can be used to control the search
*/
static struct GNUNET_FS_SearchContext *
-search_start (struct GNUNET_FS_Handle *h, const struct GNUNET_FS_Uri *uri,
- uint32_t anonymity, enum GNUNET_FS_SearchOptions options,
- void *cctx, struct GNUNET_FS_SearchResult *psearch);
+search_start (struct GNUNET_FS_Handle *h,
+ const struct GNUNET_FS_Uri *uri,
+ uint32_t anonymity,
+ enum GNUNET_FS_SearchOptions options,
+ void *cctx,
+ struct GNUNET_FS_SearchResult *psearch);
/**
* @param meta metadata associated with the URI
*/
static void
-process_sks_result (struct GNUNET_FS_SearchContext *sc, const char *id_update,
+process_sks_result (struct GNUNET_FS_SearchContext *sc,
+ const char *id_update,
const struct GNUNET_FS_Uri *uri,
const struct GNUNET_CONTAINER_MetaData *meta)
{
&test_result_present,
(void *) uri))
return; /* duplicate result */
- sr = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchResult));
+ sr = GNUNET_new (struct GNUNET_FS_SearchResult);
+ sr->h = sc->h;
sr->sc = sc;
+ sr->anonymity = sc->anonymity;
sr->uri = GNUNET_FS_uri_dup (uri);
sr->meta = GNUNET_CONTAINER_meta_data_duplicate (meta);
sr->key = key;
GNUNET_FS_search_result_sync_ (sr);
GNUNET_FS_search_start_probe_ (sr);
/* notify client */
- notify_client_chk_result (sc, sr);
+ if (0 == sr->mandatory_missing)
+ notify_client_chk_result (sc, sr);
+ else
+ GNUNET_break (NULL == sr->client_info);
/* search for updates */
if (0 == strlen (id_update))
return; /* no updates */
* given ciphertext block.
*
* @param sc search context with the keywords
- * @param verification_key public key to use to lookup the keyword
+ * @param dpub derived public key used for the search
* @param edata encrypted data
- * @param edata_size number of bytes in 'edata' (and 'data')
+ * @param edata_size number of bytes in @a edata (and @a data)
* @param data where to store the plaintext
- * @return keyword index on success, GNUNET_SYSERR on error (no such
+ * @return keyword index on success, #GNUNET_SYSERR on error (no such
* keyword, internal error)
*/
static int
decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc,
- const struct GNUNET_PseudonymIdentifier *verification_key,
+ const struct GNUNET_CRYPTO_EcdsaPublicKey *dpub,
const void *edata,
size_t edata_size,
char *data)
-{
- struct GNUNET_HashCode q;
- struct GNUNET_CRYPTO_AesSessionKey skey;
- struct GNUNET_CRYPTO_AesInitializationVector iv;
- int i;
+{
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *anon;
+ struct GNUNET_CRYPTO_EcdsaPublicKey anon_pub;
+ unsigned int i;
- GNUNET_CRYPTO_hash (verification_key,
- sizeof (struct GNUNET_PseudonymIdentifier),
- &q);
/* find key */
for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
- if (0 == memcmp (&q, &sc->requests[i].uquery, sizeof (struct GNUNET_HashCode)))
+ if (0 == memcmp (dpub,
+ &sc->requests[i].dpub,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))
break;
if (i == sc->uri->data.ksk.keywordCount)
{
return GNUNET_SYSERR;
}
/* decrypt */
- GNUNET_CRYPTO_hash_to_aes_key (&sc->requests[i].ukey, &skey, &iv);
- if (-1 ==
- GNUNET_CRYPTO_aes_decrypt (edata, edata_size, &skey,
- &iv, data))
- {
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
+ anon = GNUNET_CRYPTO_ecdsa_key_get_anonymous ();
+ GNUNET_CRYPTO_ecdsa_key_get_public (anon, &anon_pub);
+ GNUNET_FS_ublock_decrypt_ (edata, edata_size,
+ &anon_pub,
+ sc->requests[i].keyword,
+ data);
return i;
}
*
* @param sc our search context
* @param ub the ublock with the keyword search result
- * @param size size of nb
+ * @param size size of @a ub
*/
static void
-process_kblock (struct GNUNET_FS_SearchContext *sc, const struct UBlock *ub,
+process_kblock (struct GNUNET_FS_SearchContext *sc,
+ const struct UBlock *ub,
size_t size)
{
size_t j;
}
if (NULL == (uri = GNUNET_FS_uri_parse (&pt[1], &emsg)))
{
- GNUNET_break_op (0); /* ublock malformed */
- GNUNET_free_non_null (emsg);
+ if (GNUNET_FS_VERSION > 0x00090400)
+ {
+ /* we broke this in 0x00090300, so don't bitch
+ too loudly just one version up... */
+ GNUNET_break_op (0); /* ublock malformed */
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to parse URI `%s': %s\n"),
+ &pt[1],
+ emsg);
+ }
+ GNUNET_free_non_null (emsg);
return;
}
j = eos - pt + 1;
GNUNET_FS_uri_destroy (uri);
return;
}
- process_ksk_result (sc, &sc->requests[i], uri, meta);
+ process_ksk_result (sc,
+ &sc->requests[i],
+ uri,
+ meta);
/* clean up */
GNUNET_CONTAINER_meta_data_destroy (meta);
*
* @param sc our search context
* @param ub the ublock with a namespace result
- * @param size size of sb
+ * @param size size of @a ub
*/
static void
-process_sblock (struct GNUNET_FS_SearchContext *sc,
+process_sblock (struct GNUNET_FS_SearchContext *sc,
const struct UBlock *ub,
size_t size)
{
size_t len = size - sizeof (struct UBlock);
char pt[len];
- struct GNUNET_CRYPTO_AesSessionKey skey;
- struct GNUNET_CRYPTO_AesInitializationVector iv;
struct GNUNET_FS_Uri *uri;
struct GNUNET_CONTAINER_MetaData *meta;
const char *id;
const char *uris;
size_t off;
char *emsg;
- struct GNUNET_HashCode key;
- struct GNUNET_HashCode id_hash;
- struct GNUNET_HashCode ns_hash;
- char *identifier;
- /* decrypt */
- identifier = sc->uri->data.sks.identifier;
- GNUNET_CRYPTO_hash (identifier, strlen (identifier), &id_hash);
- GNUNET_CRYPTO_hash (&sc->uri->data.sks.ns,
- sizeof (sc->uri->data.sks.ns), &ns_hash);
- GNUNET_CRYPTO_hash_xor (&id_hash, &ns_hash, &key);
- GNUNET_CRYPTO_hash_to_aes_key (&key, &skey, &iv);
- if (-1 == GNUNET_CRYPTO_aes_decrypt (&ub[1], len, &skey, &iv, pt))
- {
- GNUNET_break (0);
- return;
- }
+ GNUNET_FS_ublock_decrypt_ (&ub[1], len,
+ &sc->uri->data.sks.ns,
+ sc->uri->data.sks.identifier,
+ pt);
/* parse */
if (0 == (off = GNUNET_STRINGS_buffer_tokenize (pt, len, 2, &id, &uris)))
{
}
if (NULL == (uri = GNUNET_FS_uri_parse (uris, &emsg)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to parse URI `%s': %s\n"),
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Failed to parse URI `%s': %s\n"),
uris, emsg);
GNUNET_break_op (0); /* ublock malformed */
GNUNET_free_non_null (emsg);
/**
- * Process a search result.
+ * Shutdown any existing connection to the FS
+ * service and try to establish a fresh one
+ * (and then re-transmit our search request).
*
- * @param sc our search context
- * @param type type of the result
- * @param expiration when it will expire
- * @param data the (encrypted) response
- * @param size size of data
+ * @param sc the search to reconnec
*/
static void
-process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type type,
- struct GNUNET_TIME_Absolute expiration,
- const void *data,
- size_t size)
+try_reconnect (struct GNUNET_FS_SearchContext *sc);
+
+
+/**
+ * We check a result message from the service.
+ *
+ * @param cls closure
+ * @param msg result message received
+ */
+static int
+check_result (void *cls,
+ const struct ClientPutMessage *cm)
+{
+ /* payload of any variable size is OK */
+ return GNUNET_OK;
+}
+
+
+/**
+ * We process a search result from the service.
+ *
+ * @param cls closure
+ * @param msg result message received
+ */
+static void
+handle_result (void *cls,
+ const struct ClientPutMessage *cm)
{
- if (GNUNET_TIME_absolute_get_duration (expiration).rel_value > 0)
+ struct GNUNET_FS_SearchContext *sc = cls;
+ uint16_t msize = ntohs (cm->header.size) - sizeof (*cm);
+ enum GNUNET_BLOCK_Type type = ntohl (cm->type);
+
+ if (GNUNET_TIME_absolute_get_duration (GNUNET_TIME_absolute_ntoh (cm->expiration)).rel_value_us > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Result received has already expired.\n");
{
case GNUNET_BLOCK_TYPE_FS_UBLOCK:
if (GNUNET_FS_URI_SKS == sc->uri->type)
- process_sblock (sc, data, size);
+ process_sblock (sc,
+ (const struct UBlock *) &cm[1],
+ msize);
else
- process_kblock (sc, data, size);
+ process_kblock (sc,
+ (const struct UBlock *) &cm[1],
+ msize);
break;
case GNUNET_BLOCK_TYPE_ANY:
GNUNET_break (0);
break;
default:
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Got result with unknown block type `%d', ignoring"), type);
+ _("Got result with unknown block type `%d', ignoring"),
+ type);
break;
}
}
-/**
- * Shutdown any existing connection to the FS
- * service and try to establish a fresh one
- * (and then re-transmit our search request).
- *
- * @param sc the search to reconnec
- */
-static void
-try_reconnect (struct GNUNET_FS_SearchContext *sc);
-
-
-/**
- * Type of a function to call when we receive a message
- * from the service.
- *
- * @param cls closure
- * @param msg message received, NULL on timeout or fatal error
- */
-static void
-receive_results (void *cls, const struct GNUNET_MessageHeader *msg)
-{
- struct GNUNET_FS_SearchContext *sc = cls;
- const struct ClientPutMessage *cm;
- uint16_t msize;
-
- if ((NULL == msg) || (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_PUT) ||
- (ntohs (msg->size) <= sizeof (struct ClientPutMessage)))
- {
- try_reconnect (sc);
- return;
- }
- msize = ntohs (msg->size);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving %u bytes of result from fs service\n", msize);
- cm = (const struct ClientPutMessage *) msg;
- process_result (sc, ntohl (cm->type),
- GNUNET_TIME_absolute_ntoh (cm->expiration), &cm[1],
- msize - sizeof (struct ClientPutMessage));
- /* continue receiving */
- GNUNET_CLIENT_receive (sc->client, &receive_results, sc,
- GNUNET_TIME_UNIT_FOREVER_REL);
-}
-
-
/**
* Schedule the transmission of the (next) search request
* to the service.
/**
- * Closure for 'build_result_set'.
+ * Closure for #build_result_set().
*/
struct MessageBuilderContext
{
* Iterating over the known results, pick those matching the given
* result range and store their keys at 'xoff'.
*
- * @param cls the 'struct MessageBuilderContext'
+ * @param cls the `struct MessageBuilderContext`
* @param key key for a result
* @param value the search result
- * @return GNUNET_OK to continue iterating
+ * @return #GNUNET_OK to continue iterating
*/
static int
-build_result_set (void *cls, const struct GNUNET_HashCode * key, void *value)
+build_result_set (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct MessageBuilderContext *mbc = cls;
struct GNUNET_FS_SearchResult *sr = value;
}
if (0 == mbc->put_cnt)
return GNUNET_SYSERR;
- mbc->sc->search_request_map_offset++;
mbc->xoff[--mbc->put_cnt] = *key;
+
return GNUNET_OK;
}
/**
- * Iterating over the known results, count those
- * matching the given result range and increment
- * put count for each.
+ * Iterating over the known results, count those matching the given
+ * result range and increment put count for each.
*
- * @param cls the 'struct MessageBuilderContext'
+ * @param cls the `struct MessageBuilderContext`
* @param key key for a result
* @param value the search result
- * @return GNUNET_OK to continue iterating
+ * @return #GNUNET_OK to continue iterating
*/
static int
-find_result_set (void *cls, const struct GNUNET_HashCode * key, void *value)
+find_result_set (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct MessageBuilderContext *mbc = cls;
struct GNUNET_FS_SearchResult *sr = value;
/**
- * We're ready to transmit the search request to the
- * file-sharing service. Do it.
+ * Schedule the transmission of the (next) search request
+ * to the service.
*
- * @param cls closure
- * @param size number of bytes available in buf
- * @param buf where the callee should write the message
- * @return number of bytes written to buf
+ * @param sc context for the search
*/
-static size_t
-transmit_search_request (void *cls, size_t size, void *buf)
+static void
+schedule_transmit_search_request (struct GNUNET_FS_SearchContext *sc)
{
- struct GNUNET_FS_SearchContext *sc = cls;
struct MessageBuilderContext mbc;
- size_t msize;
+ struct GNUNET_MQ_Envelope *env;
struct SearchMessage *sm;
- const char *identifier;
- struct GNUNET_HashCode key;
- struct GNUNET_HashCode signing_key;
- struct GNUNET_HashCode ns_hash;
- struct GNUNET_HashCode id_hash;
- struct GNUNET_PseudonymIdentifier verification_key;
- unsigned int sqms;
+ struct GNUNET_CRYPTO_EcdsaPublicKey dpub;
+ unsigned int total_seen_results; /* total number of result hashes to send */
uint32_t options;
+ unsigned int left;
+ unsigned int todo;
+ unsigned int fit;
+ int first_call;
+ unsigned int search_request_map_offset;
+ unsigned int keyword_offset;
- if (NULL == buf)
- {
- try_reconnect (sc);
- return 0;
- }
+ memset (&mbc, 0, sizeof (mbc));
mbc.sc = sc;
- mbc.skip_cnt = sc->search_request_map_offset;
- sm = buf;
- sm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_START_SEARCH);
- mbc.xoff = (struct GNUNET_HashCode *) & sm[1];
- options = SEARCH_MESSAGE_OPTION_NONE;
- if (0 != (sc->options & GNUNET_FS_SEARCH_OPTION_LOOPBACK_ONLY))
- options |= SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY;
if (GNUNET_FS_uri_test_ksk (sc->uri))
{
- msize = sizeof (struct SearchMessage);
- GNUNET_assert (size >= msize);
- mbc.keyword_offset = sc->keyword_offset;
- /* calculate total number of known results (in put_cnt => sqms) */
mbc.put_cnt = 0;
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
- &find_result_set, &mbc);
- sqms = mbc.put_cnt;
- /* calculate how many results we can send in this message */
- mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode);
- mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt);
- if (sc->search_request_map_offset < sqms)
- GNUNET_assert (mbc.put_cnt > 0);
-
- /* now build message */
- msize += sizeof (struct GNUNET_HashCode) * mbc.put_cnt;
- sm->header.size = htons (msize);
- sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
- sm->anonymity_level = htonl (sc->anonymity);
- memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
- sm->query = sc->requests[sc->keyword_offset].uquery;
- GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
- &build_result_set, &mbc);
- GNUNET_assert (sqms >= sc->search_request_map_offset);
- if (sqms != sc->search_request_map_offset)
- {
- /* more requesting to be done... */
- sm->options = htonl (options | SEARCH_MESSAGE_OPTION_CONTINUED);
- schedule_transmit_search_request (sc);
- return msize;
- }
- sm->options = htonl (options);
- sc->keyword_offset++;
- if (sc->uri->data.ksk.keywordCount != sc->keyword_offset)
- {
- /* more requesting to be done... */
- schedule_transmit_search_request (sc);
- return msize;
- }
+ &find_result_set,
+ &mbc);
+ total_seen_results = mbc.put_cnt;
}
else
{
- GNUNET_assert (GNUNET_FS_uri_test_sks (sc->uri));
- msize = sizeof (struct SearchMessage);
- GNUNET_assert (size >= msize);
- sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
- sm->anonymity_level = htonl (sc->anonymity);
- memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
-
- identifier = sc->uri->data.sks.identifier;
- GNUNET_CRYPTO_hash (identifier, strlen (identifier), &id_hash);
- GNUNET_CRYPTO_hash (&sc->uri->data.sks.ns,
- sizeof (sc->uri->data.sks.ns), &ns_hash);
- GNUNET_CRYPTO_hash_xor (&id_hash, &ns_hash, &key);
- GNUNET_CRYPTO_hash (&key, sizeof (struct GNUNET_HashCode), &signing_key);
- GNUNET_PSEUDONYM_derive_verification_key (&sc->uri->data.sks.ns,
- &signing_key,
- &verification_key);
- GNUNET_CRYPTO_hash (&verification_key,
- sizeof (verification_key),
- &sm->query);
- mbc.put_cnt = (size - msize) / sizeof (struct GNUNET_HashCode);
- sqms = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map);
- mbc.put_cnt = GNUNET_MIN (mbc.put_cnt, sqms - mbc.skip_cnt);
- mbc.keyword_offset = 0;
- if (sc->search_request_map_offset < sqms)
- GNUNET_assert (mbc.put_cnt > 0);
- msize += sizeof (struct GNUNET_HashCode) * mbc.put_cnt;
- GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
- &build_result_set, &mbc);
- sm->header.size = htons (msize);
- GNUNET_assert (sqms >= sc->search_request_map_offset);
- if (sqms != sc->search_request_map_offset)
+ total_seen_results
+ = GNUNET_CONTAINER_multihashmap_size (sc->master_result_map);
+ }
+ search_request_map_offset = 0;
+ keyword_offset = 0;
+
+ first_call = GNUNET_YES;
+ while ( (0 != (left =
+ (total_seen_results - search_request_map_offset))) ||
+ (GNUNET_YES == first_call) )
+ {
+ first_call = GNUNET_NO;
+ options = SEARCH_MESSAGE_OPTION_NONE;
+ if (0 != (sc->options & GNUNET_FS_SEARCH_OPTION_LOOPBACK_ONLY))
+ options |= SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY;
+
+ fit = (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - sizeof (*sm)) / sizeof (struct GNUNET_HashCode);
+ todo = GNUNET_MIN (fit,
+ left);
+ env = GNUNET_MQ_msg_extra (sm,
+ sizeof (struct GNUNET_HashCode) * todo,
+ GNUNET_MESSAGE_TYPE_FS_START_SEARCH);
+ mbc.skip_cnt = search_request_map_offset;
+ mbc.xoff = (struct GNUNET_HashCode *) &sm[1];
+
+ if (GNUNET_FS_uri_test_ksk (sc->uri))
+ {
+ mbc.keyword_offset = keyword_offset;
+ /* calculate how many results we can send in this message */
+ mbc.put_cnt = todo;
+ /* now build message */
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
+ sm->anonymity_level = htonl (sc->anonymity);
+ memset (&sm->target,
+ 0,
+ sizeof (struct GNUNET_PeerIdentity));
+ sm->query = sc->requests[keyword_offset].uquery;
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &build_result_set,
+ &mbc);
+ search_request_map_offset += todo;
+ GNUNET_assert (0 == mbc.put_cnt); /* #4608 reports this fails? */
+ GNUNET_assert (total_seen_results >= search_request_map_offset);
+ if (total_seen_results != search_request_map_offset)
+ {
+ /* more requesting to be done... */
+ sm->options = htonl (options | SEARCH_MESSAGE_OPTION_CONTINUED);
+ }
+ else
+ {
+ sm->options = htonl (options);
+ keyword_offset++;
+ search_request_map_offset = 0;
+ if (sc->uri->data.ksk.keywordCount != keyword_offset)
+ {
+ /* more keywords => more requesting to be done... */
+ first_call = GNUNET_YES;
+ }
+ }
+ }
+ else
{
- /* more requesting to be done... */
- sm->options = htonl (options | SEARCH_MESSAGE_OPTION_CONTINUED);
- schedule_transmit_search_request (sc);
- return msize;
+ GNUNET_assert (GNUNET_FS_uri_test_sks (sc->uri));
+
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
+ sm->anonymity_level = htonl (sc->anonymity);
+ memset (&sm->target,
+ 0,
+ sizeof (struct GNUNET_PeerIdentity));
+ GNUNET_CRYPTO_ecdsa_public_key_derive (&sc->uri->data.sks.ns,
+ sc->uri->data.sks.identifier,
+ "fs-ublock",
+ &dpub);
+ GNUNET_CRYPTO_hash (&dpub,
+ sizeof (dpub),
+ &sm->query);
+ mbc.put_cnt = todo;
+ mbc.keyword_offset = 0;
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &build_result_set,
+ &mbc);
+ GNUNET_assert (total_seen_results >= search_request_map_offset);
+ if (total_seen_results != search_request_map_offset)
+ {
+ /* more requesting to be done... */
+ sm->options = htonl (options | SEARCH_MESSAGE_OPTION_CONTINUED);
+ }
+ else
+ {
+ sm->options = htonl (options);
+ }
}
- sm->options = htonl (options);
+ GNUNET_MQ_send (sc->mq,
+ env);
}
- GNUNET_CLIENT_receive (sc->client, &receive_results, sc,
- GNUNET_TIME_UNIT_FOREVER_REL);
- return msize;
}
/**
- * Schedule the transmission of the (next) search request
- * to the service.
+ * 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 sc context for the search
+ * @param cls closure with the `struct GNUNET_FS_SearchContext *`
+ * @param error error code
*/
static void
-schedule_transmit_search_request (struct GNUNET_FS_SearchContext *sc)
+search_mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
- size_t size;
- unsigned int sqms;
- unsigned int fit;
-
- size = sizeof (struct SearchMessage);
- sqms =
- GNUNET_CONTAINER_multihashmap_size (sc->master_result_map) -
- sc->search_request_map_offset;
- fit = (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - size) / sizeof (struct GNUNET_HashCode);
- fit = GNUNET_MIN (fit, sqms);
- size += sizeof (struct GNUNET_HashCode) * fit;
- GNUNET_CLIENT_notify_transmit_ready (sc->client, size,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- GNUNET_NO, &transmit_search_request, sc);
+ struct GNUNET_FS_SearchContext *sc = cls;
+ if (NULL != sc->mq)
+ {
+ GNUNET_MQ_destroy (sc->mq);
+ sc->mq = NULL;
+ }
+ try_reconnect (sc);
}
* our queries NOW.
*
* @param cls our search context
- * @param tc unused
*/
static void
-do_reconnect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_reconnect (void *cls)
{
struct GNUNET_FS_SearchContext *sc = cls;
- struct GNUNET_CLIENT_Connection *client;
-
- sc->task = GNUNET_SCHEDULER_NO_TASK;
- client = GNUNET_CLIENT_connect ("fs", sc->h->cfg);
- if (NULL == client)
+ struct GNUNET_MQ_MessageHandler handlers[] = {
+ GNUNET_MQ_hd_var_size (result,
+ GNUNET_MESSAGE_TYPE_FS_PUT,
+ struct ClientPutMessage,
+ sc),
+ GNUNET_MQ_handler_end ()
+ };
+
+ sc->task = NULL;
+ sc->mq = GNUNET_CLIENT_connect (sc->h->cfg,
+ "fs",
+ handlers,
+ &search_mq_error_handler,
+ sc);
+ if (NULL == sc->mq)
{
try_reconnect (sc);
return;
}
- sc->client = client;
- sc->search_request_map_offset = 0;
- sc->keyword_offset = 0;
schedule_transmit_search_request (sc);
}
static void
try_reconnect (struct GNUNET_FS_SearchContext *sc)
{
- if (NULL != sc->client)
+ if (NULL != sc->mq)
{
- GNUNET_CLIENT_disconnect (sc->client);
- sc->client = NULL;
+ GNUNET_MQ_destroy (sc->mq);
+ sc->mq = NULL;
}
sc->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (sc->reconnect_backoff);
sc->task =
- GNUNET_SCHEDULER_add_delayed (sc->reconnect_backoff,
+ GNUNET_SCHEDULER_add_delayed (sc->reconnect_backoff,
&do_reconnect,
sc);
}
* @return context that can be used to control the search
*/
static struct GNUNET_FS_SearchContext *
-search_start (struct GNUNET_FS_Handle *h, const struct GNUNET_FS_Uri *uri,
- uint32_t anonymity, enum GNUNET_FS_SearchOptions options,
- void *cctx, struct GNUNET_FS_SearchResult *psearch)
+search_start (struct GNUNET_FS_Handle *h,
+ const struct GNUNET_FS_Uri *uri,
+ uint32_t anonymity,
+ enum GNUNET_FS_SearchOptions options,
+ void *cctx,
+ struct GNUNET_FS_SearchResult *psearch)
{
struct GNUNET_FS_SearchContext *sc;
struct GNUNET_FS_ProgressInfo pi;
- sc = GNUNET_malloc (sizeof (struct GNUNET_FS_SearchContext));
+ sc = GNUNET_new (struct GNUNET_FS_SearchContext);
sc->h = h;
sc->options = options;
sc->uri = GNUNET_FS_uri_dup (uri);
}
GNUNET_FS_search_sync_ (sc);
pi.status = GNUNET_FS_STATUS_SEARCH_START;
- sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
return sc;
}
+/**
+ * Update the 'results' map for the individual keywords with the
+ * results from the 'global' result set.
+ *
+ * @param cls closure, the `struct GNUNET_FS_SearchContext *`
+ * @param key current key code
+ * @param value value in the hash map, the `struct GNUNET_FS_SearchResult *`
+ * @return #GNUNET_YES (we should continue to iterate)
+ */
+static int
+update_sre_result_maps (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
+{
+ struct GNUNET_FS_SearchContext *sc = cls;
+ struct GNUNET_FS_SearchResult *sr = value;
+ unsigned int i;
+
+ for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
+ if (0 != (sr->keyword_bitmap[i / 8] & (1 << (i % 8))))
+ GNUNET_break (GNUNET_OK ==
+ GNUNET_CONTAINER_multihashmap_put (sc->requests[i].results,
+ &sr->key,
+ sr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
+
+ return GNUNET_YES;
+}
+
+
/**
* 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
+ * @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;
- struct GNUNET_HashCode signing_key;
- struct GNUNET_PseudonymHandle *ph;
- struct GNUNET_PseudonymIdentifier anon;
- struct GNUNET_PseudonymIdentifier verification_key;
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *anon;
+ struct GNUNET_CRYPTO_EcdsaPublicKey anon_pub;
+ struct SearchRequestEntry *sre;
- GNUNET_assert (NULL == sc->client);
+ GNUNET_assert (NULL == sc->mq);
if (GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_assert (0 != sc->uri->data.ksk.keywordCount);
- ph = GNUNET_PSEUDONYM_get_anonymous_pseudonym_handle ();
- GNUNET_PSEUDONYM_get_identifier (ph, &anon);
- GNUNET_PSEUDONYM_destroy (ph);
+ anon = GNUNET_CRYPTO_ecdsa_key_get_anonymous ();
+ GNUNET_CRYPTO_ecdsa_key_get_public (anon, &anon_pub);
sc->requests =
GNUNET_malloc (sizeof (struct SearchRequestEntry) *
sc->uri->data.ksk.keywordCount);
for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
{
keyword = &sc->uri->data.ksk.keywords[i][1];
- GNUNET_CRYPTO_hash (keyword, strlen (keyword), &sc->requests[i].ukey);
- GNUNET_CRYPTO_hash (&sc->requests[i].ukey, sizeof (struct GNUNET_HashCode), &signing_key);
- GNUNET_PSEUDONYM_derive_verification_key (&anon,
- &signing_key,
- &verification_key);
- GNUNET_CRYPTO_hash (&verification_key, sizeof (struct GNUNET_PseudonymIdentifier),
- &sc->requests[i].uquery);
- sc->requests[i].mandatory = (sc->uri->data.ksk.keywords[i][0] == '+');
- if (sc->requests[i].mandatory)
+ sre = &sc->requests[i];
+ sre->keyword = GNUNET_strdup (keyword);
+ GNUNET_CRYPTO_ecdsa_public_key_derive (&anon_pub,
+ keyword,
+ "fs-ublock",
+ &sre->dpub);
+ GNUNET_CRYPTO_hash (&sre->dpub,
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey),
+ &sre->uquery);
+ sre->mandatory = (sc->uri->data.ksk.keywords[i][0] == '+');
+ if (sre->mandatory)
sc->mandatory_count++;
- sc->requests[i].results = GNUNET_CONTAINER_multihashmap_create (4, GNUNET_NO);
+ sre->results = GNUNET_CONTAINER_multihashmap_create (4, GNUNET_NO);
}
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &update_sre_result_maps,
+ sc);
}
- sc->client = GNUNET_CLIENT_connect ("fs", sc->h->cfg);
- if (NULL == sc->client)
+ GNUNET_assert (NULL == sc->task);
+ do_reconnect (sc);
+ if (NULL == sc->mq)
+ {
+ GNUNET_SCHEDULER_cancel (sc->task);
+ sc->task = NULL;
return GNUNET_SYSERR;
- schedule_transmit_search_request (sc);
+ }
return GNUNET_OK;
}
* @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
+ * @return #GNUNET_OK
*/
static int
-search_result_freeze_probes (void *cls, const struct GNUNET_HashCode * key,
+search_result_freeze_probes (void *cls,
+ const struct GNUNET_HashCode *key,
void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
{
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
sr->probe_ctx = NULL;
+ GNUNET_FS_stop_probe_ping_task_ (sr);
}
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_ping_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_ping_task);
- sr->probe_ping_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
+ if (NULL != sr->probe_cancel_task)
{
GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
+ sr->probe_cancel_task = NULL;
}
if (NULL != sr->update_search)
GNUNET_FS_search_pause (sr->update_search);
* @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
+ * @return #GNUNET_OK
*/
static int
-search_result_resume_probes (void *cls, const struct GNUNET_HashCode * key,
+search_result_resume_probes (void *cls,
+ const struct GNUNET_HashCode * key,
void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
* @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
+ * @return #GNUNET_OK
*/
static int
-search_result_suspend (void *cls, const struct GNUNET_HashCode * key, void *value)
+search_result_suspend (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
struct GNUNET_FS_SearchResult *sr = value;
GNUNET_FS_download_signal_suspend_ (sr->download);
sr->download = NULL;
}
- if (NULL != sr->probe_ctx)
- {
- GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
- sr->probe_ctx = NULL;
- }
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_ping_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_ping_task);
- sr->probe_ping_task = GNUNET_SCHEDULER_NO_TASK;
- }
if (NULL != sr->update_search)
{
GNUNET_FS_search_signal_suspend_ (sr->update_search);
sr->update_search = NULL;
}
- 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_FS_search_stop_probe_ (sr);
+ if (0 == sr->mandatory_missing)
+ {
+ /* client is aware of search result, notify about suspension event */
+ 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->h, 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 (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
- }
GNUNET_free_non_null (sr->keyword_bitmap);
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
+ * @param cls the `struct GNUNET_FS_SearchContext` to signal for
*/
void
GNUNET_FS_search_signal_suspend_ (void *cls)
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);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
GNUNET_break (NULL == sc->client_info);
- if (sc->task != GNUNET_SCHEDULER_NO_TASK)
+ if (sc->task != NULL)
+ {
GNUNET_SCHEDULER_cancel (sc->task);
- if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client);
+ sc->task = NULL;
+ }
+ if (NULL != sc->mq)
+ {
+ GNUNET_MQ_destroy (sc->mq);
+ sc->mq = NULL;
+ }
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
if (NULL != sc->requests)
{
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 (sc->requests[i].keyword);
+ }
}
GNUNET_free_non_null (sc->requests);
GNUNET_free_non_null (sc->emsg);
{
struct GNUNET_FS_ProgressInfo pi;
- if (GNUNET_SCHEDULER_NO_TASK != sc->task)
+ if (NULL != sc->task)
+ {
GNUNET_SCHEDULER_cancel (sc->task);
- sc->task = GNUNET_SCHEDULER_NO_TASK;
- if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client);
- sc->client = NULL;
+ sc->task = NULL;
+ }
+ if (NULL != sc->mq)
+ {
+ GNUNET_MQ_destroy (sc->mq);
+ sc->mq = NULL;
+ }
GNUNET_FS_search_sync_ (sc);
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
- &search_result_freeze_probes, sc);
+ &search_result_freeze_probes,
+ sc);
pi.status = GNUNET_FS_STATUS_SEARCH_PAUSED;
- sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi,
+ sc->h,
+ sc);
}
{
struct GNUNET_FS_ProgressInfo pi;
- GNUNET_assert (NULL == sc->client);
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == sc->task);
- do_reconnect (sc, NULL);
+ GNUNET_assert (NULL == sc->mq);
+ GNUNET_assert (NULL == sc->task);
+ do_reconnect (sc);
GNUNET_FS_search_sync_ (sc);
pi.status = GNUNET_FS_STATUS_SEARCH_CONTINUED;
- sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
&search_result_resume_probes, sc);
}
* @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
+ * @return #GNUNET_OK
*/
static int
-search_result_stop (void *cls, const struct GNUNET_HashCode * key, void *value)
+search_result_stop (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_FS_SearchContext *sc = cls;
struct GNUNET_FS_SearchResult *sr = value;
struct GNUNET_FS_ProgressInfo pi;
- if (NULL != sr->probe_ctx)
- {
- GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
- sr->probe_ctx = NULL;
- }
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_ping_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_ping_task);
- sr->probe_ping_task = GNUNET_SCHEDULER_NO_TASK;
- }
- if (GNUNET_SCHEDULER_NO_TASK != sr->probe_cancel_task)
- {
- GNUNET_SCHEDULER_cancel (sr->probe_cancel_task);
- sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
- }
-
+ GNUNET_FS_search_stop_probe_ (sr);
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);
+ &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,
+ 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;
GNUNET_FS_download_sync_ (sr->download);
sr->download = NULL;
}
+ if (0 != sr->mandatory_missing)
+ {
+ /* client is unaware of search result as
+ it does not match required keywords */
+ GNUNET_break (NULL == sr->client_info);
+ return GNUNET_OK;
+ }
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 = GNUNET_FS_search_make_status_ (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sr->h, sc);
return GNUNET_OK;
}
* @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
+ * @return #GNUNET_OK
*/
static int
-search_result_free (void *cls, const struct GNUNET_HashCode * key, void *value)
+search_result_free (void *cls,
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
GNUNET_assert (NULL == sr->update_search);
}
GNUNET_break (NULL == sr->probe_ctx);
- GNUNET_break (GNUNET_SCHEDULER_NO_TASK == sr->probe_cancel_task);
- GNUNET_break (GNUNET_SCHEDULER_NO_TASK == sr->probe_ping_task);
+ GNUNET_break (NULL == sr->probe_cancel_task);
GNUNET_break (NULL == sr->client_info);
GNUNET_free_non_null (sr->serialization);
GNUNET_FS_uri_destroy (sr->uri);
GNUNET_free (sc->serialization);
}
pi.status = GNUNET_FS_STATUS_SEARCH_STOPPED;
- sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ sc->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
GNUNET_break (NULL == sc->client_info);
- if (GNUNET_SCHEDULER_NO_TASK != sc->task)
+ if (NULL != sc->task)
+ {
GNUNET_SCHEDULER_cancel (sc->task);
- if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client);
+ sc->task = NULL;
+ }
+ if (NULL != sc->mq)
+ {
+ GNUNET_MQ_destroy (sc->mq);
+ sc->mq = NULL;
+ }
GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
&search_result_free, sc);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
projects / oweals / gnunet.git / blobdiff