diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-30 00:46:58 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-30 00:46:58 +0000 |
commit | 3ff74fa1dac7f7b839930959962f4f1c843708bd (patch) | |
tree | 4f44e811fe269d0dce56a653b1c619295dcf707d /src/revocation/gnunet-service-revocation.c | |
parent | 2faa745b7bd47afc33d2619896a8928d1b70c6ed (diff) | |
download | gnunet-3ff74fa1dac7f7b839930959962f4f1c843708bd.tar.gz gnunet-3ff74fa1dac7f7b839930959962f4f1c843708bd.zip |
-fix ftbfs
Diffstat (limited to 'src/revocation/gnunet-service-revocation.c')
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 7ef5cbc81..8e5f554ed 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | (C) 2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2013, 2014 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public Licerevocation as published | 6 | it under the terms of the GNU General Public Licerevocation as published |
@@ -428,20 +428,21 @@ add_revocation (void *cls, | |||
428 | "# revocation messages received via set union", | 428 | "# revocation messages received via set union", |
429 | 1, GNUNET_NO); | 429 | 1, GNUNET_NO); |
430 | break; | 430 | break; |
431 | case GNUNET_SET_STATUS_TIMEOUT: | ||
432 | case GNUNET_SET_STATUS_FAILURE: | 431 | case GNUNET_SET_STATUS_FAILURE: |
433 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 432 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
434 | _("Error computing revocation set union with %s\n"), | 433 | _("Error computing revocation set union with %s\n"), |
435 | GNUNET_i2s (&peer_entry->id)); | 434 | GNUNET_i2s (&peer_entry->id)); |
436 | peer_entry->so = NULL; | 435 | peer_entry->so = NULL; |
437 | GNUNET_STATISTICS_update (stats, "# revocation set unions failed", | 436 | GNUNET_STATISTICS_update (stats, |
437 | "# revocation set unions failed", | ||
438 | 1, GNUNET_NO); | 438 | 1, GNUNET_NO); |
439 | break; | 439 | break; |
440 | case GNUNET_SET_STATUS_HALF_DONE: | 440 | case GNUNET_SET_STATUS_HALF_DONE: |
441 | break; | 441 | break; |
442 | case GNUNET_SET_STATUS_DONE: | 442 | case GNUNET_SET_STATUS_DONE: |
443 | peer_entry->so = NULL; | 443 | peer_entry->so = NULL; |
444 | GNUNET_STATISTICS_update (stats, "# revocation set unions completed", | 444 | GNUNET_STATISTICS_update (stats, |
445 | "# revocation set unions completed", | ||
445 | 1, GNUNET_NO); | 446 | 1, GNUNET_NO); |
446 | break; | 447 | break; |
447 | default: | 448 | default: |
@@ -801,11 +802,12 @@ run (void *cls, | |||
801 | } | 802 | } |
802 | revocation_set = GNUNET_SET_create (cfg, | 803 | revocation_set = GNUNET_SET_create (cfg, |
803 | GNUNET_SET_OPERATION_UNION); | 804 | GNUNET_SET_OPERATION_UNION); |
804 | revocation_union_listen_handle = GNUNET_SET_listen (cfg, | 805 | revocation_union_listen_handle |
805 | GNUNET_SET_OPERATION_UNION, | 806 | = GNUNET_SET_listen (cfg, |
806 | &revocation_set_union_app_id, | 807 | GNUNET_SET_OPERATION_UNION, |
807 | &handle_revocation_union_request, | 808 | &revocation_set_union_app_id, |
808 | NULL); | 809 | &handle_revocation_union_request, |
810 | NULL); | ||
809 | revocation_db = GNUNET_DISK_file_open (fn, | 811 | revocation_db = GNUNET_DISK_file_open (fn, |
810 | GNUNET_DISK_OPEN_READWRITE | | 812 | GNUNET_DISK_OPEN_READWRITE | |
811 | GNUNET_DISK_OPEN_CREATE, | 813 | GNUNET_DISK_OPEN_CREATE, |
@@ -892,7 +894,10 @@ main (int argc, | |||
892 | strlen ("revocation-set-union-application-id"), | 894 | strlen ("revocation-set-union-application-id"), |
893 | &revocation_set_union_app_id); | 895 | &revocation_set_union_app_id); |
894 | return (GNUNET_OK == | 896 | return (GNUNET_OK == |
895 | GNUNET_SERVICE_run (argc, argv, "revocation", GNUNET_SERVICE_OPTION_NONE, | 897 | GNUNET_SERVICE_run (argc, |
898 | argv, | ||
899 | "revocation", | ||
900 | GNUNET_SERVICE_OPTION_NONE, | ||
896 | &run, NULL)) ? 0 : 1; | 901 | &run, NULL)) ? 0 : 1; |
897 | } | 902 | } |
898 | 903 | ||
@@ -900,6 +905,7 @@ main (int argc, | |||
900 | #ifdef LINUX | 905 | #ifdef LINUX |
901 | #include <malloc.h> | 906 | #include <malloc.h> |
902 | 907 | ||
908 | |||
903 | /** | 909 | /** |
904 | * MINIMIZE heap size (way below 128k) since this process doesn't need much. | 910 | * MINIMIZE heap size (way below 128k) since this process doesn't need much. |
905 | */ | 911 | */ |
@@ -913,5 +919,4 @@ GNUNET_ARM_memory_init () | |||
913 | #endif | 919 | #endif |
914 | 920 | ||
915 | 921 | ||
916 | |||
917 | /* end of gnunet-service-revocation.c */ | 922 | /* end of gnunet-service-revocation.c */ |