diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-15 21:54:06 +0000 |
commit | 5746309cb4be2073d550ad7a6885e918631dbc38 (patch) | |
tree | 89455bc4aadf977816b38df13f990372cd81d71a /src/fs/gnunet-service-fs.c | |
parent | 6fd3e715cae09fa6e657c96f1c6f9711ee51f42f (diff) | |
download | gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.tar.gz gnunet-5746309cb4be2073d550ad7a6885e918631dbc38.zip |
indentation
Diffstat (limited to 'src/fs/gnunet-service-fs.c')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index 4d12b8bfd..0457607d5 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -166,8 +166,9 @@ age_cover_counters (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
166 | { | 166 | { |
167 | GSF_cover_content_count = (GSF_cover_content_count * 15) / 16; | 167 | GSF_cover_content_count = (GSF_cover_content_count * 15) / 16; |
168 | GSF_cover_query_count = (GSF_cover_query_count * 15) / 16; | 168 | GSF_cover_query_count = (GSF_cover_query_count * 15) / 16; |
169 | cover_age_task = GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, | 169 | cover_age_task = |
170 | &age_cover_counters, NULL); | 170 | GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, &age_cover_counters, |
171 | NULL); | ||
171 | } | 172 | } |
172 | 173 | ||
173 | 174 | ||
@@ -223,8 +224,7 @@ GSF_test_get_load_too_high_ (uint32_t priority) | |||
223 | * GNUNET_SYSERR to close it (signal serious error) | 224 | * GNUNET_SYSERR to close it (signal serious error) |
224 | */ | 225 | */ |
225 | static int | 226 | static int |
226 | handle_p2p_put (void *cls, | 227 | handle_p2p_put (void *cls, const struct GNUNET_PeerIdentity *other, |
227 | const struct GNUNET_PeerIdentity *other, | ||
228 | const struct GNUNET_MessageHeader *message, | 228 | const struct GNUNET_MessageHeader *message, |
229 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 229 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
230 | { | 230 | { |
@@ -273,8 +273,7 @@ consider_request_for_forwarding (void *cls, | |||
273 | * @param result final datastore lookup result | 273 | * @param result final datastore lookup result |
274 | */ | 274 | */ |
275 | static void | 275 | static void |
276 | consider_forwarding (void *cls, | 276 | consider_forwarding (void *cls, struct GSF_PendingRequest *pr, |
277 | struct GSF_PendingRequest *pr, | ||
278 | enum GNUNET_BLOCK_EvaluationResult result) | 277 | enum GNUNET_BLOCK_EvaluationResult result) |
279 | { | 278 | { |
280 | if (GNUNET_BLOCK_EVALUATION_OK_LAST == result) | 279 | if (GNUNET_BLOCK_EVALUATION_OK_LAST == result) |
@@ -295,8 +294,7 @@ consider_forwarding (void *cls, | |||
295 | * GNUNET_SYSERR to close it (signal serious error) | 294 | * GNUNET_SYSERR to close it (signal serious error) |
296 | */ | 295 | */ |
297 | static int | 296 | static int |
298 | handle_p2p_get (void *cls, | 297 | handle_p2p_get (void *cls, const struct GNUNET_PeerIdentity *other, |
299 | const struct GNUNET_PeerIdentity *other, | ||
300 | const struct GNUNET_MessageHeader *message, | 298 | const struct GNUNET_MessageHeader *message, |
301 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 299 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
302 | { | 300 | { |
@@ -321,8 +319,7 @@ handle_p2p_get (void *cls, | |||
321 | * @param result final datastore lookup result | 319 | * @param result final datastore lookup result |
322 | */ | 320 | */ |
323 | static void | 321 | static void |
324 | start_p2p_processing (void *cls, | 322 | start_p2p_processing (void *cls, struct GSF_PendingRequest *pr, |
325 | struct GSF_PendingRequest *pr, | ||
326 | enum GNUNET_BLOCK_EvaluationResult result) | 323 | enum GNUNET_BLOCK_EvaluationResult result) |
327 | { | 324 | { |
328 | struct GNUNET_SERVER_Client *client = cls; | 325 | struct GNUNET_SERVER_Client *client = cls; |
@@ -355,8 +352,7 @@ start_p2p_processing (void *cls, | |||
355 | * @param message the actual message | 352 | * @param message the actual message |
356 | */ | 353 | */ |
357 | static void | 354 | static void |
358 | handle_start_search (void *cls, | 355 | handle_start_search (void *cls, struct GNUNET_SERVER_Client *client, |
359 | struct GNUNET_SERVER_Client *client, | ||
360 | const struct GNUNET_MessageHeader *message) | 356 | const struct GNUNET_MessageHeader *message) |
361 | { | 357 | { |
362 | struct GSF_PendingRequest *pr; | 358 | struct GSF_PendingRequest *pr; |
@@ -424,8 +420,7 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
424 | * @return GNUNET_YES to continue to iterate | 420 | * @return GNUNET_YES to continue to iterate |
425 | */ | 421 | */ |
426 | static int | 422 | static int |
427 | consider_peer_for_forwarding (void *cls, | 423 | consider_peer_for_forwarding (void *cls, const GNUNET_HashCode * key, |
428 | const GNUNET_HashCode * key, | ||
429 | struct GSF_PendingRequest *pr) | 424 | struct GSF_PendingRequest *pr) |
430 | { | 425 | { |
431 | struct GSF_ConnectedPeer *cp = cls; | 426 | struct GSF_ConnectedPeer *cp = cls; |
@@ -443,8 +438,7 @@ consider_peer_for_forwarding (void *cls, | |||
443 | * @param atsi performance information | 438 | * @param atsi performance information |
444 | */ | 439 | */ |
445 | static void | 440 | static void |
446 | peer_connect_handler (void *cls, | 441 | peer_connect_handler (void *cls, const struct GNUNET_PeerIdentity *peer, |
447 | const struct GNUNET_PeerIdentity *peer, | ||
448 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | 442 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) |
449 | { | 443 | { |
450 | struct GSF_ConnectedPeer *cp; | 444 | struct GSF_ConnectedPeer *cp; |
@@ -471,11 +465,10 @@ peer_connect_handler (void *cls, | |||
471 | * @param publicKey public key of this peer, NULL if we failed | 465 | * @param publicKey public key of this peer, NULL if we failed |
472 | */ | 466 | */ |
473 | static void | 467 | static void |
474 | peer_init_handler (void *cls, | 468 | peer_init_handler (void *cls, struct GNUNET_CORE_Handle *server, |
475 | struct GNUNET_CORE_Handle *server, | ||
476 | const struct GNUNET_PeerIdentity *my_identity, | 469 | const struct GNUNET_PeerIdentity *my_identity, |
477 | const struct | 470 | const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded |
478 | GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey) | 471 | *publicKey) |
479 | { | 472 | { |
480 | my_id = *my_identity; | 473 | my_id = *my_identity; |
481 | } | 474 | } |
@@ -515,12 +508,10 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
515 | }; | 508 | }; |
516 | 509 | ||
517 | GSF_core = GNUNET_CORE_connect (GSF_cfg, 2, /* larger? */ | 510 | GSF_core = GNUNET_CORE_connect (GSF_cfg, 2, /* larger? */ |
518 | NULL, | 511 | NULL, &peer_init_handler, |
519 | &peer_init_handler, | ||
520 | &peer_connect_handler, | 512 | &peer_connect_handler, |
521 | &GSF_peer_disconnect_handler_, | 513 | &GSF_peer_disconnect_handler_, |
522 | &GSF_peer_status_handler_, | 514 | &GSF_peer_status_handler_, NULL, GNUNET_NO, |
523 | NULL, GNUNET_NO, | ||
524 | NULL, GNUNET_NO, p2p_handlers); | 515 | NULL, GNUNET_NO, p2p_handlers); |
525 | if (NULL == GSF_core) | 516 | if (NULL == GSF_core) |
526 | { | 517 | { |
@@ -528,14 +519,15 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
528 | _("Failed to connect to `%s' service.\n"), "core"); | 519 | _("Failed to connect to `%s' service.\n"), "core"); |
529 | return GNUNET_SYSERR; | 520 | return GNUNET_SYSERR; |
530 | } | 521 | } |
531 | GNUNET_SERVER_disconnect_notify (server, | 522 | GNUNET_SERVER_disconnect_notify (server, &GSF_client_disconnect_handler_, |
532 | &GSF_client_disconnect_handler_, NULL); | 523 | NULL); |
533 | GNUNET_SERVER_add_handlers (server, handlers); | 524 | GNUNET_SERVER_add_handlers (server, handlers); |
534 | cover_age_task = GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, | 525 | cover_age_task = |
535 | &age_cover_counters, NULL); | 526 | GNUNET_SCHEDULER_add_delayed (COVER_AGE_FREQUENCY, &age_cover_counters, |
527 | NULL); | ||
536 | datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE); | 528 | datastore_get_load = GNUNET_LOAD_value_init (DATASTORE_LOAD_AUTODECLINE); |
537 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 529 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &shutdown_task, |
538 | &shutdown_task, NULL); | 530 | NULL); |
539 | return GNUNET_OK; | 531 | return GNUNET_OK; |
540 | } | 532 | } |
541 | 533 | ||
@@ -548,8 +540,7 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
548 | * @param cfg configuration to use | 540 | * @param cfg configuration to use |
549 | */ | 541 | */ |
550 | static void | 542 | static void |
551 | run (void *cls, | 543 | run (void *cls, struct GNUNET_SERVER_Handle *server, |
552 | struct GNUNET_SERVER_Handle *server, | ||
553 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 544 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
554 | { | 545 | { |
555 | GSF_cfg = cfg; | 546 | GSF_cfg = cfg; |
@@ -594,10 +585,8 @@ int | |||
594 | main (int argc, char *const *argv) | 585 | main (int argc, char *const *argv) |
595 | { | 586 | { |
596 | return (GNUNET_OK == | 587 | return (GNUNET_OK == |
597 | GNUNET_SERVICE_run (argc, | 588 | GNUNET_SERVICE_run (argc, argv, "fs", GNUNET_SERVICE_OPTION_NONE, |
598 | argv, | 589 | &run, NULL)) ? 0 : 1; |
599 | "fs", | ||
600 | GNUNET_SERVICE_OPTION_NONE, &run, NULL)) ? 0 : 1; | ||
601 | } | 590 | } |
602 | 591 | ||
603 | /* end of gnunet-service-fs.c */ | 592 | /* end of gnunet-service-fs.c */ |