diff options
Diffstat (limited to 'src/fs/gnunet-service-fs_lc.c')
-rw-r--r-- | src/fs/gnunet-service-fs_lc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/fs/gnunet-service-fs_lc.c b/src/fs/gnunet-service-fs_lc.c index 20d430e5a..f3b18256b 100644 --- a/src/fs/gnunet-service-fs_lc.c +++ b/src/fs/gnunet-service-fs_lc.c | |||
@@ -299,7 +299,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
299 | *message, | 299 | *message, |
300 | struct GSF_PendingRequest **prptr) | 300 | struct GSF_PendingRequest **prptr) |
301 | { | 301 | { |
302 | static GNUNET_HashCode all_zeros; | 302 | static struct GNUNET_HashCode all_zeros; |
303 | const struct SearchMessage *sm; | 303 | const struct SearchMessage *sm; |
304 | struct GSF_LocalClient *lc; | 304 | struct GSF_LocalClient *lc; |
305 | struct ClientRequest *cr; | 305 | struct ClientRequest *cr; |
@@ -311,7 +311,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
311 | 311 | ||
312 | msize = ntohs (message->size); | 312 | msize = ntohs (message->size); |
313 | if ((msize < sizeof (struct SearchMessage)) || | 313 | if ((msize < sizeof (struct SearchMessage)) || |
314 | (0 != (msize - sizeof (struct SearchMessage)) % sizeof (GNUNET_HashCode))) | 314 | (0 != (msize - sizeof (struct SearchMessage)) % sizeof (struct GNUNET_HashCode))) |
315 | { | 315 | { |
316 | GNUNET_break (0); | 316 | GNUNET_break (0); |
317 | *prptr = NULL; | 317 | *prptr = NULL; |
@@ -320,7 +320,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
320 | GNUNET_STATISTICS_update (GSF_stats, | 320 | GNUNET_STATISTICS_update (GSF_stats, |
321 | gettext_noop ("# client searches received"), 1, | 321 | gettext_noop ("# client searches received"), 1, |
322 | GNUNET_NO); | 322 | GNUNET_NO); |
323 | sc = (msize - sizeof (struct SearchMessage)) / sizeof (GNUNET_HashCode); | 323 | sc = (msize - sizeof (struct SearchMessage)) / sizeof (struct GNUNET_HashCode); |
324 | sm = (const struct SearchMessage *) message; | 324 | sm = (const struct SearchMessage *) message; |
325 | type = ntohl (sm->type); | 325 | type = ntohl (sm->type); |
326 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 326 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -340,7 +340,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
340 | (SEARCH_MESSAGE_OPTION_CONTINUED was always set) and that have a | 340 | (SEARCH_MESSAGE_OPTION_CONTINUED was always set) and that have a |
341 | matching query and type */ | 341 | matching query and type */ |
342 | if ((GNUNET_YES != prd->has_started) && | 342 | if ((GNUNET_YES != prd->has_started) && |
343 | (0 != memcmp (&prd->query, &sm->query, sizeof (GNUNET_HashCode))) && | 343 | (0 != memcmp (&prd->query, &sm->query, sizeof (struct GNUNET_HashCode))) && |
344 | (prd->type == type)) | 344 | (prd->type == type)) |
345 | break; | 345 | break; |
346 | cr = cr->next; | 346 | cr = cr->next; |
@@ -350,7 +350,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
350 | { | 350 | { |
351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 351 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
352 | "Have existing request, merging content-seen lists.\n"); | 352 | "Have existing request, merging content-seen lists.\n"); |
353 | GSF_pending_request_update_ (cr->pr, (const GNUNET_HashCode *) &sm[1], sc); | 353 | GSF_pending_request_update_ (cr->pr, (const struct GNUNET_HashCode *) &sm[1], sc); |
354 | GNUNET_STATISTICS_update (GSF_stats, | 354 | GNUNET_STATISTICS_update (GSF_stats, |
355 | gettext_noop | 355 | gettext_noop |
356 | ("# client searches updated (merged content seen list)"), | 356 | ("# client searches updated (merged content seen list)"), |
@@ -371,7 +371,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
371 | : NULL, | 371 | : NULL, |
372 | (0 != | 372 | (0 != |
373 | memcmp (&sm->target, &all_zeros, | 373 | memcmp (&sm->target, &all_zeros, |
374 | sizeof (GNUNET_HashCode))) | 374 | sizeof (struct GNUNET_HashCode))) |
375 | ? (const struct GNUNET_PeerIdentity *) | 375 | ? (const struct GNUNET_PeerIdentity *) |
376 | &sm->target : NULL, NULL, 0, | 376 | &sm->target : NULL, NULL, 0, |
377 | 0 /* bf */ , | 377 | 0 /* bf */ , |
@@ -380,7 +380,7 @@ GSF_local_client_start_search_handler_ (struct GNUNET_SERVER_Client *client, | |||
380 | 0 /* ttl */ , | 380 | 0 /* ttl */ , |
381 | 0 /* sender PID */ , | 381 | 0 /* sender PID */ , |
382 | 0 /* origin PID */ , | 382 | 0 /* origin PID */ , |
383 | (const GNUNET_HashCode *) &sm[1], sc, | 383 | (const struct GNUNET_HashCode *) &sm[1], sc, |
384 | &client_response_handler, cr); | 384 | &client_response_handler, cr); |
385 | } | 385 | } |
386 | *prptr = cr->pr; | 386 | *prptr = cr->pr; |