#include "gnunet-service-fs_indexing.h"
#include "gnunet-service-fs_pe.h"
#include "gnunet-service-fs_pr.h"
-#include "gnunet-service-fs_stream.h"
+#include "gnunet-service-fs_mesh.h"
/**
*/
#define INSANE_STATISTICS GNUNET_NO
+/**
+ * If obtaining a block via mesh fails, how often do we retry it before
+ * giving up for good (and sticking to non-anonymous transfer)?
+ */
+#define MESH_RETRY_MAX 3
+
+
/**
* An active request.
*/
struct GNUNET_DHT_GetHandle *gh;
/**
- * Stream request handle for this request (or NULL for none).
+ * Mesh request handle for this request (or NULL for none).
*/
- struct GSF_StreamRequest *stream_request;
+ struct GSF_MeshRequest *mesh_request;
/**
* Function to call upon completion of the local get
*/
uint64_t first_uid;
+ /**
+ * How often have we retried this request via 'mesh'?
+ * (used to bound overall retries).
+ */
+ unsigned int mesh_retry_count;
+
/**
* Number of valid entries in the 'replies_seen' array.
*/
* @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
GSF_pending_request_create_ (enum GSF_PendingRequestOptions options,
enum GNUNET_BLOCK_Type type,
const struct GNUNET_HashCode *query,
- const struct GNUNET_HashCode *namespace,
const struct GNUNET_PeerIdentity *target,
const char *bf_data, size_t bf_size,
uint32_t mingle, uint32_t anonymity_level,
GNUNET_NO);
#endif
extra = 0;
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type)
- extra += sizeof (struct GNUNET_HashCode);
if (NULL != target)
extra += sizeof (struct GNUNET_PeerIdentity);
pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest) + extra);
GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
pr->public_data.query = *query;
eptr = (struct GNUNET_HashCode *) &pr[1];
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type)
- {
- GNUNET_assert (NULL != namespace);
- pr->public_data.namespace = eptr;
- memcpy (eptr, namespace, sizeof (struct GNUNET_HashCode));
- eptr++;
- }
if (NULL != target)
{
pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr;
if ((pra->public_data.type != prb->public_data.type) ||
(0 !=
memcmp (&pra->public_data.query, &prb->public_data.query,
- sizeof (struct GNUNET_HashCode))) ||
- ((pra->public_data.type == GNUNET_BLOCK_TYPE_FS_SBLOCK) &&
- (0 !=
- memcmp (pra->public_data.namespace,
- prb->public_data.namespace,
- sizeof (struct GNUNET_HashCode)))))
+ sizeof (struct GNUNET_HashCode))))
return GNUNET_NO;
return GNUNET_OK;
}
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 (NULL != pr->public_data.target)
{
bm |= GET_MESSAGE_BIT_TRANSMIT_TO;
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 (struct GNUNET_HashCode));
if (NULL != pr->public_data.target)
memcpy (&ext[k++],
pr->public_data.target,
GNUNET_DHT_get_stop (pr->gh);
pr->gh = NULL;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
{
- GSF_stream_query_cancel (pr->stream_request);
- pr->stream_request = NULL;
+ GSF_mesh_query_cancel (pr->mesh_request);
+ pr->mesh_request = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
{
GNUNET_DHT_get_stop (pr->gh);
pr->gh = NULL;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
{
- GSF_stream_query_cancel (pr->stream_request);
- pr->stream_request = NULL;
+ GSF_mesh_query_cancel (pr->mesh_request);
+ pr->mesh_request = NULL;
}
if (GNUNET_SCHEDULER_NO_TASK != pr->warn_task)
{
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 (struct GNUNET_HashCode) : 0, prq->data,
+ NULL, 0, prq->data,
prq->size);
switch (prq->eval)
{
}
xquery = NULL;
xquery_size = 0;
- if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type)
- {
- xquery = buf;
- memcpy (buf, pr->public_data.namespace, sizeof (struct GNUNET_HashCode));
- xquery_size = sizeof (struct GNUNET_HashCode);
- }
if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY))
{
GNUNET_assert (0 != pr->sender_pid);
/**
- * Function called with a reply from the stream.
+ * Function called with a reply from the mesh.
*
* @param cls the pending request struct
* @param type type of the block, ANY on error
* @param data reply block data, NULL on error
*/
static void
-stream_reply_proc (void *cls,
+mesh_reply_proc (void *cls,
enum GNUNET_BLOCK_Type type,
struct GNUNET_TIME_Absolute expiration,
size_t data_size,
struct ProcessReplyClosure prq;
struct GNUNET_HashCode query;
- pr->stream_request = NULL;
+ pr->mesh_request = NULL;
if (GNUNET_BLOCK_TYPE_ANY == type)
{
GNUNET_break (NULL == data);
GNUNET_break (0 == data_size);
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Error retrieiving block via stream\n");
- /* FIXME: should re-try a few times... */
+ "Error retrieiving block via mesh\n");
+ pr->mesh_retry_count++;
+ if (pr->mesh_retry_count >= MESH_RETRY_MAX)
+ return; /* give up on mesh */
+ /* retry -- without delay, as this is non-anonymous
+ and mesh/mesh connect will take some time anyway */
+ pr->mesh_request = GSF_mesh_query (pr->public_data.target,
+ &pr->public_data.query,
+ pr->public_data.type,
+ &mesh_reply_proc,
+ pr);
return;
}
if (GNUNET_YES !=
return;
}
GNUNET_STATISTICS_update (GSF_stats,
- gettext_noop ("# Replies received from STREAM"), 1,
+ gettext_noop ("# Replies received from MESH"), 1,
GNUNET_NO);
memset (&prq, 0, sizeof (prq));
prq.data = data;
/**
- * Consider downloading via stream (if possible)
+ * Consider downloading via mesh (if possible)
*
* @param pr the pending request to process
*/
void
-GSF_stream_lookup_ (struct GSF_PendingRequest *pr)
+GSF_mesh_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 stream-based download, target peer not known\n");
+ "Cannot do mesh-based download, target peer not known\n");
return;
}
- if (NULL != pr->stream_request)
+ if (NULL != pr->mesh_request)
return;
- pr->stream_request = GSF_stream_query (pr->public_data.target,
- &pr->public_data.query,
- pr->public_data.type,
- &stream_reply_proc,
- pr);
+ pr->mesh_request = GSF_mesh_query (pr->public_data.target,
+ &pr->public_data.query,
+ pr->public_data.type,
+ &mesh_reply_proc,
+ pr);
}
GSF_LocalLookupContinuation cont, void *cont_cls)
{
GNUNET_assert (NULL == pr->gh);
- GNUNET_assert (NULL == pr->stream_request);
+ GNUNET_assert (NULL == pr->mesh_request);
GNUNET_assert (NULL == pr->llc_cont);
pr->llc_cont = cont;
pr->llc_cont_cls = cont_cls;