/*
This file is part of GNUnet.
- (C) 2009, 2010, 2011 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2009-2013 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 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @author Christian Grothoff
*/
#include "platform.h"
+#include "gnunet_util_lib.h"
#include "gnunet_load_lib.h"
#include "gnunet-service-fs.h"
#include "gnunet-service-fs_cp.h"
#include "gnunet-service-fs_indexing.h"
#include "gnunet-service-fs_pe.h"
#include "gnunet-service-fs_pr.h"
+#include "gnunet-service-fs_cadet.h"
+
+
+/**
+ * Desired replication level for GETs.
+ */
+#define DHT_GET_REPLICATION 5
+
+/**
+ * Maximum size of the datastore queue for P2P operations. Needs to
+ * be large enough to queue #MAX_QUEUE_PER_PEER operations for roughly
+ * the number of active (connected) peers.
+ */
+#define MAX_DATASTORE_QUEUE (16 * MAX_QUEUE_PER_PEER)
+
+/**
+ * Bandwidth value of a 0-priority content (must be fairly high
+ * compared to query since content is typically significantly larger
+ * -- and more valueable since it can take many queries to get one
+ * piece of content).
+ */
+#define CONTENT_BANDWIDTH_VALUE 800
/**
* Hard limit on the number of results we may get from the datastore per query.
*/
#define MAX_RESULTS (100 * 1024)
+/**
+ * Collect an instane number of statistics? May cause excessive IPC.
+ */
+#define INSANE_STATISTICS GNUNET_NO
+
+/**
+ * If obtaining a block via cadet fails, how often do we retry it before
+ * giving up for good (and sticking to non-anonymous transfer)?
+ */
+#define CADET_RETRY_MAX 3
+
+
/**
* An active request.
*/
{
/**
* Public data for the request.
- */
+ */
struct GSF_PendingRequestData public_data;
/**
GSF_PendingRequestReplyHandler rh;
/**
- * Closure for 'rh'
+ * Closure for @e rh
*/
void *rh_cls;
/**
* Array of hash codes of replies we've already seen.
*/
- GNUNET_HashCode *replies_seen;
+ struct GNUNET_HashCode *replies_seen;
/**
* Bloomfilter masking replies we've already seen.
*/
struct GNUNET_DHT_GetHandle *gh;
+ /**
+ * Cadet request handle for this request (or NULL for none).
+ */
+ struct GSF_CadetRequest *cadet_request;
+
/**
* Function to call upon completion of the local get
* request, or NULL for none.
GSF_LocalLookupContinuation llc_cont;
/**
- * Closure for llc_cont.
+ * Closure for @e llc_cont.
*/
void *llc_cont_cls;
*/
GNUNET_PEER_Id sender_pid;
+ /**
+ * Identity of the peer that we should never forward this query
+ * to since it originated this query (0 for none).
+ */
+ GNUNET_PEER_Id origin_pid;
+
/**
* Time we started the last datastore lookup.
*/
/**
* Task that warns us if the local datastore lookup takes too long.
*/
- GNUNET_SCHEDULER_TaskIdentifier warn_task;
+ struct GNUNET_SCHEDULER_Task * warn_task;
/**
* Current offset for querying our local datastore for results.
*/
uint64_t first_uid;
+ /**
+ * How often have we retried this request via 'cadet'?
+ * (used to bound overall retries).
+ */
+ unsigned int cadet_retry_count;
+
/**
* Number of valid entries in the 'replies_seen' array.
*/
static unsigned long long max_pending_requests = (32 * 1024);
-/**
- * How many bytes should a bloomfilter be if we have already seen
- * entry_count responses? Note that BLOOMFILTER_K gives us the number
- * of bits set per entry. Furthermore, we should not re-size the
- * filter too often (to keep it cheap).
- *
- * Since other peers will also add entries but not resize the filter,
- * we should generally pick a slightly larger size than what the
- * strict math would suggest.
- *
- * @return must be a power of two and smaller or equal to 2^15.
- */
-static size_t
-compute_bloomfilter_size (unsigned int entry_count)
-{
- size_t size;
- unsigned int ideal = (entry_count * BLOOMFILTER_K) / 4;
- uint16_t max = 1 << 15;
-
- if (entry_count > max)
- return max;
- size = 8;
- while ((size < max) && (size < ideal))
- size *= 2;
- if (size > max)
- return max;
- return size;
-}
-
/**
* Recalculate our bloom filter for filtering replies. This function
* initiator (in which case we may resize to larger than mimimum size).
*
* @param pr request for which the BF is to be recomputed
- * @return GNUNET_YES if a refresh actually happened
*/
-static int
+static void
refresh_bloomfilter (struct GSF_PendingRequest *pr)
{
- unsigned int i;
- size_t nsize;
- GNUNET_HashCode mhash;
-
- nsize = compute_bloomfilter_size (pr->replies_seen_count);
- if ( (pr->bf != NULL) &&
- (nsize == GNUNET_CONTAINER_bloomfilter_get_size (pr->bf)) )
- return GNUNET_NO; /* size not changed */
if (pr->bf != NULL)
GNUNET_CONTAINER_bloomfilter_free (pr->bf);
- pr->mingle = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- UINT32_MAX);
- pr->bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
- nsize,
- BLOOMFILTER_K);
- for (i=0;i<pr->replies_seen_count;i++)
- {
- GNUNET_BLOCK_mingle_hash (&pr->replies_seen[i],
- pr->mingle,
- &mhash);
- GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
- }
- return GNUNET_YES;
+ pr->mingle =
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, UINT32_MAX);
+ pr->bf =
+ GNUNET_BLOCK_construct_bloomfilter (pr->mingle, pr->replies_seen,
+ pr->replies_seen_count);
}
/**
- * Create a new pending request.
+ * Create a new pending request.
*
* @param options request options
* @param type type of the block that is being requested
* @param query key for the lookup
- * @param namespace namespace to lookup, NULL for no namespace
* @param target preferred target for the request, NULL for none
* @param bf_data raw data for bloom filter for known replies, can be NULL
- * @param bf_size number of bytes in bf_data
+ * @param bf_size number of bytes in @a bf_data
* @param mingle mingle value for bf
* @param anonymity_level desired anonymity level
* @param priority maximum outgoing cummulative request priority to use
* @param ttl current time-to-live for the request
* @param sender_pid peer ID to use for the sender when forwarding, 0 for none
+ * @param origin_pid peer ID of origin of query (do not loop back)
* @param replies_seen hash codes of known local replies
- * @param replies_seen_count size of the 'replies_seen' array
+ * @param replies_seen_count size of the @a replies_seen array
* @param rh handle to call when we get a reply
- * @param rh_cls closure for rh
+ * @param rh_cls closure for @a rh
* @return handle for the new pending request
*/
struct GSF_PendingRequest *
GSF_pending_request_create_ (enum GSF_PendingRequestOptions options,
- enum GNUNET_BLOCK_Type type,
- const GNUNET_HashCode *query,
- const GNUNET_HashCode *namespace,
- const struct GNUNET_PeerIdentity *target,
- const char *bf_data,
- size_t bf_size,
- uint32_t mingle,
- uint32_t anonymity_level,
- uint32_t priority,
- int32_t ttl,
- GNUNET_PEER_Id sender_pid,
- const GNUNET_HashCode *replies_seen,
- unsigned int replies_seen_count,
- GSF_PendingRequestReplyHandler rh,
- void *rh_cls)
+ enum GNUNET_BLOCK_Type type,
+ const struct GNUNET_HashCode *query,
+ const struct GNUNET_PeerIdentity *target,
+ const char *bf_data,
+ size_t bf_size,
+ uint32_t mingle,
+ uint32_t anonymity_level,
+ uint32_t priority,
+ int32_t ttl,
+ GNUNET_PEER_Id sender_pid,
+ GNUNET_PEER_Id origin_pid,
+ const struct GNUNET_HashCode *replies_seen,
+ unsigned int replies_seen_count,
+ GSF_PendingRequestReplyHandler rh,
+ void *rh_cls)
{
struct GSF_PendingRequest *pr;
struct GSF_PendingRequest *dpr;
-
-#if DEBUG_FS > 1
+ size_t extra;
+ struct GNUNET_HashCode *eptr;
+
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Creating request handle for `%s' of type %d\n",
- GNUNET_h2s (query),
- type);
-#endif
- pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest));
- pr->local_result_offset = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
- UINT64_MAX);
+ "Creating request handle for `%s' of type %d\n",
+ GNUNET_h2s (query), type);
+#if INSANE_STATISTICS
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# Pending requests created"), 1,
+ GNUNET_NO);
+#endif
+ extra = 0;
+ if (NULL != target)
+ extra += sizeof (struct GNUNET_PeerIdentity);
+ pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest) + extra);
+ pr->local_result_offset =
+ GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
pr->public_data.query = *query;
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type)
- {
- GNUNET_assert (NULL != namespace);
- pr->public_data.namespace = *namespace;
- }
+ eptr = (struct GNUNET_HashCode *) &pr[1];
if (NULL != target)
- {
- pr->public_data.target = *target;
- pr->public_data.has_target = GNUNET_YES;
- }
+ {
+ pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr;
+ GNUNET_memcpy (eptr,
+ target,
+ sizeof (struct GNUNET_PeerIdentity));
+ }
pr->public_data.anonymity_level = anonymity_level;
pr->public_data.priority = priority;
pr->public_data.original_priority = priority;
pr->public_data.options = options;
- pr->public_data.type = type;
+ pr->public_data.type = type;
pr->public_data.start_time = GNUNET_TIME_absolute_get ();
pr->sender_pid = sender_pid;
+ pr->origin_pid = origin_pid;
pr->rh = rh;
pr->rh_cls = rh_cls;
- GNUNET_assert ( (sender_pid != 0) ||
- (0 == (options & GSF_PRO_FORWARD_ONLY)) );
+ GNUNET_assert ((sender_pid != 0) || (0 == (options & GSF_PRO_FORWARD_ONLY)));
if (ttl >= 0)
- pr->public_data.ttl = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- (uint32_t) ttl));
+ pr->public_data.ttl =
+ GNUNET_TIME_relative_to_absolute (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ (uint32_t) ttl));
else
- pr->public_data.ttl = GNUNET_TIME_absolute_subtract (pr->public_data.start_time,
- GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- (uint32_t) (- ttl)));
+ pr->public_data.ttl =
+ GNUNET_TIME_absolute_subtract (pr->public_data.start_time,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS,
+ (uint32_t) (-ttl)));
if (replies_seen_count > 0)
- {
- pr->replies_seen_size = replies_seen_count;
- pr->replies_seen = GNUNET_malloc (sizeof (GNUNET_HashCode) * pr->replies_seen_size);
- memcpy (pr->replies_seen,
- replies_seen,
- replies_seen_count * sizeof (GNUNET_HashCode));
- pr->replies_seen_count = replies_seen_count;
- }
- if (NULL != bf_data)
- {
- pr->bf = GNUNET_CONTAINER_bloomfilter_init (bf_data,
- bf_size,
- BLOOMFILTER_K);
- pr->mingle = mingle;
- }
- else if ( (replies_seen_count > 0) &&
- (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH)) )
- {
- GNUNET_assert (GNUNET_YES == refresh_bloomfilter (pr));
- }
+ {
+ pr->replies_seen_size = replies_seen_count;
+ pr->replies_seen =
+ GNUNET_malloc (sizeof (struct GNUNET_HashCode) * pr->replies_seen_size);
+ GNUNET_memcpy (pr->replies_seen,
+ replies_seen,
+ replies_seen_count * sizeof (struct GNUNET_HashCode));
+ pr->replies_seen_count = replies_seen_count;
+ }
+ if (NULL != bf_data)
+ {
+ pr->bf =
+ GNUNET_CONTAINER_bloomfilter_init (bf_data,
+ bf_size,
+ GNUNET_CONSTANTS_BLOOMFILTER_K);
+ pr->mingle = mingle;
+ }
+ else if ((replies_seen_count > 0) &&
+ (0 != (options & GSF_PRO_BLOOMFILTER_FULL_REFRESH)))
+ {
+ refresh_bloomfilter (pr);
+ }
GNUNET_CONTAINER_multihashmap_put (pr_map,
- query,
- pr,
- GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
- if (0 != (options & GSF_PRO_REQUEST_EXPIRES))
+ &pr->public_data.query,
+ pr,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_MULTIPLE);
+ if (0 == (options & GSF_PRO_REQUEST_NEVER_EXPIRES))
+ {
+ pr->hnode =
+ GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap,
+ pr,
+ pr->public_data.ttl.abs_value_us);
+ /* make sure we don't track too many requests */
+ while (GNUNET_CONTAINER_heap_get_size (requests_by_expiration_heap) >
+ max_pending_requests)
{
- pr->hnode = GNUNET_CONTAINER_heap_insert (requests_by_expiration_heap,
- pr,
- pr->public_data.ttl.abs_value);
- /* make sure we don't track too many requests */
- while (GNUNET_CONTAINER_heap_get_size (requests_by_expiration_heap) > max_pending_requests)
- {
- dpr = GNUNET_CONTAINER_heap_peek (requests_by_expiration_heap);
- GNUNET_assert (dpr != NULL);
- if (pr == dpr)
- break; /* let the request live briefly... */
- dpr->rh (dpr->rh_cls,
- GNUNET_BLOCK_EVALUATION_REQUEST_VALID,
- dpr,
- UINT32_MAX,
- GNUNET_TIME_UNIT_FOREVER_ABS,
- GNUNET_BLOCK_TYPE_ANY,
- NULL, 0);
- GSF_pending_request_cancel_ (dpr);
- }
+ dpr = GNUNET_CONTAINER_heap_peek (requests_by_expiration_heap);
+ GNUNET_assert (NULL != dpr);
+ if (pr == dpr)
+ break; /* let the request live briefly... */
+ if (NULL != dpr->rh)
+ dpr->rh (dpr->rh_cls,
+ GNUNET_BLOCK_EVALUATION_REQUEST_VALID,
+ dpr,
+ UINT32_MAX,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_BLOCK_TYPE_ANY,
+ NULL,
+ 0);
+ GSF_pending_request_cancel_ (dpr,
+ GNUNET_YES);
}
+ }
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Pending requests active"),
- 1,
- GNUNET_NO);
+ gettext_noop ("# Pending requests active"), 1,
+ GNUNET_NO);
return pr;
}
-
/**
* Obtain the public data associated with a pending request
- *
+ *
* @param pr pending request
* @return associated public data
*/
}
+/**
+ * Test if two pending requests are compatible (would generate
+ * the same query modulo filters and should thus be processed
+ * jointly).
+ *
+ * @param pra a pending request
+ * @param prb another pending request
+ * @return #GNUNET_OK if the requests are compatible
+ */
+int
+GSF_pending_request_is_compatible_ (struct GSF_PendingRequest *pra,
+ struct GSF_PendingRequest *prb)
+{
+ if ( (pra->public_data.type != prb->public_data.type) ||
+ (0 != memcmp (&pra->public_data.query,
+ &prb->public_data.query,
+ sizeof (struct GNUNET_HashCode))))
+ return GNUNET_NO;
+ return GNUNET_OK;
+}
+
+
/**
* Update a given pending request with additional replies
* that have been seen.
*/
void
GSF_pending_request_update_ (struct GSF_PendingRequest *pr,
- const GNUNET_HashCode *replies_seen,
- unsigned int replies_seen_count)
+ const struct GNUNET_HashCode * replies_seen,
+ unsigned int replies_seen_count)
{
unsigned int i;
- GNUNET_HashCode mhash;
+ struct GNUNET_HashCode mhash;
if (replies_seen_count + pr->replies_seen_count < pr->replies_seen_count)
- return; /* integer overflow */
+ return; /* integer overflow */
if (0 != (pr->public_data.options & GSF_PRO_BLOOMFILTER_FULL_REFRESH))
+ {
+ /* we're responsible for the BF, full refresh */
+ if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size)
+ GNUNET_array_grow (pr->replies_seen, pr->replies_seen_size,
+ replies_seen_count + pr->replies_seen_count);
+ GNUNET_memcpy (&pr->replies_seen[pr->replies_seen_count], replies_seen,
+ sizeof (struct GNUNET_HashCode) * replies_seen_count);
+ pr->replies_seen_count += replies_seen_count;
+ refresh_bloomfilter (pr);
+ }
+ else
+ {
+ if (NULL == pr->bf)
{
- /* we're responsible for the BF, full refresh */
- if (replies_seen_count + pr->replies_seen_count > pr->replies_seen_size)
- GNUNET_array_grow (pr->replies_seen,
- pr->replies_seen_size,
- replies_seen_count + pr->replies_seen_count);
- memcpy (&pr->replies_seen[pr->replies_seen_count],
- replies_seen,
- sizeof (GNUNET_HashCode) * replies_seen_count);
- pr->replies_seen_count += replies_seen_count;
- if (GNUNET_NO == refresh_bloomfilter (pr))
- {
- /* bf not recalculated, simply extend it with new bits */
- for (i=0;i<replies_seen_count;i++)
- {
- GNUNET_BLOCK_mingle_hash (&replies_seen[i],
- pr->mingle,
- &mhash);
- GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
- }
- }
+ /* we're not the initiator, but the initiator did not give us
+ * any bloom-filter, so we need to create one on-the-fly */
+ pr->mingle =
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ UINT32_MAX);
+ pr->bf =
+ GNUNET_BLOCK_construct_bloomfilter (pr->mingle,
+ replies_seen,
+ replies_seen_count);
}
- else
+ else
{
- if (NULL == pr->bf)
- {
- /* we're not the initiator, but the initiator did not give us
- any bloom-filter, so we need to create one on-the-fly */
- pr->mingle = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- UINT32_MAX);
- pr->bf = GNUNET_CONTAINER_bloomfilter_init (NULL,
- compute_bloomfilter_size (replies_seen_count),
- BLOOMFILTER_K);
- }
- for (i=0;i<pr->replies_seen_count;i++)
- {
- GNUNET_BLOCK_mingle_hash (&replies_seen[i],
- pr->mingle,
- &mhash);
- GNUNET_CONTAINER_bloomfilter_add (pr->bf, &mhash);
- }
+ for (i = 0; i < pr->replies_seen_count; i++)
+ {
+ GNUNET_BLOCK_mingle_hash (&replies_seen[i],
+ pr->mingle,
+ &mhash);
+ GNUNET_CONTAINER_bloomfilter_add (pr->bf,
+ &mhash);
+ }
}
+ }
+ if (NULL != pr->gh)
+ GNUNET_DHT_get_filter_known_results (pr->gh,
+ replies_seen_count,
+ replies_seen);
}
/**
* Generate the message corresponding to the given pending request for
- * transmission to other peers (or at least determine its size).
+ * transmission to other peers.
*
* @param pr request to generate the message for
- * @param buf_size number of bytes available in buf
- * @param buf where to copy the message (can be NULL)
- * @return number of bytes needed (if > buf_size) or used
+ * @return envelope with the request message
*/
-size_t
-GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr,
- size_t buf_size,
- void *buf)
+struct GNUNET_MQ_Envelope *
+GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr)
{
- char lbuf[GNUNET_SERVER_MAX_MESSAGE_SIZE];
+ struct GNUNET_MQ_Envelope *env;
struct GetMessage *gm;
- GNUNET_HashCode *ext;
- size_t msize;
+ struct GNUNET_PeerIdentity *ext;
unsigned int k;
uint32_t bm;
uint32_t prio;
int64_t ttl;
int do_route;
-#if DEBUG_FS
- if (buf_size > 0)
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Building request message for `%s' of type %d\n",
- GNUNET_h2s (&pr->public_data.query),
- pr->public_data.type);
-#endif
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Building request message for `%s' of type %d\n",
+ GNUNET_h2s (&pr->public_data.query),
+ pr->public_data.type);
k = 0;
bm = 0;
do_route = (0 == (pr->public_data.options & GSF_PRO_FORWARD_ONLY));
- if ( (! do_route) && (pr->sender_pid == 0))
- {
- GNUNET_break (0);
- do_route = GNUNET_YES;
- }
- if (! do_route)
- {
- bm |= GET_MESSAGE_BIT_RETURN_TO;
- k++;
- }
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
- {
- bm |= GET_MESSAGE_BIT_SKS_NAMESPACE;
- k++;
- }
- if (GNUNET_YES == pr->public_data.has_target)
- {
- bm |= GET_MESSAGE_BIT_TRANSMIT_TO;
- k++;
- }
+ if ((!do_route) && (pr->sender_pid == 0))
+ {
+ GNUNET_break (0);
+ do_route = GNUNET_YES;
+ }
+ if (!do_route)
+ {
+ bm |= GET_MESSAGE_BIT_RETURN_TO;
+ k++;
+ }
+ if (NULL != pr->public_data.target)
+ {
+ bm |= GET_MESSAGE_BIT_TRANSMIT_TO;
+ k++;
+ }
bf_size = GNUNET_CONTAINER_bloomfilter_get_size (pr->bf);
- msize = sizeof (struct GetMessage) + bf_size + k * sizeof(GNUNET_HashCode);
- GNUNET_assert (msize < GNUNET_SERVER_MAX_MESSAGE_SIZE);
- if (buf_size < msize)
- return msize;
- gm = (struct GetMessage*) lbuf;
- gm->header.type = htons (GNUNET_MESSAGE_TYPE_FS_GET);
- gm->header.size = htons (msize);
+ env = GNUNET_MQ_msg_extra (gm,
+ bf_size + k * sizeof (struct GNUNET_PeerIdentity),
+ GNUNET_MESSAGE_TYPE_FS_GET);
gm->type = htonl (pr->public_data.type);
if (do_route)
- prio = GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- pr->public_data.priority + 1);
+ prio =
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
+ pr->public_data.priority + 1);
else
prio = 0;
pr->public_data.priority -= prio;
+ pr->public_data.num_transmissions++;
+ pr->public_data.respect_offered += prio;
gm->priority = htonl (prio);
now = GNUNET_TIME_absolute_get ();
- ttl = (int64_t) (pr->public_data.ttl.abs_value - now.abs_value);
- gm->ttl = htonl (ttl / 1000);
- gm->filter_mutator = htonl(pr->mingle);
+ ttl = (int64_t) (pr->public_data.ttl.abs_value_us - now.abs_value_us);
+ gm->ttl = htonl (ttl / 1000LL / 1000LL);
+ gm->filter_mutator = htonl (pr->mingle);
gm->hash_bitmap = htonl (bm);
gm->query = pr->public_data.query;
- ext = (GNUNET_HashCode*) &gm[1];
- k = 0;
+ ext = (struct GNUNET_PeerIdentity *) &gm[1];
+ k = 0;
if (! do_route)
- GNUNET_PEER_resolve (pr->sender_pid,
- (struct GNUNET_PeerIdentity*) &ext[k++]);
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
- memcpy (&ext[k++],
- &pr->public_data.namespace,
- sizeof (GNUNET_HashCode));
- if (GNUNET_YES == pr->public_data.has_target)
- ext[k++] = pr->public_data.target.hashPubKey;
- if (pr->bf != NULL)
+ GNUNET_PEER_resolve (pr->sender_pid,
+ &ext[k++]);
+ if (NULL != pr->public_data.target)
+ ext[k++] = *pr->public_data.target;
+ if (NULL != pr->bf)
GNUNET_assert (GNUNET_SYSERR !=
- GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf,
- (char*) &ext[k],
- bf_size));
- memcpy (buf, gm, msize);
- return msize;
+ GNUNET_CONTAINER_bloomfilter_get_raw_data (pr->bf,
+ (char *) &ext[k],
+ bf_size));
+ return env;
}
* @param cls closure, unused
* @param key current key code
* @param value value in the hash map (pending request)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
*/
-static int
+static int
clean_request (void *cls,
- const GNUNET_HashCode * key,
- void *value)
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct GSF_PendingRequest *pr = value;
GSF_LocalLookupContinuation cont;
-#if DEBUG_FS
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Cleaning up pending request for `%s'.\n",
+ "Cleaning up pending request for `%s'.\n",
GNUNET_h2s (key));
-#endif
+ if (NULL != pr->cadet_request)
+ {
+ pr->cadet_retry_count = CADET_RETRY_MAX;
+ GSF_cadet_query_cancel (pr->cadet_request);
+ pr->cadet_request = NULL;
+ }
if (NULL != (cont = pr->llc_cont))
- {
- pr->llc_cont = NULL;
- cont (pr->llc_cont_cls,
- pr,
- pr->local_result);
- }
+ {
+ pr->llc_cont = NULL;
+ cont (pr->llc_cont_cls,
+ pr,
+ pr->local_result);
+ }
GSF_plan_notify_request_done_ (pr);
GNUNET_free_non_null (pr->replies_seen);
if (NULL != pr->bf)
- {
- GNUNET_CONTAINER_bloomfilter_free (pr->bf);
- pr->bf = NULL;
- }
+ {
+ GNUNET_CONTAINER_bloomfilter_free (pr->bf);
+ pr->bf = NULL;
+ }
GNUNET_PEER_change_rc (pr->sender_pid, -1);
pr->sender_pid = 0;
+ GNUNET_PEER_change_rc (pr->origin_pid, -1);
+ pr->origin_pid = 0;
if (NULL != pr->hnode)
- {
- GNUNET_CONTAINER_heap_remove_node (pr->hnode);
- pr->hnode = NULL;
- }
+ {
+ GNUNET_CONTAINER_heap_remove_node (pr->hnode);
+ pr->hnode = NULL;
+ }
if (NULL != pr->qe)
- {
- GNUNET_DATASTORE_cancel (pr->qe);
- pr->qe = NULL;
- }
+ {
+ GNUNET_DATASTORE_cancel (pr->qe);
+ pr->qe = NULL;
+ }
if (NULL != pr->gh)
- {
- GNUNET_DHT_get_stop (pr->gh);
- pr->gh = NULL;
- }
- if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
- {
- GNUNET_SCHEDULER_cancel (pr->warn_task);
- pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ {
+ GNUNET_DHT_get_stop (pr->gh);
+ pr->gh = NULL;
+ }
+ if (NULL != pr->warn_task)
+ {
+ GNUNET_SCHEDULER_cancel (pr->warn_task);
+ pr->warn_task = NULL;
+ }
GNUNET_assert (GNUNET_OK ==
- GNUNET_CONTAINER_multihashmap_remove (pr_map,
- &pr->public_data.query,
- pr));
+ GNUNET_CONTAINER_multihashmap_remove (pr_map,
+ &pr->public_data.query,
+ pr));
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Pending requests active"),
- -1,
- GNUNET_NO);
+ gettext_noop ("# Pending requests active"),
+ -1,
+ GNUNET_NO);
GNUNET_free (pr);
return GNUNET_YES;
}
* Explicitly cancel a pending request.
*
* @param pr request to cancel
+ * @param full_cleanup fully purge the request
*/
void
-GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr)
+GSF_pending_request_cancel_ (struct GSF_PendingRequest *pr,
+ int full_cleanup)
{
- if (NULL == pr_map)
- return; /* already cleaned up! */
+ GSF_LocalLookupContinuation cont;
+
+ if (NULL == pr_map)
+ return; /* already cleaned up! */
+ if (GNUNET_NO == full_cleanup)
+ {
+ /* make request inactive (we're no longer interested in more results),
+ * but do NOT remove from our data-structures, we still need it there
+ * to prevent the request from looping */
+ pr->rh = NULL;
+ if (NULL != pr->cadet_request)
+ {
+ pr->cadet_retry_count = CADET_RETRY_MAX;
+ GSF_cadet_query_cancel (pr->cadet_request);
+ pr->cadet_request = NULL;
+ }
+ if (NULL != (cont = pr->llc_cont))
+ {
+ pr->llc_cont = NULL;
+ cont (pr->llc_cont_cls,
+ pr,
+ pr->local_result);
+ }
+ GSF_plan_notify_request_done_ (pr);
+ if (NULL != pr->qe)
+ {
+ GNUNET_DATASTORE_cancel (pr->qe);
+ pr->qe = NULL;
+ }
+ if (NULL != pr->gh)
+ {
+ GNUNET_DHT_get_stop (pr->gh);
+ pr->gh = NULL;
+ }
+ if (NULL != pr->warn_task)
+ {
+ GNUNET_SCHEDULER_cancel (pr->warn_task);
+ pr->warn_task = NULL;
+ }
+ return;
+ }
GNUNET_assert (GNUNET_YES ==
- clean_request (NULL, &pr->public_data.query, pr));
+ clean_request (NULL,
+ &pr->public_data.query,
+ pr));
}
* Iterate over all pending requests.
*
* @param it function to call for each request
- * @param cls closure for it
+ * @param cls closure for @a it
*/
void
-GSF_iterate_pending_requests_ (GSF_PendingRequestIterator it,
- void *cls)
+GSF_iterate_pending_requests_ (GSF_PendingRequestIterator it, void *cls)
{
GNUNET_CONTAINER_multihashmap_iterate (pr_map,
- (GNUNET_CONTAINER_HashMapIterator) it,
- cls);
+ (GNUNET_CONTAINER_HashMapIterator) it,
+ cls);
}
-
-
/**
- * Closure for "process_reply" function.
+ * Closure for process_reply() function.
*/
struct ProcessReplyClosure
{
*/
enum GNUNET_BLOCK_Type type;
+ /**
+ * Control flags for evaluation.
+ */
+ enum GNUNET_BLOCK_EvaluationOptions eo;
+
/**
* How much was this reply worth to us?
*/
*/
static void
update_request_performance_data (struct ProcessReplyClosure *prq,
- struct GSF_PendingRequest *pr)
+ struct GSF_PendingRequest *pr)
{
if (prq->sender == NULL)
- return;
- GSF_peer_update_performance_ (prq->sender,
- pr->public_data.start_time,
- prq->priority);
+ return;
+ GSF_peer_update_performance_ (prq->sender, pr->public_data.start_time,
+ prq->priority);
}
-
+
/**
* We have received a reply; handle it!
*
- * @param cls response (struct ProcessReplyClosure)
+ * @param cls response (a `struct ProcessReplyClosure`)
* @param key our query
* @param value value in the hash map (info about the query)
- * @return GNUNET_YES (we should continue to iterate)
+ * @return #GNUNET_YES (we should continue to iterate)
*/
static int
process_reply (void *cls,
- const GNUNET_HashCode *key,
- void *value)
+ const struct GNUNET_HashCode *key,
+ void *value)
{
struct ProcessReplyClosure *prq = cls;
struct GSF_PendingRequest *pr = value;
- GNUNET_HashCode chash;
+ struct GNUNET_HashCode chash;
+ struct GNUNET_TIME_Absolute last_transmission;
-#if DEBUG_FS
+ if (NULL == pr->rh)
+ return GNUNET_YES;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Matched result (type %u) for query `%s' with pending request\n",
- (unsigned int) prq->type,
- GNUNET_h2s (key));
-#endif
+ "Matched result (type %u) for query `%s' with pending request\n",
+ (unsigned int) prq->type,
+ GNUNET_h2s (key));
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# replies received and matched"),
- 1,
- GNUNET_NO);
- prq->eval = GNUNET_BLOCK_evaluate (GSF_block_ctx,
- prq->type,
- key,
- &pr->bf,
- pr->mingle,
- &pr->public_data.namespace,
- (prq->type == GNUNET_BLOCK_TYPE_FS_SBLOCK) ? sizeof (GNUNET_HashCode) : 0,
- prq->data,
- prq->size);
+ gettext_noop ("# replies received and matched"), 1,
+ GNUNET_NO);
+ prq->eval =
+ GNUNET_BLOCK_evaluate (GSF_block_ctx,
+ prq->type,
+ prq->eo,
+ key,
+ &pr->bf,
+ pr->mingle,
+ NULL,
+ 0,
+ prq->data,
+ prq->size);
switch (prq->eval)
- {
- case GNUNET_BLOCK_EVALUATION_OK_MORE:
- update_request_performance_data (prq, pr);
- break;
- case GNUNET_BLOCK_EVALUATION_OK_LAST:
- /* short cut: stop processing early, no BF-update, etc. */
- update_request_performance_data (prq, pr);
- GNUNET_LOAD_update (GSF_rt_entry_lifetime,
- GNUNET_TIME_absolute_get_duration (pr->public_data.start_time).rel_value);
- /* pass on to other peers / local clients */
- pr->rh (pr->rh_cls,
- prq->eval,
- pr,
- prq->anonymity_level,
- prq->expiration,
- prq->type,
- prq->data, prq->size);
- return GNUNET_YES;
- case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# duplicate replies discarded (bloomfilter)"),
- 1,
- GNUNET_NO);
-#if DEBUG_FS && 0
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Duplicate response `%s', discarding.\n",
- GNUNET_h2s (&mhash));
+ {
+ case GNUNET_BLOCK_EVALUATION_OK_MORE:
+ update_request_performance_data (prq, pr);
+ break;
+ case GNUNET_BLOCK_EVALUATION_OK_LAST:
+ /* short cut: stop processing early, no BF-update, etc. */
+ update_request_performance_data (prq, pr);
+ GNUNET_LOAD_update (GSF_rt_entry_lifetime,
+ GNUNET_TIME_absolute_get_duration (pr->
+ public_data.start_time).rel_value_us);
+ if (GNUNET_YES !=
+ GSF_request_plan_reference_get_last_transmission_ (pr->public_data.pr_head,
+ prq->sender,
+ &last_transmission))
+ last_transmission.abs_value_us = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+ /* pass on to other peers / local clients */
+ pr->rh (pr->rh_cls, prq->eval, pr, prq->anonymity_level, prq->expiration,
+ last_transmission, prq->type, prq->data, prq->size);
+ return GNUNET_YES;
+ case GNUNET_BLOCK_EVALUATION_OK_DUPLICATE:
+#if INSANE_STATISTICS
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# duplicate replies discarded (bloomfilter)"),
+ 1, GNUNET_NO);
#endif
- return GNUNET_YES; /* duplicate */
- case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
- return GNUNET_YES; /* wrong namespace */
- case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
- GNUNET_break (0);
- return GNUNET_YES;
- case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
- GNUNET_break (0);
- return GNUNET_YES;
- case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Unsupported block type %u\n"),
- prq->type);
- return GNUNET_NO;
- }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Duplicate response, discarding.\n");
+ return GNUNET_YES; /* duplicate */
+ case GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT:
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# irrelevant replies discarded"),
+ 1, GNUNET_NO);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Irrelevant response, ignoring.\n");
+ return GNUNET_YES;
+ case GNUNET_BLOCK_EVALUATION_RESULT_INVALID:
+ return GNUNET_YES; /* wrong namespace */
+ case GNUNET_BLOCK_EVALUATION_REQUEST_VALID:
+ GNUNET_break (0);
+ return GNUNET_YES;
+ case GNUNET_BLOCK_EVALUATION_REQUEST_INVALID:
+ GNUNET_break (0);
+ return GNUNET_YES;
+ case GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED:
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Unsupported block type %u\n"),
+ prq->type);
+ return GNUNET_NO;
+ }
/* update bloomfilter */
GNUNET_CRYPTO_hash (prq->data,
- prq->size,
- &chash);
- GSF_pending_request_update_ (pr, &chash, 1);
+ prq->size,
+ &chash);
+ GSF_pending_request_update_ (pr,
+ &chash,
+ 1);
if (NULL == prq->sender)
- {
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found result for query `%s' in local datastore\n",
- GNUNET_h2s (key));
-#endif
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# results found locally"),
- 1,
- GNUNET_NO);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found result for query `%s' in local datastore\n",
+ GNUNET_h2s (key));
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# results found locally"),
+ 1,
+ GNUNET_NO);
+ }
else
- {
- GSF_dht_lookup_ (pr);
- }
+ {
+ GSF_dht_lookup_ (pr);
+ }
prq->priority += pr->public_data.original_priority;
pr->public_data.priority = 0;
pr->public_data.original_priority = 0;
pr->public_data.results_found++;
prq->request_found = GNUNET_YES;
/* finally, pass on to other peer / local client */
+ if (! GSF_request_plan_reference_get_last_transmission_ (pr->public_data.pr_head,
+ prq->sender,
+ &last_transmission))
+ last_transmission.abs_value_us = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
pr->rh (pr->rh_cls,
- prq->eval,
- pr,
+ prq->eval,
+ pr,
prq->anonymity_level,
- prq->expiration,
- prq->type,
- prq->data, prq->size);
+ prq->expiration,
+ last_transmission,
+ prq->type,
+ prq->data,
+ prq->size);
return GNUNET_YES;
}
/**
- * Context for the 'put_migration_continuation'.
+ * Context for put_migration_continuation().
*/
struct PutMigrationContext
{
struct GNUNET_PeerIdentity origin;
/**
- * GNUNET_YES if we had a matching request for this block,
- * GNUNET_NO if not.
+ * #GNUNET_YES if we had a matching request for this block,
+ * #GNUNET_NO if not.
*/
int requested;
};
* operation.
*
* @param cls closure
- * @param success GNUNET_SYSERR on failure
+ * @param success #GNUNET_SYSERR on failure
+ * @param min_expiration minimum expiration time required for content to be stored
* @param msg NULL on success, otherwise an error message
*/
-static void
-put_migration_continuation (void *cls,
- int success,
+static void
+put_migration_continuation (void *cls, int success,
+ struct GNUNET_TIME_Absolute min_expiration,
const char *msg)
{
struct PutMigrationContext *pmc = cls;
- struct GNUNET_TIME_Relative delay;
- struct GNUNET_TIME_Relative block_time;
struct GSF_ConnectedPeer *cp;
+ struct GNUNET_TIME_Relative mig_pause;
struct GSF_PeerPerformanceData *ppd;
-
- delay = GNUNET_TIME_absolute_get_duration (pmc->start);
- cp = GSF_peer_get_ (&pmc->origin);
- if ( (GNUNET_OK != success) &&
- (GNUNET_NO == pmc->requested) )
+
+ if (NULL != datastore_put_load)
+ {
+ if (GNUNET_SYSERR != success)
{
- /* block migration for a bit... */
- if (NULL != cp)
- {
- ppd = GSF_get_peer_performance_data_ (cp);
- ppd->migration_duplication++;
- block_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS,
- 5 * ppd->migration_duplication +
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5));
- GSF_block_peer_migration_ (cp, block_time);
- }
+ GNUNET_LOAD_update (datastore_put_load,
+ GNUNET_TIME_absolute_get_duration (pmc->start).rel_value_us);
}
- else
+ else
{
- if (NULL != cp)
- {
- ppd = GSF_get_peer_performance_data_ (cp);
- ppd->migration_duplication = 0; /* reset counter */
- }
+ /* on queue failure / timeout, increase the put load dramatically */
+ GNUNET_LOAD_update (datastore_put_load,
+ GNUNET_TIME_UNIT_MINUTES.rel_value_us);
}
- GNUNET_free (pmc);
- /* FIXME: should we really update the load value on failure? */
- GNUNET_LOAD_update (datastore_put_load,
- delay.rel_value);
+ }
+ cp = GSF_peer_get_ (&pmc->origin);
if (GNUNET_OK == success)
+ {
+ if (NULL != cp)
+ {
+ ppd = GSF_get_peer_performance_data_ (cp);
+ ppd->migration_delay.rel_value_us /= 2;
+ }
+ GNUNET_free (pmc);
return;
+ }
+ if ( (GNUNET_NO == success) &&
+ (GNUNET_NO == pmc->requested) &&
+ (NULL != cp) )
+ {
+ ppd = GSF_get_peer_performance_data_ (cp);
+ if (min_expiration.abs_value_us > 0)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asking to stop migration for %s because datastore is full\n",
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_remaining (min_expiration), GNUNET_YES));
+ GSF_block_peer_migration_ (cp, min_expiration);
+ }
+ else
+ {
+ ppd->migration_delay = GNUNET_TIME_relative_max (GNUNET_TIME_UNIT_SECONDS,
+ ppd->migration_delay);
+ ppd->migration_delay = GNUNET_TIME_relative_min (GNUNET_TIME_UNIT_HOURS,
+ ppd->migration_delay);
+ mig_pause.rel_value_us = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK,
+ ppd->migration_delay.rel_value_us);
+ ppd->migration_delay = GNUNET_TIME_relative_saturating_multiply (ppd->migration_delay, 2);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Replicated content already exists locally, asking to stop migration for %s\n",
+ GNUNET_STRINGS_relative_time_to_string (mig_pause,
+ GNUNET_YES));
+ GSF_block_peer_migration_ (cp,
+ GNUNET_TIME_relative_to_absolute (mig_pause));
+ }
+ }
+ GNUNET_free (pmc);
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore `PUT' failures"),
- 1,
- GNUNET_NO);
+ gettext_noop ("# Datastore `PUT' failures"), 1,
+ GNUNET_NO);
}
/**
* Test if the DATABASE (PUT) load on this peer is too high
* to even consider processing the query at
- * all.
- *
- * @return GNUNET_YES if the load is too high to do anything (load high)
- * GNUNET_NO to process normally (load normal or low)
+ * all.
+ *
+ * @param priority the priority of the item
+ * @return #GNUNET_YES if the load is too high to do anything (load high)
+ * #GNUNET_NO to process normally (load normal or low)
*/
static int
test_put_load_too_high (uint32_t priority)
{
double ld;
+ if (NULL == datastore_put_load)
+ return GNUNET_NO;
if (GNUNET_LOAD_get_average (datastore_put_load) < 50)
- return GNUNET_NO; /* very fast */
+ return GNUNET_NO; /* very fast */
ld = GNUNET_LOAD_get_load (datastore_put_load);
if (ld < 2.0 * (1 + priority))
return GNUNET_NO;
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# storage requests dropped due to high load"),
- 1,
- GNUNET_NO);
+ gettext_noop
+ ("# storage requests dropped due to high load"), 1,
+ GNUNET_NO);
return GNUNET_YES;
}
* @param cls closure
* @param exp when will this value expire
* @param key key of the result
- * @param get_path NULL-terminated array of pointers
- * to the peers on reverse GET path (or NULL if not recorded)
- * @param put_path NULL-terminated array of pointers
- * to the peers on the PUT path (or NULL if not recorded)
+ * @param get_path peers on reply path (or NULL if not recorded)
+ * @param get_path_length number of entries in @a get_path
+ * @param put_path peers on the PUT path (or NULL if not recorded)
+ * @param put_path_length number of entries in @a get_path
* @param type type of the result
- * @param size number of bytes in data
+ * @param size number of bytes in @a data
* @param data pointer to the result data
*/
static void
handle_dht_reply (void *cls,
- struct GNUNET_TIME_Absolute exp,
- const GNUNET_HashCode *key,
- const struct GNUNET_PeerIdentity * const *get_path,
- const struct GNUNET_PeerIdentity * const *put_path,
- enum GNUNET_BLOCK_Type type,
- size_t size,
- const void *data)
+ struct GNUNET_TIME_Absolute exp,
+ const struct GNUNET_HashCode *key,
+ const struct GNUNET_PeerIdentity *get_path,
+ unsigned int get_path_length,
+ const struct GNUNET_PeerIdentity *put_path,
+ unsigned int put_path_length,
+ enum GNUNET_BLOCK_Type type,
+ size_t size,
+ const void *data)
{
struct GSF_PendingRequest *pr = cls;
struct ProcessReplyClosure prq;
struct PutMigrationContext *pmc;
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Replies received from DHT"),
- 1,
- GNUNET_NO);
+ gettext_noop ("# Replies received from DHT"), 1,
+ GNUNET_NO);
memset (&prq, 0, sizeof (prq));
prq.data = data;
prq.expiration = exp;
- prq.size = size;
+ /* do not allow migrated content to live longer than 1 year */
+ prq.expiration = GNUNET_TIME_absolute_min (GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_YEARS),
+ prq.expiration);
+ prq.size = size;
prq.type = type;
+ prq.eo = GNUNET_BLOCK_EO_NONE;
process_reply (&prq, key, pr);
- if ( (GNUNET_YES == active_to_migration) &&
- (GNUNET_NO == test_put_load_too_high (prq.priority)) )
- {
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Replicating result for query `%s' with priority %u\n",
- GNUNET_h2s (key),
- prq.priority);
-#endif
- pmc = GNUNET_malloc (sizeof (struct PutMigrationContext));
- pmc->start = GNUNET_TIME_absolute_get ();
- pmc->requested = GNUNET_YES;
- if (NULL ==
- GNUNET_DATASTORE_put (GSF_dsh,
- 0, key, size, data,
- type, prq.priority, 1 /* anonymity */,
- 0 /* replication */,
- exp,
- 1 + prq.priority, MAX_DATASTORE_QUEUE,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &put_migration_continuation,
- pmc))
- {
- put_migration_continuation (pmc, GNUNET_NO, NULL);
- }
+ if ((GNUNET_YES == active_to_migration) &&
+ (GNUNET_NO == test_put_load_too_high (prq.priority)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Replicating result for query `%s' with priority %u\n",
+ GNUNET_h2s (key), prq.priority);
+ pmc = GNUNET_new (struct PutMigrationContext);
+ pmc->start = GNUNET_TIME_absolute_get ();
+ pmc->requested = GNUNET_YES;
+ if (NULL ==
+ GNUNET_DATASTORE_put (GSF_dsh, 0, key, size, data, type, prq.priority,
+ 1 /* anonymity */ ,
+ 0 /* replication */ ,
+ exp, 1 + prq.priority, MAX_DATASTORE_QUEUE,
+ &put_migration_continuation, pmc))
+ {
+ put_migration_continuation (pmc,
+ GNUNET_SYSERR,
+ GNUNET_TIME_UNIT_ZERO_ABS,
+ NULL);
}
+ }
}
const void *xquery;
size_t xquery_size;
struct GNUNET_PeerIdentity pi;
- char buf[sizeof (GNUNET_HashCode) * 2];
+ char buf[sizeof (struct GNUNET_HashCode) * 2] GNUNET_ALIGN;
if (0 != pr->public_data.anonymity_level)
return;
if (NULL != pr->gh)
- {
- GNUNET_DHT_get_stop (pr->gh);
- pr->gh = NULL;
- }
+ {
+ GNUNET_DHT_get_stop (pr->gh);
+ pr->gh = NULL;
+ }
xquery = NULL;
xquery_size = 0;
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
- {
- xquery = buf;
- memcpy (buf, &pr->public_data.namespace, sizeof (GNUNET_HashCode));
- xquery_size = sizeof (GNUNET_HashCode);
- }
if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY))
- {
- GNUNET_assert (0 != pr->sender_pid);
- GNUNET_PEER_resolve (pr->sender_pid,
- &pi);
- memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity));
- xquery_size += sizeof (struct GNUNET_PeerIdentity);
- }
- pr->gh = GNUNET_DHT_get_start (GSF_dht,
- GNUNET_TIME_UNIT_FOREVER_REL,
- pr->public_data.type,
- &pr->public_data.query,
- DEFAULT_GET_REPLICATION,
- GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
- pr->bf,
- pr->mingle,
- xquery,
- xquery_size,
- &handle_dht_reply,
- pr);
+ {
+ GNUNET_assert (0 != pr->sender_pid);
+ GNUNET_PEER_resolve (pr->sender_pid, &pi);
+ GNUNET_memcpy (&buf[xquery_size], &pi, sizeof (struct GNUNET_PeerIdentity));
+ xquery_size += sizeof (struct GNUNET_PeerIdentity);
+ }
+ pr->gh =
+ GNUNET_DHT_get_start (GSF_dht,
+ pr->public_data.type, &pr->public_data.query,
+ DHT_GET_REPLICATION,
+ GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE,
+ xquery, xquery_size, &handle_dht_reply, pr);
+ if ( (NULL != pr->gh) &&
+ (0 != pr->replies_seen_count) )
+ GNUNET_DHT_get_filter_known_results (pr->gh,
+ pr->replies_seen_count,
+ pr->replies_seen);
+}
+
+
+/**
+ * Function called with a reply from the cadet.
+ *
+ * @param cls the pending request struct
+ * @param type type of the block, ANY on error
+ * @param expiration expiration time for the block
+ * @param data_size number of bytes in @a data, 0 on error
+ * @param data reply block data, NULL on error
+ */
+static void
+cadet_reply_proc (void *cls,
+ enum GNUNET_BLOCK_Type type,
+ struct GNUNET_TIME_Absolute expiration,
+ size_t data_size,
+ const void *data)
+{
+ struct GSF_PendingRequest *pr = cls;
+ struct ProcessReplyClosure prq;
+ struct GNUNET_HashCode query;
+
+ pr->cadet_request = NULL;
+ if (GNUNET_BLOCK_TYPE_ANY == type)
+ {
+ GNUNET_break (NULL == data);
+ GNUNET_break (0 == data_size);
+ pr->cadet_retry_count++;
+ if (pr->cadet_retry_count >= CADET_RETRY_MAX)
+ return; /* give up on cadet */
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Error retrieiving block via cadet\n");
+ /* retry -- without delay, as this is non-anonymous
+ and cadet/cadet connect will take some time anyway */
+ pr->cadet_request = GSF_cadet_query (pr->public_data.target,
+ &pr->public_data.query,
+ pr->public_data.type,
+ &cadet_reply_proc,
+ pr);
+ return;
+ }
+ if (GNUNET_YES !=
+ GNUNET_BLOCK_get_key (GSF_block_ctx,
+ type,
+ data, data_size, &query))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Failed to derive key for block of type %d\n",
+ (int) type);
+ GNUNET_break_op (0);
+ return;
+ }
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# Replies received from CADET"), 1,
+ GNUNET_NO);
+ memset (&prq, 0, sizeof (prq));
+ prq.data = data;
+ prq.expiration = expiration;
+ /* do not allow migrated content to live longer than 1 year */
+ prq.expiration = GNUNET_TIME_absolute_min (GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_YEARS),
+ prq.expiration);
+ prq.size = data_size;
+ prq.type = type;
+ prq.eo = GNUNET_BLOCK_EO_NONE;
+ process_reply (&prq, &query, pr);
+}
+
+
+/**
+ * Consider downloading via cadet (if possible)
+ *
+ * @param pr the pending request to process
+ */
+void
+GSF_cadet_lookup_ (struct GSF_PendingRequest *pr)
+{
+ if (0 != pr->public_data.anonymity_level)
+ return;
+ if (0 == pr->public_data.target)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Cannot do cadet-based download, target peer not known\n");
+ return;
+ }
+ if (NULL != pr->cadet_request)
+ return;
+ pr->cadet_request = GSF_cadet_query (pr->public_data.target,
+ &pr->public_data.query,
+ pr->public_data.type,
+ &cadet_reply_proc,
+ pr);
}
/**
* Task that issues a warning if the datastore lookup takes too long.
- *
- * @param cls the 'struct GSF_PendingRequest'
- * @param tc task context
+ *
+ * @param cls the `struct GSF_PendingRequest`
*/
static void
-warn_delay_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+warn_delay_task (void *cls)
{
struct GSF_PendingRequest *pr = cls;
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Datastore lookup already took %llu ms!\n"),
- (unsigned long long) GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_delay_task,
- pr);
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+ _("Datastore lookup already took %s!\n"),
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pr->qe_start),
+ GNUNET_YES));
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &warn_delay_task,
+ pr);
}
/**
* Task that issues a warning if the datastore lookup takes too long.
- *
- * @param cls the 'struct GSF_PendingRequest'
- * @param tc task context
+ *
+ * @param cls the `struct GSF_PendingRequest`
*/
static void
-odc_warn_delay_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+odc_warn_delay_task (void *cls)
{
struct GSF_PendingRequest *pr = cls;
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("On-demand lookup already took %llu ms!\n"),
- (unsigned long long) GNUNET_TIME_absolute_get_duration (pr->qe_start).rel_value);
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &odc_warn_delay_task,
- pr);
+ _("On-demand lookup already took %s!\n"),
+ GNUNET_STRINGS_relative_time_to_string (GNUNET_TIME_absolute_get_duration (pr->qe_start), GNUNET_YES));
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &odc_warn_delay_task, pr);
}
* peer and if we are done either clean up (operation
* complete) or forward to other peers (more results possible).
*
- * @param cls our closure (struct PendingRequest)
+ * @param cls our closure (`struct GSF_PendingRequest *`)
* @param key key for the content
- * @param size number of bytes in data
+ * @param size number of bytes in @a data
* @param data content stored
* @param type type of the content
* @param priority priority of the content
*/
static void
process_local_reply (void *cls,
- const GNUNET_HashCode *key,
- size_t size,
- const void *data,
- enum GNUNET_BLOCK_Type type,
- uint32_t priority,
- uint32_t anonymity,
- struct GNUNET_TIME_Absolute expiration,
- uint64_t uid)
+ const struct GNUNET_HashCode *key,
+ size_t size,
+ const void *data,
+ enum GNUNET_BLOCK_Type type,
+ uint32_t priority,
+ uint32_t anonymity,
+ struct GNUNET_TIME_Absolute expiration,
+ uint64_t uid)
{
struct GSF_PendingRequest *pr = cls;
GSF_LocalLookupContinuation cont;
struct ProcessReplyClosure prq;
- GNUNET_HashCode query;
+ struct GNUNET_HashCode query;
unsigned int old_rf;
GNUNET_SCHEDULER_cancel (pr->warn_task);
- pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->warn_task = NULL;
if (NULL != pr->qe)
+ {
+ pr->qe = NULL;
+ if (NULL == key)
{
- pr->qe = NULL;
- if (NULL == key)
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (no results)"),
- 1,
- GNUNET_NO);
- }
- if (GNUNET_NO == pr->have_first_uid)
- {
- pr->first_uid = uid;
- pr->have_first_uid = 1;
- }
- else
- {
- if ( (uid == pr->first_uid) && (key != NULL) )
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (seen all)"),
- 1,
- GNUNET_NO);
- key = NULL; /* all replies seen! */
- }
- pr->have_first_uid++;
- if ( (pr->have_first_uid > MAX_RESULTS) && (key != NULL) )
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups aborted (more than MAX_RESULTS)"),
- 1,
- GNUNET_NO);
- key = NULL; /* all replies seen! */
- }
- }
+#if INSANE_STATISTICS
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (no results)"),
+ 1, GNUNET_NO);
+#endif
}
- if (NULL == key)
+ if (GNUNET_NO == pr->have_first_uid)
{
-#if DEBUG_FS > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "No further local responses available.\n");
-#endif
- if ( (pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK) ||
- (pr->public_data.type == GNUNET_BLOCK_TYPE_FS_IBLOCK) )
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# requested DBLOCK or IBLOCK not found"),
- 1,
- GNUNET_NO);
- goto check_error_and_continue;
+ pr->first_uid = uid;
+ pr->have_first_uid = 1;
}
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received reply for `%s' of type %d with UID %llu from datastore.\n",
- GNUNET_h2s (key),
- type,
- (unsigned long long) uid);
+ else
+ {
+ if ((uid == pr->first_uid) && (key != NULL))
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (seen all)"),
+ 1, GNUNET_NO);
+ key = NULL; /* all replies seen! */
+ }
+ pr->have_first_uid++;
+ if ((pr->have_first_uid > MAX_RESULTS) && (key != NULL))
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups aborted (more than MAX_RESULTS)"),
+ 1, GNUNET_NO);
+ key = NULL; /* all replies seen! */
+ }
+ }
+ }
+ if (NULL == key)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG | GNUNET_ERROR_TYPE_BULK,
+ "No further local responses available.\n");
+#if INSANE_STATISTICS
+ if ((pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK) ||
+ (pr->public_data.type == GNUNET_BLOCK_TYPE_FS_IBLOCK))
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# requested DBLOCK or IBLOCK not found"), 1,
+ GNUNET_NO);
#endif
+ goto check_error_and_continue;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received reply for `%s' of type %d with UID %llu from datastore.\n",
+ GNUNET_h2s (key), type, (unsigned long long) uid);
if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Found ONDEMAND block, performing on-demand encoding\n");
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# on-demand blocks matched requests"), 1,
+ GNUNET_NO);
+ pr->qe_start = GNUNET_TIME_absolute_get ();
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &odc_warn_delay_task, pr);
+ if (GNUNET_OK ==
+ GNUNET_FS_handle_on_demand_block (key, size, data, type, priority,
+ anonymity, expiration, uid,
+ &process_local_reply, pr))
{
-#if DEBUG_FS > 1
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Found ONDEMAND block, performing on-demand encoding\n");
-#endif
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# on-demand blocks matched requests"),
- 1,
- GNUNET_NO);
- pr->qe_start = GNUNET_TIME_absolute_get ();
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &odc_warn_delay_task,
- pr);
- if (GNUNET_OK ==
- GNUNET_FS_handle_on_demand_block (key, size, data, type, priority,
- anonymity, expiration, uid,
- &process_local_reply,
- pr))
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# on-demand lookups performed successfully"),
- 1,
- GNUNET_NO);
- return; /* we're done */
- }
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# on-demand lookups failed"),
- 1,
- GNUNET_NO);
- GNUNET_SCHEDULER_cancel (pr->warn_task);
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_delay_task,
- pr);
- pr->qe = GNUNET_DATASTORE_get_key (GSF_dsh,
- pr->local_result_offset - 1,
- &pr->public_data.query,
- pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK
- ? GNUNET_BLOCK_TYPE_ANY
- : pr->public_data.type,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* queue priority */,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* max queue size */,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &process_local_reply,
- pr);
- if (NULL != pr->qe)
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (error queueing)"),
- 1,
- GNUNET_NO);
- return; /* we're done */
- }
- goto check_error_and_continue;
+ gettext_noop
+ ("# on-demand lookups performed successfully"),
+ 1, GNUNET_NO);
+ return; /* we're done */
}
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# on-demand lookups failed"), 1,
+ GNUNET_NO);
+ GNUNET_SCHEDULER_cancel (pr->warn_task);
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &warn_delay_task, pr);
+ pr->qe =
+ GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset - 1,
+ &pr->public_data.query,
+ pr->public_data.type ==
+ GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+ GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED &
+ pr->public_data.options)) ? UINT_MAX : 1
+ /* queue priority */ ,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED &
+ pr->public_data.options)) ? UINT_MAX :
+ GSF_datastore_queue_size
+ /* max queue size */ ,
+ &process_local_reply, pr);
+ if (NULL != pr->qe)
+ return; /* we're done */
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (error queueing)"),
+ 1, GNUNET_NO);
+ goto check_error_and_continue;
+ }
old_rf = pr->public_data.results_found;
memset (&prq, 0, sizeof (prq));
prq.data = data;
prq.expiration = expiration;
- prq.size = size;
- if (GNUNET_OK !=
- GNUNET_BLOCK_get_key (GSF_block_ctx,
- type,
- data,
- size,
- &query))
+ prq.size = size;
+ if (GNUNET_OK !=
+ GNUNET_BLOCK_get_key (GSF_block_ctx, type, data, size, &query))
+ {
+ GNUNET_break (0);
+ GNUNET_DATASTORE_remove (GSF_dsh, key, size, data, -1, -1,
+ NULL, NULL);
+ pr->qe_start = GNUNET_TIME_absolute_get ();
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &warn_delay_task, pr);
+ pr->qe =
+ GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset - 1,
+ &pr->public_data.query,
+ pr->public_data.type ==
+ GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+ GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED &
+ pr->public_data.options)) ? UINT_MAX : 1
+ /* queue priority */ ,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED &
+ pr->public_data.options)) ? UINT_MAX :
+ GSF_datastore_queue_size
+ /* max queue size */ ,
+ &process_local_reply, pr);
+ if (NULL == pr->qe)
{
- GNUNET_break (0);
- GNUNET_DATASTORE_remove (GSF_dsh,
- key,
- size, data,
- -1, -1,
- GNUNET_TIME_UNIT_FOREVER_REL,
- NULL, NULL);
- pr->qe_start = GNUNET_TIME_absolute_get ();
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_delay_task,
- pr);
- pr->qe = GNUNET_DATASTORE_get_key (GSF_dsh,
- pr->local_result_offset - 1,
- &pr->public_data.query,
- pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK
- ? GNUNET_BLOCK_TYPE_ANY
- : pr->public_data.type,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* queue priority */,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* max queue size */,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &process_local_reply,
- pr);
- if (pr->qe == NULL)
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (error queueing)"),
- 1,
- GNUNET_NO);
- goto check_error_and_continue;
- }
- return;
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (error queueing)"),
+ 1, GNUNET_NO);
+ goto check_error_and_continue;
}
+ return;
+ }
prq.type = type;
- prq.priority = priority;
+ prq.priority = priority;
prq.request_found = GNUNET_NO;
prq.anonymity_level = anonymity;
- if ( (old_rf == 0) &&
- (pr->public_data.results_found == 0) )
+ if ((0 == old_rf) && (0 == pr->public_data.results_found))
GSF_update_datastore_delay_ (pr->public_data.start_time);
+ prq.eo = GNUNET_BLOCK_EO_LOCAL_SKIP_CRYPTO;
process_reply (&prq, key, pr);
pr->local_result = prq.eval;
if (prq.eval == GNUNET_BLOCK_EVALUATION_OK_LAST)
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (found ultimate result)"),
- 1,
- GNUNET_NO);
- goto check_error_and_continue;
- }
- if ( (0 == (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options)) &&
- ( (GNUNET_YES == GSF_test_get_load_too_high_ (0)) ||
- (pr->public_data.results_found > 5 + 2 * pr->public_data.priority) ) )
- {
-#if DEBUG_FS > 2
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Load too high, done with request\n");
-#endif
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (load too high)"),
- 1,
- GNUNET_NO);
- goto check_error_and_continue;
- }
+ {
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (found last result)"),
+ 1,
+ GNUNET_NO);
+ goto check_error_and_continue;
+ }
+ if ((0 == (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options)) &&
+ ((GNUNET_YES == GSF_test_get_load_too_high_ (0)) ||
+ (pr->public_data.results_found > 5 + 2 * pr->public_data.priority)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Load too high, done with request\n");
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop ("# Datastore lookups concluded (load too high)"),
+ 1,
+ GNUNET_NO);
+ goto check_error_and_continue;
+ }
pr->qe_start = GNUNET_TIME_absolute_get ();
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_delay_task,
- pr);
- pr->qe = GNUNET_DATASTORE_get_key (GSF_dsh,
- pr->local_result_offset++,
- &pr->public_data.query,
- pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK
- ? GNUNET_BLOCK_TYPE_ANY
- : pr->public_data.type,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* queue priority */,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* max queue size */,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &process_local_reply,
- pr);
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &warn_delay_task,
+ pr);
+ pr->qe =
+ GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset++,
+ &pr->public_data.query,
+ pr->public_data.type ==
+ GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+ GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED & pr->
+ public_data.options)) ? UINT_MAX : 1
+ /* queue priority */ ,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED & pr->
+ public_data.options)) ? UINT_MAX :
+ GSF_datastore_queue_size
+ /* max queue size */ ,
+ &process_local_reply, pr);
/* check if we successfully queued another datastore request;
- if so, return, otherwise call our continuation (if we have
- any) */
- check_error_and_continue:
+ * if so, return, otherwise call our continuation (if we have
+ * any) */
+check_error_and_continue:
if (NULL != pr->qe)
return;
- if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
- {
- GNUNET_SCHEDULER_cancel (pr->warn_task);
- pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
- }
+ if (NULL != pr->warn_task)
+ {
+ GNUNET_SCHEDULER_cancel (pr->warn_task);
+ pr->warn_task = NULL;
+ }
if (NULL == (cont = pr->llc_cont))
- return; /* no continuation */
+ return; /* no continuation */
pr->llc_cont = NULL;
- cont (pr->llc_cont_cls,
- pr,
- pr->local_result);
+ if (0 != (GSF_PRO_LOCAL_ONLY & pr->public_data.options))
+ {
+ if (GNUNET_BLOCK_EVALUATION_OK_LAST != pr->local_result)
+ {
+ /* Signal that we are done and that there won't be any
+ additional results to allow client to clean up state. */
+ pr->rh (pr->rh_cls,
+ GNUNET_BLOCK_EVALUATION_OK_LAST,
+ pr,
+ UINT32_MAX,
+ GNUNET_TIME_UNIT_ZERO_ABS,
+ GNUNET_TIME_UNIT_FOREVER_ABS,
+ GNUNET_BLOCK_TYPE_ANY,
+ NULL, 0);
+ }
+ /* Finally, call our continuation to signal that we are
+ done with local processing of this request; i.e. to
+ start reading again from the client. */
+ cont (pr->llc_cont_cls, NULL, GNUNET_BLOCK_EVALUATION_OK_LAST);
+ return;
+ }
+
+ cont (pr->llc_cont_cls, pr, pr->local_result);
+}
+
+
+/**
+ * Is the given target a legitimate peer for forwarding the given request?
+ *
+ * @param pr request
+ * @param target
+ * @return #GNUNET_YES if this request could be forwarded to the given peer
+ */
+int
+GSF_pending_request_test_target_ (struct GSF_PendingRequest *pr,
+ const struct GNUNET_PeerIdentity *target)
+{
+ struct GNUNET_PeerIdentity pi;
+
+ if (0 == pr->origin_pid)
+ return GNUNET_YES;
+ GNUNET_PEER_resolve (pr->origin_pid, &pi);
+ return (0 ==
+ memcmp (&pi, target,
+ sizeof (struct GNUNET_PeerIdentity))) ? GNUNET_NO :
+ GNUNET_YES;
}
*
* @param pr the pending request to process
* @param cont function to call at the end
- * @param cont_cls closure for cont
+ * @param cont_cls closure for @a cont
*/
void
GSF_local_lookup_ (struct GSF_PendingRequest *pr,
- GSF_LocalLookupContinuation cont,
- void *cont_cls)
+ GSF_LocalLookupContinuation cont,
+ void *cont_cls)
{
GNUNET_assert (NULL == pr->gh);
+ GNUNET_assert (NULL == pr->cadet_request);
GNUNET_assert (NULL == pr->llc_cont);
pr->llc_cont = cont;
pr->llc_cont_cls = cont_cls;
pr->qe_start = GNUNET_TIME_absolute_get ();
- pr->warn_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
- &warn_delay_task,
- pr);
+ pr->warn_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_MINUTES,
+ &warn_delay_task,
+ pr);
+#if INSANE_STATISTICS
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups initiated"),
- 1,
- GNUNET_NO);
- pr->qe = GNUNET_DATASTORE_get_key (GSF_dsh,
- pr->local_result_offset++,
- &pr->public_data.query,
- pr->public_data.type == GNUNET_BLOCK_TYPE_FS_DBLOCK
- ? GNUNET_BLOCK_TYPE_ANY
- : pr->public_data.type,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* queue priority */,
- (0 != (GSF_PRO_PRIORITY_UNLIMITED & pr->public_data.options))
- ? UINT_MAX
- : 1 /* max queue size */,
- GNUNET_TIME_UNIT_FOREVER_REL,
- &process_local_reply,
- pr);
+ gettext_noop ("# Datastore lookups initiated"), 1,
+ GNUNET_NO);
+#endif
+ pr->qe =
+ GNUNET_DATASTORE_get_key (GSF_dsh, pr->local_result_offset++,
+ &pr->public_data.query,
+ pr->public_data.type ==
+ GNUNET_BLOCK_TYPE_FS_DBLOCK ?
+ GNUNET_BLOCK_TYPE_ANY : pr->public_data.type,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED & pr->
+ public_data.options)) ? UINT_MAX : 1
+ /* queue priority */ ,
+ (0 !=
+ (GSF_PRO_PRIORITY_UNLIMITED & pr->
+ public_data.options)) ? UINT_MAX :
+ GSF_datastore_queue_size
+ /* max queue size */ ,
+ &process_local_reply, pr);
if (NULL != pr->qe)
- {
- GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Datastore lookups concluded (error queueing)"),
- 1,
- GNUNET_NO);
-
- return;
- }
+ return;
+ GNUNET_STATISTICS_update (GSF_stats,
+ gettext_noop
+ ("# Datastore lookups concluded (error queueing)"),
+ 1, GNUNET_NO);
GNUNET_SCHEDULER_cancel (pr->warn_task);
- pr->warn_task = GNUNET_SCHEDULER_NO_TASK;
+ pr->warn_task = NULL;
pr->llc_cont = NULL;
if (NULL != cont)
- cont (cont_cls, pr, pr->local_result);
+ cont (cont_cls, pr, pr->local_result);
}
* this content and possibly passes it on (to local clients or other
* peers). Does NOT perform migration (content caching at this peer).
*
- * @param cp the other peer involved (sender or receiver, NULL
- * for loopback messages where we are both sender and receiver)
- * @param message the actual message
- * @return GNUNET_OK if the message was well-formed,
- * GNUNET_SYSERR if the message was malformed (close connection,
- * do not cache under any circumstances)
+ * @param cls the other peer involved
+ * @param put the actual message
*/
-int
-GSF_handle_p2p_content_ (struct GSF_ConnectedPeer *cp,
- const struct GNUNET_MessageHeader *message)
+void
+handle_p2p_put (void *cls,
+ const struct PutMessage *put)
{
- const struct PutMessage *put;
+ struct GSF_ConnectedPeer *cp = cls;
uint16_t msize;
size_t dsize;
enum GNUNET_BLOCK_Type type;
struct GNUNET_TIME_Absolute expiration;
- GNUNET_HashCode query;
+ struct GNUNET_HashCode query;
struct ProcessReplyClosure prq;
- struct GNUNET_TIME_Relative block_time;
+ struct GNUNET_TIME_Relative block_time;
double putl;
struct PutMigrationContext *pmc;
- msize = ntohs (message->size);
- if (msize < sizeof (struct PutMessage))
- {
- GNUNET_break_op(0);
- return GNUNET_SYSERR;
- }
- put = (const struct PutMessage*) message;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received P2P PUT from %s\n",
+ GNUNET_i2s (GSF_get_peer_performance_data_ (cp)->peer));
+ GSF_cover_content_count++;
+ msize = ntohs (put->header.size);
dsize = msize - sizeof (struct PutMessage);
type = ntohl (put->type);
expiration = GNUNET_TIME_absolute_ntoh (put->expiration);
- if (type == GNUNET_BLOCK_TYPE_FS_ONDEMAND)
- return GNUNET_SYSERR;
+ /* do not allow migrated content to live longer than 1 year */
+ expiration = GNUNET_TIME_absolute_min (GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_YEARS),
+ expiration);
if (GNUNET_OK !=
GNUNET_BLOCK_get_key (GSF_block_ctx,
- type,
- &put[1],
- dsize,
- &query))
- {
- GNUNET_break_op (0);
- return GNUNET_SYSERR;
- }
+ type,
+ &put[1],
+ dsize,
+ &query))
+ {
+ GNUNET_break_op (0);
+ return;
+ }
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# GAP PUT messages received"),
- 1,
- GNUNET_NO);
+ gettext_noop ("# GAP PUT messages received"),
+ 1,
+ GNUNET_NO);
/* now, lookup 'query' */
- prq.data = (const void*) &put[1];
- if (NULL != cp)
- prq.sender = cp;
- else
- prq.sender = NULL;
+ prq.data = (const void *) &put[1];
+ prq.sender = cp;
prq.size = dsize;
prq.type = type;
prq.expiration = expiration;
prq.priority = 0;
prq.anonymity_level = UINT32_MAX;
prq.request_found = GNUNET_NO;
+ prq.eo = GNUNET_BLOCK_EO_NONE;
GNUNET_CONTAINER_multihashmap_get_multiple (pr_map,
- &query,
- &process_reply,
- &prq);
+ &query,
+ &process_reply,
+ &prq);
if (NULL != cp)
+ {
+ GSF_connected_peer_change_preference_ (cp,
+ CONTENT_BANDWIDTH_VALUE +
+ 1000 * prq.priority);
+ GSF_get_peer_performance_data_ (cp)->respect += prq.priority;
+ }
+ if ((GNUNET_YES == active_to_migration) &&
+ (NULL != cp) &&
+ (GNUNET_NO == test_put_load_too_high (prq.priority)))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Replicating result for query `%s' with priority %u\n",
+ GNUNET_h2s (&query),
+ prq.priority);
+ pmc = GNUNET_new (struct PutMigrationContext);
+ pmc->start = GNUNET_TIME_absolute_get ();
+ pmc->requested = prq.request_found;
+ GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid);
+ GNUNET_PEER_resolve (GSF_get_peer_performance_data_ (cp)->pid,
+ &pmc->origin);
+ if (NULL ==
+ GNUNET_DATASTORE_put (GSF_dsh,
+ 0,
+ &query,
+ dsize,
+ &put[1],
+ type,
+ prq.priority,
+ 1 /* anonymity */ ,
+ 0 /* replication */ ,
+ expiration, 1 + prq.priority,
+ MAX_DATASTORE_QUEUE,
+ &put_migration_continuation,
+ pmc))
{
- GSF_connected_peer_change_preference_ (cp, CONTENT_BANDWIDTH_VALUE + 1000 * prq.priority);
- GSF_get_peer_performance_data_ (cp)->trust += prq.priority;
- }
- if ( (GNUNET_YES == active_to_migration) &&
- (GNUNET_NO == test_put_load_too_high (prq.priority)) )
- {
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Replicating result for query `%s' with priority %u\n",
- GNUNET_h2s (&query),
- prq.priority);
-#endif
- pmc = GNUNET_malloc (sizeof (struct PutMigrationContext));
- pmc->start = GNUNET_TIME_absolute_get ();
- pmc->requested = prq.request_found;
- GNUNET_assert (0 != GSF_get_peer_performance_data_ (cp)->pid);
- GNUNET_PEER_resolve (GSF_get_peer_performance_data_ (cp)->pid,
- &pmc->origin);
- if (NULL ==
- GNUNET_DATASTORE_put (GSF_dsh,
- 0, &query, dsize, &put[1],
- type, prq.priority, 1 /* anonymity */,
- 0 /* replication */,
- expiration,
- 1 + prq.priority, MAX_DATASTORE_QUEUE,
- GNUNET_CONSTANTS_SERVICE_TIMEOUT,
- &put_migration_continuation,
- pmc))
- {
- put_migration_continuation (pmc, GNUNET_NO, NULL);
- }
- }
- else
- {
-#if DEBUG_FS
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Choosing not to keep content `%s' (%d/%d)\n",
- GNUNET_h2s (&query),
- active_to_migration,
- test_put_load_too_high (prq.priority));
-#endif
+ put_migration_continuation (pmc,
+ GNUNET_SYSERR,
+ GNUNET_TIME_UNIT_ZERO_ABS,
+ NULL);
}
+ }
+ else if (NULL != cp)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Choosing not to keep content `%s' (%d/%d)\n",
+ GNUNET_h2s (&query),
+ active_to_migration,
+ test_put_load_too_high (prq.priority));
+ }
putl = GNUNET_LOAD_get_load (datastore_put_load);
- if ( (NULL != (cp = prq.sender)) &&
+ if ( (NULL != cp) &&
(GNUNET_NO == prq.request_found) &&
( (GNUNET_YES != active_to_migration) ||
- (putl > 2.5 * (1 + prq.priority)) ) )
- {
- if (GNUNET_YES != active_to_migration)
- putl = 1.0 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5);
- block_time = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
- 5000 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK,
- (unsigned int) (60000 * putl * putl)));
- GSF_block_peer_migration_ (cp, block_time);
- }
- return GNUNET_OK;
+ (putl > 2.5 * (1 + prq.priority)) ) )
+ {
+ if (GNUNET_YES != active_to_migration)
+ putl = 1.0 + GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_WEAK, 5);
+ block_time =
+ GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ 5000 +
+ GNUNET_CRYPTO_random_u32
+ (GNUNET_CRYPTO_QUALITY_WEAK,
+ (unsigned int) (60000 * putl * putl)));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Asking to stop migration for %s because of load %f and events %d/%d\n",
+ GNUNET_STRINGS_relative_time_to_string (block_time,
+ GNUNET_YES),
+ putl,
+ active_to_migration,
+ (GNUNET_NO == prq.request_found));
+ GSF_block_peer_migration_ (cp,
+ GNUNET_TIME_relative_to_absolute (block_time));
+ }
+}
+
+
+/**
+ * Check if the given request is still active.
+ *
+ * @param pr pending request
+ * @return #GNUNET_YES if the request is still active
+ */
+int
+GSF_pending_request_test_active_ (struct GSF_PendingRequest *pr)
+{
+ return (NULL != pr->rh) ? GNUNET_YES : GNUNET_NO;
}
GSF_pending_request_init_ ()
{
if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_number (GSF_cfg,
- "fs",
- "MAX_PENDING_REQUESTS",
- &max_pending_requests))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Configuration fails to specify `%s', assuming default value."),
- "MAX_PENDING_REQUESTS");
- }
- active_to_migration = GNUNET_CONFIGURATION_get_value_yesno (GSF_cfg,
- "FS",
- "CONTENT_CACHING");
+ GNUNET_CONFIGURATION_get_value_number (GSF_cfg, "fs",
+ "MAX_PENDING_REQUESTS",
+ &max_pending_requests))
+ {
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_INFO,
+ "fs", "MAX_PENDING_REQUESTS");
+ }
+ active_to_migration =
+ GNUNET_CONFIGURATION_get_value_yesno (GSF_cfg, "FS", "CONTENT_CACHING");
datastore_put_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE);
- pr_map = GNUNET_CONTAINER_multihashmap_create (32 * 1024);
- requests_by_expiration_heap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
+ pr_map = GNUNET_CONTAINER_multihashmap_create (32 * 1024, GNUNET_YES);
+ requests_by_expiration_heap =
+ GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
}
GSF_pending_request_done_ ()
{
GNUNET_CONTAINER_multihashmap_iterate (pr_map,
- &clean_request,
- NULL);
+ &clean_request,
+ NULL);
GNUNET_CONTAINER_multihashmap_destroy (pr_map);
pr_map = NULL;
GNUNET_CONTAINER_heap_destroy (requests_by_expiration_heap);
projects / oweals / gnunet.git / blobdiff