/*
This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008, 2009 Christian Grothoff (and other contributing authors)
+ (C) 2001-2013 Christian Grothoff (and other contributing authors)
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 Temple Place - Suite 330,
+ Free Software Foundation, Inc., 59 Tem ple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @file fs/fs_search.c
* @brief Helper functions for searching.
* @author Christian Grothoff
*/
-
#include "platform.h"
#include "gnunet_constants.h"
#include "gnunet_fs_service.h"
#include "gnunet_protocols.h"
#include "fs_api.h"
+#include "fs_publish_ublock.h"
-#define DEBUG_SEARCH GNUNET_EXTRA_LOGGING
/**
* Number of availability trials we perform per search result.
* 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 =
- (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;
- 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;
}
* GNUNET_OK otherwise
*/
static int
-test_result_present (void *cls, const 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;
- sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc);
+ 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->h, sc);
}
* @return GNUNET_OK
*/
static int
-get_result_present (void *cls, const 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;
{
struct GNUNET_FS_ProgressInfo pi;
- pi.status = GNUNET_FS_STATUS_SEARCH_START;
+ 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.uri = sr->uri;
- 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.availability_rank
+ = 2 * sr->availability_success - sr->availability_trials;
+ pi.value.search.specifics.update.availability_certainty
+ = sr->availability_trials;
pi.value.search.specifics.update.applicability_rank = sr->optional_support;
- sr->sc->client_info = GNUNET_FS_search_make_status_ (&pi, sr->sc);
+ 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->h, sr->sc);
GNUNET_FS_search_start_probe_ (sr);
}
{
struct GNUNET_FS_SearchResult *sr = cls;
+ sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
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_search_result_sync_ (sr);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Probe #%u for search result %p failed\n",
+ sr->availability_trials,
+ sr);
signal_probe_result (sr);
}
{
struct GNUNET_FS_SearchResult *sr = cls;
+ sr->probe_cancel_task = GNUNET_SCHEDULER_NO_TASK;
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_search_result_sync_ (sr);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Probe #%u for search result %p succeeded\n",
+ sr->availability_trials,
+ sr);
signal_probe_result (sr);
}
/* ignore */
break;
case GNUNET_FS_STATUS_DOWNLOAD_ERROR:
- if (sr->probe_cancel_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;
&probe_failure_handler, sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_COMPLETED:
- if (sr->probe_cancel_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;
}
sr->probe_cancel_task =
- GNUNET_SCHEDULER_add_delayed (sr->remaining_probe_time,
- &probe_success_handler, sr);
+ GNUNET_SCHEDULER_add_now (&probe_success_handler, sr);
break;
case GNUNET_FS_STATUS_DOWNLOAD_STOPPED:
- if (sr->probe_cancel_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;
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 =
+ if (GNUNET_SCHEDULER_NO_TASK == 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_us);
+ }
break;
case GNUNET_FS_STATUS_DOWNLOAD_INACTIVE:
- if (sr->probe_cancel_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;
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_us)
+ sr->probe_cancel_task =
+ GNUNET_SCHEDULER_add_now (&probe_failure_handler, sr);
GNUNET_FS_search_result_sync_ (sr);
break;
default:
}
+/**
+ * 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
+ */
+static void
+probe_ping_task (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
+{
+ struct GNUNET_FS_SearchResult *sr = cls;
+
+ signal_probe_result (sr);
+ sr->probe_ping_task
+ = GNUNET_SCHEDULER_add_delayed (GNUNET_FS_PROBE_UPDATE_FREQUENCY,
+ &probe_ping_task,
+ sr);
+}
+
+
/**
* Start download probes for the given search result.
*
uint64_t off;
uint64_t len;
- if (sr->probe_ctx != NULL)
+ if (NULL != sr->probe_ctx)
return;
- if (sr->download != NULL)
+ 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;
+ if ( (GNUNET_FS_URI_CHK != sr->uri->type) && (GNUNET_FS_URI_LOC != sr->uri->type))
+ return;
len = GNUNET_FS_uri_chk_get_file_size (sr->uri);
- if (len == 0)
+ if (0 == len)
return;
if ((len <= DBLOCK_SIZE) && (sr->availability_success > 0))
return;
len = len - off;
else
len = DBLOCK_SIZE;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Starting probe #%u (at offset %llu) for search result %p\n",
+ sr->availability_trials + 1,
+ (unsigned long long) off,
+ sr);
sr->remaining_probe_time =
- GNUNET_TIME_relative_multiply (sr->sc->h->avg_block_latency,
+ GNUNET_TIME_relative_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 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;
+ }
+ 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;
+ }
+}
+
+
+/**
+ * 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;
}
const struct GNUNET_FS_Uri *uri,
const struct GNUNET_CONTAINER_MetaData *meta)
{
- GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
struct GNUNET_FS_SearchResult *sr;
struct GetResultContext grc;
int is_new;
+ unsigned int koff;
/* check if new */
GNUNET_assert (NULL != sc);
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;
sr->key = key;
+ sr->keyword_bitmap = GNUNET_malloc ((sc->uri->data.ksk.keywordCount + 7) / 8); /* round up, count bits */
GNUNET_CONTAINER_multihashmap_put (sc->master_result_map, &key, sr,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
}
{
GNUNET_CONTAINER_meta_data_merge (sr->meta, meta);
}
+ koff = ent - sc->requests;
+ 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--;
const struct GNUNET_CONTAINER_MetaData *meta)
{
struct GNUNET_FS_Uri uu;
- GNUNET_HashCode key;
+ struct GNUNET_HashCode key;
struct GNUNET_FS_SearchResult *sr;
/* check if new */
&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;
/* notify client */
notify_client_chk_result (sc, sr);
/* search for updates */
- if (strlen (id_update) == 0)
+ if (0 == strlen (id_update))
return; /* no updates */
- uu.type = sks;
- uu.data.sks.namespace = sc->uri->data.sks.namespace;
+ uu.type = GNUNET_FS_URI_SKS;
+ uu.data.sks.ns = sc->uri->data.sks.ns;
uu.data.sks.identifier = GNUNET_strdup (id_update);
(void) search_start (sc->h, &uu, sc->anonymity, sc->options, NULL, sr);
GNUNET_free (uu.data.sks.identifier);
/**
- * Process a keyword-search result.
+ * Decrypt a ublock using a 'keyword' as the passphrase. Given the
+ * KSK public key derived from the keyword, this function looks up
+ * the original keyword in the search context and decrypts the
+ * given ciphertext block.
*
- * @param sc our search context
- * @param kb the kblock
- * @param size size of kb
+ * @param sc search context with the keywords
+ * @param dpub derived public key used for the search
+ * @param edata encrypted data
+ * @param edata_size number of bytes in 'edata' (and 'data')
+ * @param data where to store the plaintext
+ * @return keyword index on success, GNUNET_SYSERR on error (no such
+ * keyword, internal error)
*/
-static void
-process_kblock (struct GNUNET_FS_SearchContext *sc, const struct KBlock *kb,
- size_t size)
-{
+static int
+decrypt_block_with_keyword (const struct GNUNET_FS_SearchContext *sc,
+ const struct GNUNET_CRYPTO_EccPublicSignKey *dpub,
+ const void *edata,
+ size_t edata_size,
+ char *data)
+{
+ const struct GNUNET_CRYPTO_EccPrivateKey *anon;
+ struct GNUNET_CRYPTO_EccPublicSignKey anon_pub;
unsigned int i;
- size_t j;
- GNUNET_HashCode q;
- char pt[size - sizeof (struct KBlock)];
- struct GNUNET_CRYPTO_AesSessionKey skey;
- struct GNUNET_CRYPTO_AesInitializationVector iv;
- const char *eos;
- struct GNUNET_CONTAINER_MetaData *meta;
- struct GNUNET_FS_Uri *uri;
- char *emsg;
- GNUNET_CRYPTO_hash (&kb->keyspace,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &q);
/* find key */
for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
- if (0 == memcmp (&q, &sc->requests[i].query, sizeof (GNUNET_HashCode)))
+ if (0 == memcmp (dpub,
+ &sc->requests[i].dpub,
+ sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))
break;
if (i == sc->uri->data.ksk.keywordCount)
{
/* oops, does not match any of our keywords!? */
GNUNET_break (0);
- return;
+ return GNUNET_SYSERR;
}
/* decrypt */
- GNUNET_CRYPTO_hash_to_aes_key (&sc->requests[i].key, &skey, &iv);
- 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)
- {
- GNUNET_break_op (0);
- return;
- }
- j = eos - pt + 1;
- if (sizeof (pt) == j)
- meta = GNUNET_CONTAINER_meta_data_create ();
- else
- meta = GNUNET_CONTAINER_meta_data_deserialize (&pt[j], sizeof (pt) - j);
- if (meta == NULL)
- {
- GNUNET_break_op (0); /* kblock malformed */
- return;
- }
- uri = GNUNET_FS_uri_parse (pt, &emsg);
- if (uri == NULL)
- {
- GNUNET_break_op (0); /* kblock malformed */
- GNUNET_free_non_null (emsg);
- GNUNET_CONTAINER_meta_data_destroy (meta);
- return;
- }
- /* process */
- process_ksk_result (sc, &sc->requests[i], uri, meta);
-
- /* clean up */
- GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_FS_uri_destroy (uri);
+ anon = GNUNET_CRYPTO_ecc_key_get_anonymous ();
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (anon, &anon_pub);
+ GNUNET_FS_ublock_decrypt_ (edata, edata_size,
+ &anon_pub,
+ sc->requests[i].keyword,
+ data);
+ return i;
}
/**
- * Process a keyword-search result with a namespace advertisment.
+ * Process a keyword search result. The actual type of block is
+ * a UBlock; we know it is a keyword search result because that's
+ * what we were searching for.
*
* @param sc our search context
- * @param nb the nblock
+ * @param ub the ublock with the keyword search result
* @param size size of nb
*/
static void
-process_nblock (struct GNUNET_FS_SearchContext *sc, const struct NBlock *nb,
+process_kblock (struct GNUNET_FS_SearchContext *sc,
+ const struct UBlock *ub,
size_t size)
{
- unsigned int i;
size_t j;
- GNUNET_HashCode q;
- char pt[size - sizeof (struct NBlock)];
- struct GNUNET_CRYPTO_AesSessionKey skey;
- struct GNUNET_CRYPTO_AesInitializationVector iv;
+ char pt[size - sizeof (struct UBlock)];
const char *eos;
struct GNUNET_CONTAINER_MetaData *meta;
struct GNUNET_FS_Uri *uri;
- char *uris;
+ char *emsg;
+ int i;
- GNUNET_CRYPTO_hash (&nb->keyspace,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &q);
- /* find key */
- for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
- if (0 == memcmp (&q, &sc->requests[i].query, sizeof (GNUNET_HashCode)))
- break;
- if (i == sc->uri->data.ksk.keywordCount)
- {
- /* oops, does not match any of our keywords!? */
- GNUNET_break (0);
+ if (-1 == (i = decrypt_block_with_keyword (sc,
+ &ub->verification_key,
+ &ub[1],
+ size - sizeof (struct UBlock),
+ pt)))
return;
- }
- /* decrypt */
- GNUNET_CRYPTO_hash_to_aes_key (&sc->requests[i].key, &skey, &iv);
- if (-1 ==
- GNUNET_CRYPTO_aes_decrypt (&nb[1], size - sizeof (struct NBlock), &skey,
- &iv, pt))
+ /* parse; pt[0] is just '\0', so we skip over that */
+ eos = memchr (&pt[1], '\0', sizeof (pt) - 1);
+ if (NULL == eos)
{
- GNUNET_break (0);
+ GNUNET_break_op (0);
return;
}
- /* parse */
- eos = memchr (pt, 0, sizeof (pt));
- if (NULL == eos)
+ if (NULL == (uri = GNUNET_FS_uri_parse (&pt[1], &emsg)))
{
- GNUNET_break_op (0);
+ GNUNET_break_op (0); /* ublock malformed */
+ GNUNET_free_non_null (emsg);
return;
}
j = eos - pt + 1;
meta = GNUNET_CONTAINER_meta_data_create ();
else
meta = GNUNET_CONTAINER_meta_data_deserialize (&pt[j], sizeof (pt) - j);
- if (meta == NULL)
+ if (NULL == meta)
{
- GNUNET_break_op (0); /* nblock malformed */
+ GNUNET_break_op (0); /* ublock malformed */
+ GNUNET_FS_uri_destroy (uri);
return;
}
-
- uri = GNUNET_malloc (sizeof (struct GNUNET_FS_Uri));
- uri->type = sks;
- uri->data.sks.identifier = GNUNET_strdup (pt);
- GNUNET_CRYPTO_hash (&nb->subspace,
- sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &uri->data.sks.namespace);
- uris = GNUNET_FS_uri_to_string (uri);
- GNUNET_CONTAINER_meta_data_insert (meta, "<gnunet>", EXTRACTOR_METATYPE_URI,
- EXTRACTOR_METAFORMAT_UTF8, "text/plain",
- uris, strlen (uris) + 1);
- GNUNET_free (uris);
- GNUNET_PSEUDONYM_add (sc->h->cfg, &uri->data.sks.namespace, meta);
- /* process */
process_ksk_result (sc, &sc->requests[i], uri, meta);
/* clean up */
/**
- * Process a namespace-search result.
+ * Process a namespace-search result. The actual type of block is
+ * a UBlock; we know it is a namespace search result because that's
+ * what we were searching for.
*
* @param sc our search context
- * @param sb the sblock
+ * @param ub the ublock with a namespace result
* @param size size of sb
*/
static void
-process_sblock (struct GNUNET_FS_SearchContext *sc, const struct SBlock *sb,
+process_sblock (struct GNUNET_FS_SearchContext *sc,
+ const struct UBlock *ub,
size_t size)
{
- size_t len = size - sizeof (struct SBlock);
+ 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;
- GNUNET_HashCode key;
- char *identifier;
- /* decrypt */
- identifier = sc->uri->data.sks.identifier;
- GNUNET_CRYPTO_hash (identifier, strlen (identifier), &key);
- GNUNET_CRYPTO_hash_to_aes_key (&key, &skey, &iv);
- if (-1 == GNUNET_CRYPTO_aes_decrypt (&sb[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 */
- off = GNUNET_STRINGS_buffer_tokenize (pt, len, 2, &id, &uris);
- if (off == 0)
+ if (0 == (off = GNUNET_STRINGS_buffer_tokenize (pt, len, 2, &id, &uris)))
{
- GNUNET_break_op (0); /* sblock malformed */
+ GNUNET_break_op (0); /* ublock malformed */
return;
}
- meta = GNUNET_CONTAINER_meta_data_deserialize (&pt[off], len - off);
- if (meta == NULL)
+ if (NULL == (meta = GNUNET_CONTAINER_meta_data_deserialize (&pt[off], len - off)))
{
- GNUNET_break_op (0); /* sblock malformed */
+ GNUNET_break_op (0); /* ublock malformed */
return;
}
- uri = GNUNET_FS_uri_parse (uris, &emsg);
- if (uri == NULL)
+ if (NULL == (uri = GNUNET_FS_uri_parse (uris, &emsg)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to parse URI `%s': %s\n", uris,
- emsg);
- GNUNET_break_op (0); /* sblock malformed */
+ 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);
GNUNET_CONTAINER_meta_data_destroy (meta);
return;
* @param size size of data
*/
static void
-process_result (struct GNUNET_FS_SearchContext *sc, enum GNUNET_BLOCK_Type type,
- struct GNUNET_TIME_Absolute expiration, const void *data,
+process_result (struct GNUNET_FS_SearchContext *sc,
+ enum GNUNET_BLOCK_Type type,
+ struct GNUNET_TIME_Absolute expiration,
+ const void *data,
size_t size)
{
- if (GNUNET_TIME_absolute_get_duration (expiration).rel_value > 0)
+ if (GNUNET_TIME_absolute_get_duration (expiration).rel_value_us > 0)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Result received has already expired.\n");
}
switch (type)
{
- case GNUNET_BLOCK_TYPE_FS_KBLOCK:
- if (!GNUNET_FS_uri_test_ksk (sc->uri))
- {
- GNUNET_break (0);
- return;
- }
- if (sizeof (struct KBlock) > size)
- {
- GNUNET_break_op (0);
- return;
- }
- process_kblock (sc, data, size);
- break;
- case GNUNET_BLOCK_TYPE_FS_SBLOCK:
- if (!GNUNET_FS_uri_test_sks (sc->uri))
- {
- GNUNET_break (0);
- return;
- }
- if (sizeof (struct SBlock) > size)
- {
- GNUNET_break_op (0);
- return;
- }
- process_sblock (sc, data, size);
- break;
- case GNUNET_BLOCK_TYPE_FS_NBLOCK:
- if (!GNUNET_FS_uri_test_ksk (sc->uri))
- {
- GNUNET_break (0);
- return;
- }
- if (sizeof (struct NBlock) > size)
- {
- GNUNET_break_op (0);
- return;
- }
- process_nblock (sc, data, size);
+ case GNUNET_BLOCK_TYPE_FS_UBLOCK:
+ if (GNUNET_FS_URI_SKS == sc->uri->type)
+ process_sblock (sc, data, size);
+ else
+ process_kblock (sc, data, size);
break;
case GNUNET_BLOCK_TYPE_ANY:
GNUNET_break (0);
receive_results (void *cls, const struct GNUNET_MessageHeader *msg)
{
struct GNUNET_FS_SearchContext *sc = cls;
- const struct PutMessage *cm;
+ const struct ClientPutMessage *cm;
uint16_t msize;
if ((NULL == msg) || (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_FS_PUT) ||
- (ntohs (msg->size) <= sizeof (struct PutMessage)))
+ (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 PutMessage *) msg;
+ cm = (const struct ClientPutMessage *) msg;
process_result (sc, ntohl (cm->type),
GNUNET_TIME_absolute_ntoh (cm->expiration), &cm[1],
- msize - sizeof (struct PutMessage));
+ msize - sizeof (struct ClientPutMessage));
/* continue receiving */
GNUNET_CLIENT_receive (sc->client, &receive_results, sc,
GNUNET_TIME_UNIT_FOREVER_REL);
/**
* Where to store the keys.
*/
- GNUNET_HashCode *xoff;
+ struct GNUNET_HashCode *xoff;
/**
* Search context we are iterating for.
struct GNUNET_FS_SearchContext *sc;
/**
- * URI the search result must match, NULL for any
+ * Keyword offset the search result must match (0 for SKS)
*/
- struct GNUNET_FS_Uri *uri;
+ unsigned int keyword_offset;
};
* @return GNUNET_OK to continue iterating
*/
static int
-build_result_set (void *cls, const 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 ((mbc->uri != NULL) &&
- (GNUNET_YES != GNUNET_FS_uri_test_equal (mbc->uri, sr->uri)))
- return GNUNET_OK;
+ if ( (NULL != sr->keyword_bitmap) &&
+ (0 == (sr->keyword_bitmap[mbc->keyword_offset / 8] & (1 << (mbc->keyword_offset % 8)))) )
+ return GNUNET_OK; /* have no match for this keyword yet */
if (mbc->skip_cnt > 0)
{
mbc->skip_cnt--;
return GNUNET_OK;
}
- if (mbc->put_cnt == 0)
+ if (0 == mbc->put_cnt)
return GNUNET_SYSERR;
mbc->sc->search_request_map_offset++;
mbc->xoff[--mbc->put_cnt] = *key;
+
return GNUNET_OK;
}
* @return GNUNET_OK to continue iterating
*/
static int
-find_result_set (void *cls, const 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;
- if ((mbc->uri != NULL) &&
- (GNUNET_YES != GNUNET_FS_uri_test_equal (mbc->uri, sr->uri)))
- return GNUNET_OK;
+ if ( (NULL != sr->keyword_bitmap) &&
+ (0 == (sr->keyword_bitmap[mbc->keyword_offset / 8] & (1 << (mbc->keyword_offset % 8)))) )
+ return GNUNET_OK; /* have no match for this keyword yet */
mbc->put_cnt++;
return GNUNET_OK;
}
struct MessageBuilderContext mbc;
size_t msize;
struct SearchMessage *sm;
- const char *identifier;
- GNUNET_HashCode key;
- GNUNET_HashCode idh;
+ struct GNUNET_CRYPTO_EccPublicSignKey dpub;
unsigned int sqms;
uint32_t options;
mbc.skip_cnt = sc->search_request_map_offset;
sm = buf;
sm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_START_SEARCH);
- mbc.xoff = (GNUNET_HashCode *) & sm[1];
+ 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;
{
msize = sizeof (struct SearchMessage);
GNUNET_assert (size >= msize);
- mbc.uri = NULL;
+ 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;
- mbc.put_cnt = (size - msize) / sizeof (GNUNET_HashCode);
+ /* 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_ANY);
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
sm->anonymity_level = htonl (sc->anonymity);
- memset (&sm->target, 0, sizeof (GNUNET_HashCode));
- sm->query = sc->requests[sc->keyword_offset].query;
- msize += sizeof (GNUNET_HashCode) * mbc.put_cnt;
+ 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);
- sm->header.size = htons (msize);
+ GNUNET_assert (sqms >= sc->search_request_map_offset);
if (sqms != sc->search_request_map_offset)
{
/* more requesting to be done... */
GNUNET_assert (GNUNET_FS_uri_test_sks (sc->uri));
msize = sizeof (struct SearchMessage);
GNUNET_assert (size >= msize);
- sm->type = htonl (GNUNET_BLOCK_TYPE_FS_SBLOCK);
+ sm->type = htonl (GNUNET_BLOCK_TYPE_FS_UBLOCK);
sm->anonymity_level = htonl (sc->anonymity);
- sm->target = sc->uri->data.sks.namespace;
- identifier = sc->uri->data.sks.identifier;
- GNUNET_CRYPTO_hash (identifier, strlen (identifier), &key);
- GNUNET_CRYPTO_hash (&key, sizeof (GNUNET_HashCode), &idh);
- GNUNET_CRYPTO_hash_xor (&idh, &sm->target, &sm->query);
- mbc.put_cnt = (size - msize) / sizeof (GNUNET_HashCode);
+ memset (&sm->target, 0, sizeof (struct GNUNET_HashCode));
+ GNUNET_CRYPTO_ecc_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 = (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.uri = NULL;
+ mbc.keyword_offset = 0;
if (sc->search_request_map_offset < sqms)
GNUNET_assert (mbc.put_cnt > 0);
- msize += sizeof (GNUNET_HashCode) * mbc.put_cnt;
+ 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)
{
/* more requesting to be done... */
sqms =
GNUNET_CONTAINER_multihashmap_size (sc->master_result_map) -
sc->search_request_map_offset;
- fit = (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - size) / sizeof (GNUNET_HashCode);
+ fit = (GNUNET_SERVER_MAX_MESSAGE_SIZE - 1 - size) / sizeof (struct GNUNET_HashCode);
fit = GNUNET_MIN (fit, sqms);
- size += sizeof (GNUNET_HashCode) * fit;
+ size += sizeof (struct GNUNET_HashCode) * fit;
GNUNET_CLIENT_notify_transmit_ready (sc->client, size,
GNUNET_CONSTANTS_SERVICE_TIMEOUT,
GNUNET_NO, &transmit_search_request, sc);
{
if (NULL != sc->client)
{
- GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sc->client);
sc->client = NULL;
}
+ sc->reconnect_backoff = GNUNET_TIME_STD_BACKOFF (sc->reconnect_backoff);
sc->task =
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_SECONDS, &do_reconnect,
+ GNUNET_SCHEDULER_add_delayed (sc->reconnect_backoff,
+ &do_reconnect,
sc);
}
sc->uri = GNUNET_FS_uri_dup (uri);
sc->anonymity = anonymity;
sc->start_time = GNUNET_TIME_absolute_get ();
- if (psearch != NULL)
+ if (NULL != psearch)
{
sc->psearch_result = psearch;
psearch->update_search = sc;
}
- sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16);
+ sc->master_result_map = GNUNET_CONTAINER_multihashmap_create (16, GNUNET_NO);
sc->client_info = cctx;
if (GNUNET_OK != GNUNET_FS_search_start_searching_ (sc))
{
}
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;
}
{
unsigned int i;
const char *keyword;
- GNUNET_HashCode hc;
- struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
- struct GNUNET_CRYPTO_RsaPrivateKey *pk;
+ const struct GNUNET_CRYPTO_EccPrivateKey *anon;
+ struct GNUNET_CRYPTO_EccPublicSignKey anon_pub;
+ struct SearchRequestEntry *sre;
GNUNET_assert (NULL == sc->client);
if (GNUNET_FS_uri_test_ksk (sc->uri))
{
GNUNET_assert (0 != sc->uri->data.ksk.keywordCount);
+ anon = GNUNET_CRYPTO_ecc_key_get_anonymous ();
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (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), &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,
- sizeof (struct
- GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &sc->requests[i].query);
- 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_ecc_public_key_derive (&anon_pub,
+ keyword,
+ "fs-ublock",
+ &sre->dpub);
+ GNUNET_CRYPTO_hash (&sre->dpub,
+ sizeof (struct GNUNET_CRYPTO_EccPublicSignKey),
+ &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_CRYPTO_hash (keyword, strlen (keyword), &sc->requests[i].key);
+ sre->results = GNUNET_CONTAINER_multihashmap_create (4, GNUNET_NO);
}
}
sc->client = GNUNET_CLIENT_connect ("fs", sc->h->cfg);
* @return GNUNET_OK
*/
static int
-search_result_freeze_probes (void *cls, const GNUNET_HashCode * key,
+search_result_freeze_probes (void *cls, const struct GNUNET_HashCode * key,
void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
- if (sr->probe_ctx != NULL)
+ if (NULL != sr->probe_ctx)
{
GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
sr->probe_ctx = NULL;
}
- if (sr->probe_cancel_task != GNUNET_SCHEDULER_NO_TASK)
+ 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;
}
- if (sr->update_search != NULL)
+ if (NULL != sr->update_search)
GNUNET_FS_search_pause (sr->update_search);
return GNUNET_OK;
}
* @return GNUNET_OK
*/
static int
-search_result_resume_probes (void *cls, const GNUNET_HashCode * key,
+search_result_resume_probes (void *cls, const struct GNUNET_HashCode * key,
void *value)
{
struct GNUNET_FS_SearchResult *sr = value;
GNUNET_FS_search_start_probe_ (sr);
- if (sr->update_search != NULL)
+ if (NULL != sr->update_search)
GNUNET_FS_search_continue (sr->update_search);
return GNUNET_OK;
}
* @return GNUNET_OK
*/
static int
-search_result_suspend (void *cls, const 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;
struct GNUNET_FS_ProgressInfo pi;
- if (sr->download != NULL)
+ if (NULL != sr->download)
+ {
GNUNET_FS_download_signal_suspend_ (sr->download);
- if (sr->update_search != NULL)
+ 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);
+ 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 (sr->probe_ctx != NULL)
- GNUNET_FS_download_stop (sr->probe_ctx, GNUNET_YES);
- if (sr->probe_cancel_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_free_non_null (sr->keyword_bitmap);
GNUNET_free (sr);
return GNUNET_OK;
}
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)
GNUNET_SCHEDULER_cancel (sc->task);
if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sc->client);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
- if (sc->requests != NULL)
+ 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_SearchContext *ret;
ret = search_start (h, uri, anonymity, options, cctx, NULL);
- if (ret == NULL)
+ if (NULL == ret)
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)
+ if (GNUNET_SCHEDULER_NO_TASK != sc->task)
GNUNET_SCHEDULER_cancel (sc->task);
sc->task = GNUNET_SCHEDULER_NO_TASK;
if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sc->client);
sc->client = NULL;
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 = 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 (sc->client == NULL);
- GNUNET_assert (sc->task == GNUNET_SCHEDULER_NO_TASK);
+ GNUNET_assert (NULL == sc->client);
+ GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == sc->task);
do_reconnect (sc, NULL);
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);
}
/**
- * Free the given search result.
+ * Signal stop for the given search result.
*
* @param cls the global FS handle
* @param key the key for the search result (unused)
* @return GNUNET_OK
*/
static int
-search_result_free (void *cls, const 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;
+ GNUNET_FS_search_stop_probe_ (sr);
+
if (NULL != sr->download)
{
sr->download->search = NULL;
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 = GNUNET_FS_search_make_status_ (&pi, sc);
+ sr->client_info = GNUNET_FS_search_make_status_ (&pi, sr->h, sc);
+ return GNUNET_OK;
+}
+
+
+/**
+ * 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_free (void *cls, const struct GNUNET_HashCode * key, void *value)
+{
+ struct GNUNET_FS_SearchResult *sr = value;
+
+ if (NULL != sr->update_search)
+ {
+ GNUNET_FS_search_stop (sr->update_search);
+ 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->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_non_null (sr->keyword_bitmap);
GNUNET_free (sr);
return GNUNET_OK;
}
struct GNUNET_FS_ProgressInfo pi;
unsigned int i;
- if (sc->top != NULL)
+ if (NULL != sc->top)
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)
+ &search_result_stop, sc);
+ if (NULL != sc->psearch_result)
+ sc->psearch_result->update_search = NULL;
+ if (NULL != sc->serialization)
{
GNUNET_FS_remove_sync_file_ (sc->h,
(sc->psearch_result !=
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 (sc->task != GNUNET_SCHEDULER_NO_TASK)
+ if (GNUNET_SCHEDULER_NO_TASK != sc->task)
GNUNET_SCHEDULER_cancel (sc->task);
if (NULL != sc->client)
- GNUNET_CLIENT_disconnect (sc->client, GNUNET_NO);
+ GNUNET_CLIENT_disconnect (sc->client);
+ GNUNET_CONTAINER_multihashmap_iterate (sc->master_result_map,
+ &search_result_free, sc);
GNUNET_CONTAINER_multihashmap_destroy (sc->master_result_map);
- if (sc->requests != NULL)
+ if (NULL != sc->requests)
{
GNUNET_assert (GNUNET_FS_uri_test_ksk (sc->uri));
for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)