diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_lc.c')
-rw-r--r-- | src/fs/gnunet-service-fs_lc.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c index 65dece707..502cef941 100644 --- a/src/fs/gnunet-service-fs_lc.c +++ b/src/fs/gnunet-service-fs_lc.c | |||
@@ -295,7 +295,7 @@ int | |||
295 | GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | 295 | GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, |
296 | const struct GNUNET_MessageHeader | 296 | const struct GNUNET_MessageHeader |
297 | *message, | 297 | *message, |
298 | struct GSF_PendingRequest **prptr) | 298 | struct GSF_PendingRequest **prptr) |
299 | { | 299 | { |
300 | static GNUNET_HashCode all_zeros; | 300 | static GNUNET_HashCode all_zeros; |
301 | const struct SearchMessage *sm; | 301 | const struct SearchMessage *sm; |
@@ -350,45 +350,45 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
350 | { | 350 | { |
351 | #if DEBUG_FS_CLIENT | 351 | #if DEBUG_FS_CLIENT |
352 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 352 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
353 | "Have existing request, merging content-seen lists.\n"); | 353 | "Have existing request, merging content-seen lists.\n"); |
354 | #endif | 354 | #endif |
355 | GSF_pending_request_update_ (cr->pr, (const GNUNET_HashCode *) &sm[1], | 355 | GSF_pending_request_update_ (cr->pr, (const GNUNET_HashCode *) &sm[1], sc); |
356 | sc); | ||
357 | GNUNET_STATISTICS_update (GSF_stats, | 356 | GNUNET_STATISTICS_update (GSF_stats, |
358 | gettext_noop | 357 | gettext_noop |
359 | ("# client searches updated (merged content seen list)"), | 358 | ("# client searches updated (merged content seen list)"), |
360 | 1, GNUNET_NO); | 359 | 1, GNUNET_NO); |
361 | } | 360 | } |
362 | else | 361 | else |
363 | { | 362 | { |
364 | GNUNET_STATISTICS_update (GSF_stats, | 363 | GNUNET_STATISTICS_update (GSF_stats, |
365 | gettext_noop ("# client searches active"), 1, | 364 | gettext_noop ("# client searches active"), 1, |
366 | GNUNET_NO); | 365 | GNUNET_NO); |
367 | cr = GNUNET_malloc (sizeof (struct ClientRequest)); | 366 | cr = GNUNET_malloc (sizeof (struct ClientRequest)); |
368 | cr->lc = lc; | 367 | cr->lc = lc; |
369 | GNUNET_CONTAINER_DLL_insert (lc->cr_head, lc->cr_tail, cr); | 368 | GNUNET_CONTAINER_DLL_insert (lc->cr_head, lc->cr_tail, cr); |
370 | options = GSF_PRO_LOCAL_REQUEST; | 369 | options = GSF_PRO_LOCAL_REQUEST; |
371 | if (0 != (SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY & ntohl (sm->options))) | 370 | if (0 != (SEARCH_MESSAGE_OPTION_LOOPBACK_ONLY & ntohl (sm->options))) |
372 | options |= GSF_PRO_LOCAL_ONLY; | 371 | options |= GSF_PRO_LOCAL_ONLY; |
373 | cr->pr = GSF_pending_request_create_ (options, type, &sm->query, | 372 | cr->pr = GSF_pending_request_create_ (options, type, &sm->query, (type == GNUNET_BLOCK_TYPE_FS_SBLOCK) ? &sm->target /* namespace */ |
374 | (type == GNUNET_BLOCK_TYPE_FS_SBLOCK) ? &sm->target /* namespace */ | 373 | : NULL, |
375 | : NULL, | 374 | (0 != |
376 | (0 != | 375 | memcmp (&sm->target, &all_zeros, |
377 | memcmp (&sm->target, &all_zeros, | 376 | sizeof (GNUNET_HashCode))) |
378 | sizeof (GNUNET_HashCode))) | 377 | ? (const struct GNUNET_PeerIdentity *) |
379 | ? (const struct GNUNET_PeerIdentity *) | 378 | &sm->target : NULL, NULL, 0, |
380 | &sm->target : NULL, NULL, 0, | 379 | 0 /* bf */ , |
381 | 0 /* bf */ , | 380 | ntohl (sm->anonymity_level), |
382 | ntohl (sm->anonymity_level), | 381 | 0 /* priority */ , |
383 | 0 /* priority */ , | 382 | 0 /* ttl */ , |
384 | 0 /* ttl */ , | 383 | 0 /* sender PID */ , |
385 | 0 /* sender PID */ , | 384 | 0 /* origin PID */ , |
386 | 0 /* origin PID */ , | 385 | (const GNUNET_HashCode *) &sm[1], sc, |
387 | (const GNUNET_HashCode *) &sm[1], sc, | 386 | &client_response_handler, cr); |
388 | &client_response_handler, cr); | ||
389 | } | 387 | } |
390 | *prptr = cr->pr; | 388 | *prptr = cr->pr; |
391 | return (0 != (SEARCH_MESSAGE_OPTION_CONTINUED & ntohl (sm->options))) ? GNUNET_NO : GNUNET_YES; | 389 | return (0 != |
390 | (SEARCH_MESSAGE_OPTION_CONTINUED & ntohl (sm->options))) ? GNUNET_NO : | ||
391 | GNUNET_YES; | ||
392 | } | 392 | } |
393 | 393 | ||
394 | 394 | ||