*/
enum GSF_PendingRequestOptions
{
+
+ /**
+ * No special options (P2P-default).
+ */
+ GSF_PRO_DEFAULTS = 0,
+
/**
* Request must only be processed locally.
*/
/**
* Request persists indefinitely (no expiration).
*/
- GSF_PRO_REQUEST_EXPIRES = 4,
+ GSF_PRO_REQUEST_NEVER_EXPIRES = 4,
/**
* Request is allowed to refresh bloomfilter and change mingle value.
* Option mask for typical local requests.
*/
GSF_PRO_LOCAL_REQUEST =
- (GSF_PRO_BLOOMFILTER_FULL_REFRESH | GSF_PRO_PRIORITY_UNLIMITED)
+ (GSF_PRO_BLOOMFILTER_FULL_REFRESH | GSF_PRO_PRIORITY_UNLIMITED | GSF_PRO_REQUEST_NEVER_EXPIRES)
};
/**
* Primary query hash for this request.
*/
- GNUNET_HashCode query;
+ struct GNUNET_HashCode query;
/**
* Namespace to query, only set if the type is SBLOCK.
+ * Allocated after struct only if needed. Do not free!
*/
- GNUNET_HashCode namespace;
+ const struct GNUNET_HashCode *namespace;
/**
- * Identity of a peer hosting the content, only set if
- * 'has_target' is GNUNET_YES.
+ * Identity of a peer hosting the content, otherwise NULl.
+ * Allocated after struct only if needed. Do not free!
*/
- struct GNUNET_PeerIdentity target;
+ const struct GNUNET_PeerIdentity *target;
/**
* Fields for the plan module to track a DLL with the request.
*/
- struct GSF_RequestPlanReference *rpr_head;
+ struct GSF_PendingRequestPlanBijection *pr_head;
/**
* Fields for the plan module to track a DLL with the request.
*/
- struct GSF_RequestPlanReference *rpr_tail;
+ struct GSF_PendingRequestPlanBijection *pr_tail;
/**
* Current TTL for the request.
*/
uint32_t original_priority;
+ /**
+ * Counter for how often this request has been transmitted (estimate,
+ * because we might have the same request pending for multiple clients,
+ * and of course because a transmission may have failed at a lower
+ * layer).
+ */
+ uint32_t num_transmissions;
+
+ /**
+ * How much respect did we (in total) offer for this request so far (estimate,
+ * because we might have the same request pending for multiple clients,
+ * and of course because a transmission may have failed at a lower
+ * layer).
+ */
+ uint32_t respect_offered;
+
/**
* Options for the request.
*/
unsigned int results_found;
/**
- * Is the 'target' value set to a valid peer identity?
+ * Has this request been started yet (local/p2p operations)? Or are
+ * we still constructing it?
*/
- int has_target;
+ int has_started;
};
* @param pr handle to the original pending request
* @param reply_anonymity_level anonymity level for the reply, UINT32_MAX for "unknown"
* @param expiration when does 'data' expire?
+ * @param last_transmission the last time we've tried to get this block (FOREVER if unknown)
* @param type type of the block
* @param data response data, NULL on request expiration
* @param data_len number of bytes in data
uint32_t reply_anonymity_level,
struct GNUNET_TIME_Absolute
expiration,
+ struct GNUNET_TIME_Absolute
+ last_transmission,
enum GNUNET_BLOCK_Type type,
const void *data,
size_t data_len);
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_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,
uint32_t priority, int32_t ttl,
GNUNET_PEER_Id sender_pid,
GNUNET_PEER_Id origin_pid,
- const GNUNET_HashCode * replies_seen,
+ const struct GNUNET_HashCode * replies_seen,
unsigned int replies_seen_count,
GSF_PendingRequestReplyHandler rh, void *rh_cls);
*/
void
GSF_pending_request_update_ (struct GSF_PendingRequest *pr,
- const GNUNET_HashCode * replies_seen,
+ const struct GNUNET_HashCode * replies_seen,
unsigned int replies_seen_count);
* @return GNUNET_YES to continue to iterate
*/
typedef int (*GSF_PendingRequestIterator) (void *cls,
- const GNUNET_HashCode * key,
+ const struct GNUNET_HashCode * key,
struct GSF_PendingRequest * pr);
GSF_dht_lookup_ (struct GSF_PendingRequest *pr);
+/**
+ * Consider downloading via stream (if possible)
+ *
+ * @param pr the pending request to process
+ */
+void
+GSF_stream_lookup_ (struct GSF_PendingRequest *pr);
+
+
/**
* Function to be called after we're done processing
* replies from the local lookup.