diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_pr.c')
-rw-r--r-- | src/fs/gnunet-service-fs_pr.c | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c index 76e04f57c..2ab4771b5 100644 --- a/src/fs/gnunet-service-fs_pr.c +++ b/src/fs/gnunet-service-fs_pr.c | |||
@@ -268,7 +268,6 @@ refresh_bloomfilter (struct GSF_PendingRequest *pr) | |||
268 | * @param options request options | 268 | * @param options request options |
269 | * @param type type of the block that is being requested | 269 | * @param type type of the block that is being requested |
270 | * @param query key for the lookup | 270 | * @param query key for the lookup |
271 | * @param namespace namespace to lookup, NULL for no namespace | ||
272 | * @param target preferred target for the request, NULL for none | 271 | * @param target preferred target for the request, NULL for none |
273 | * @param bf_data raw data for bloom filter for known replies, can be NULL | 272 | * @param bf_data raw data for bloom filter for known replies, can be NULL |
274 | * @param bf_size number of bytes in bf_data | 273 | * @param bf_size number of bytes in bf_data |
@@ -288,7 +287,6 @@ struct GSF_PendingRequest * | |||
288 | GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | 287 | GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, |
289 | enum GNUNET_BLOCK_Type type, | 288 | enum GNUNET_BLOCK_Type type, |
290 | const struct GNUNET_HashCode *query, | 289 | const struct GNUNET_HashCode *query, |
291 | const struct GNUNET_HashCode *namespace, | ||
292 | const struct GNUNET_PeerIdentity *target, | 290 | const struct GNUNET_PeerIdentity *target, |
293 | const char *bf_data, size_t bf_size, | 291 | const char *bf_data, size_t bf_size, |
294 | uint32_t mingle, uint32_t anonymity_level, | 292 | uint32_t mingle, uint32_t anonymity_level, |
@@ -313,8 +311,6 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
313 | GNUNET_NO); | 311 | GNUNET_NO); |
314 | #endif | 312 | #endif |
315 | extra = 0; | 313 | extra = 0; |
316 | if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type) | ||
317 | extra += sizeof (struct GNUNET_HashCode); | ||
318 | if (NULL != target) | 314 | if (NULL != target) |
319 | extra += sizeof (struct GNUNET_PeerIdentity); | 315 | extra += sizeof (struct GNUNET_PeerIdentity); |
320 | pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest) + extra); | 316 | pr = GNUNET_malloc (sizeof (struct GSF_PendingRequest) + extra); |
@@ -322,13 +318,6 @@ GSF_pending_request_create_ (enum GSF_PendingRequestOptions options, | |||
322 | GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX); | 318 | GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX); |
323 | pr->public_data.query = *query; | 319 | pr->public_data.query = *query; |
324 | eptr = (struct GNUNET_HashCode *) &pr[1]; | 320 | eptr = (struct GNUNET_HashCode *) &pr[1]; |
325 | if (GNUNET_BLOCK_TYPE_FS_SBLOCK == type) | ||
326 | { | ||
327 | GNUNET_assert (NULL != namespace); | ||
328 | pr->public_data.namespace = eptr; | ||
329 | memcpy (eptr, namespace, sizeof (struct GNUNET_HashCode)); | ||
330 | eptr++; | ||
331 | } | ||
332 | if (NULL != target) | 321 | if (NULL != target) |
333 | { | 322 | { |
334 | pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr; | 323 | pr->public_data.target = (struct GNUNET_PeerIdentity *) eptr; |
@@ -435,12 +424,7 @@ GSF_pending_request_is_compatible_ (struct GSF_PendingRequest *pra, | |||
435 | if ((pra->public_data.type != prb->public_data.type) || | 424 | if ((pra->public_data.type != prb->public_data.type) || |
436 | (0 != | 425 | (0 != |
437 | memcmp (&pra->public_data.query, &prb->public_data.query, | 426 | memcmp (&pra->public_data.query, &prb->public_data.query, |
438 | sizeof (struct GNUNET_HashCode))) || | 427 | sizeof (struct GNUNET_HashCode)))) |
439 | ((pra->public_data.type == GNUNET_BLOCK_TYPE_FS_SBLOCK) && | ||
440 | (0 != | ||
441 | memcmp (pra->public_data.namespace, | ||
442 | prb->public_data.namespace, | ||
443 | sizeof (struct GNUNET_HashCode))))) | ||
444 | return GNUNET_NO; | 428 | return GNUNET_NO; |
445 | return GNUNET_OK; | 429 | return GNUNET_OK; |
446 | } | 430 | } |
@@ -546,11 +530,6 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr, | |||
546 | bm |= GET_MESSAGE_BIT_RETURN_TO; | 530 | bm |= GET_MESSAGE_BIT_RETURN_TO; |
547 | k++; | 531 | k++; |
548 | } | 532 | } |
549 | if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type) | ||
550 | { | ||
551 | bm |= GET_MESSAGE_BIT_SKS_NAMESPACE; | ||
552 | k++; | ||
553 | } | ||
554 | if (NULL != pr->public_data.target) | 533 | if (NULL != pr->public_data.target) |
555 | { | 534 | { |
556 | bm |= GET_MESSAGE_BIT_TRANSMIT_TO; | 535 | bm |= GET_MESSAGE_BIT_TRANSMIT_TO; |
@@ -586,8 +565,6 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr, | |||
586 | if (!do_route) | 565 | if (!do_route) |
587 | GNUNET_PEER_resolve (pr->sender_pid, | 566 | GNUNET_PEER_resolve (pr->sender_pid, |
588 | (struct GNUNET_PeerIdentity *) &ext[k++]); | 567 | (struct GNUNET_PeerIdentity *) &ext[k++]); |
589 | if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type) | ||
590 | memcpy (&ext[k++], pr->public_data.namespace, sizeof (struct GNUNET_HashCode)); | ||
591 | if (NULL != pr->public_data.target) | 568 | if (NULL != pr->public_data.target) |
592 | memcpy (&ext[k++], | 569 | memcpy (&ext[k++], |
593 | pr->public_data.target, | 570 | pr->public_data.target, |
@@ -836,10 +813,7 @@ process_reply (void *cls, const struct GNUNET_HashCode * key, void *value) | |||
836 | GNUNET_NO); | 813 | GNUNET_NO); |
837 | prq->eval = | 814 | prq->eval = |
838 | GNUNET_BLOCK_evaluate (GSF_block_ctx, prq->type, key, &pr->bf, pr->mingle, | 815 | GNUNET_BLOCK_evaluate (GSF_block_ctx, prq->type, key, &pr->bf, pr->mingle, |
839 | pr->public_data.namespace, | 816 | NULL, 0, prq->data, |
840 | (prq->type == | ||
841 | GNUNET_BLOCK_TYPE_FS_SBLOCK) ? | ||
842 | sizeof (struct GNUNET_HashCode) : 0, prq->data, | ||
843 | prq->size); | 817 | prq->size); |
844 | switch (prq->eval) | 818 | switch (prq->eval) |
845 | { | 819 | { |
@@ -1140,12 +1114,6 @@ GSF_dht_lookup_ (struct GSF_PendingRequest *pr) | |||
1140 | } | 1114 | } |
1141 | xquery = NULL; | 1115 | xquery = NULL; |
1142 | xquery_size = 0; | 1116 | xquery_size = 0; |
1143 | if (GNUNET_BLOCK_TYPE_FS_SBLOCK == pr->public_data.type) | ||
1144 | { | ||
1145 | xquery = buf; | ||
1146 | memcpy (buf, pr->public_data.namespace, sizeof (struct GNUNET_HashCode)); | ||
1147 | xquery_size = sizeof (struct GNUNET_HashCode); | ||
1148 | } | ||
1149 | if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY)) | 1117 | if (0 != (pr->public_data.options & GSF_PRO_FORWARD_ONLY)) |
1150 | { | 1118 | { |
1151 | GNUNET_assert (0 != pr->sender_pid); | 1119 | GNUNET_assert (0 != pr->sender_pid); |