diff options
Diffstat (limited to 'src/revocation/gnunet-service-revocation.c')
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 2965808fa..9d077f874 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "platform.h" | 38 | #include "platform.h" |
39 | #include <math.h> | 39 | #include <math.h> |
40 | #include "gnunet_util_lib.h" | 40 | #include "gnunet_util_lib.h" |
41 | #include "gnunet_block_lib.h" | ||
41 | #include "gnunet_constants.h" | 42 | #include "gnunet_constants.h" |
42 | #include "gnunet_protocols.h" | 43 | #include "gnunet_protocols.h" |
43 | #include "gnunet_signatures.h" | 44 | #include "gnunet_signatures.h" |
@@ -215,7 +216,7 @@ client_connect_cb (void *cls, | |||
215 | * @param client the new client | 216 | * @param client the new client |
216 | * @param app_cls must alias @a client | 217 | * @param app_cls must alias @a client |
217 | */ | 218 | */ |
218 | static void | 219 | static void |
219 | client_disconnect_cb (void *cls, | 220 | client_disconnect_cb (void *cls, |
220 | struct GNUNET_SERVICE_Client *client, | 221 | struct GNUNET_SERVICE_Client *client, |
221 | void *app_cls) | 222 | void *app_cls) |
@@ -352,7 +353,7 @@ publicize_rm (const struct RevokeMessage *rm) | |||
352 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 353 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
353 | /* add to set for future connections */ | 354 | /* add to set for future connections */ |
354 | e.size = htons (rm->header.size); | 355 | e.size = htons (rm->header.size); |
355 | e.element_type = 0; | 356 | e.element_type = GNUNET_BLOCK_TYPE_REVOCATION; |
356 | e.data = rm; | 357 | e.data = rm; |
357 | if (GNUNET_OK != | 358 | if (GNUNET_OK != |
358 | GNUNET_SET_add_element (revocation_set, | 359 | GNUNET_SET_add_element (revocation_set, |
@@ -432,11 +433,13 @@ handle_p2p_revoke (void *cls, | |||
432 | * | 433 | * |
433 | * @param cls closure | 434 | * @param cls closure |
434 | * @param element a result element, only valid if status is #GNUNET_SET_STATUS_OK | 435 | * @param element a result element, only valid if status is #GNUNET_SET_STATUS_OK |
436 | * @param current_size current set size | ||
435 | * @param status see `enum GNUNET_SET_Status` | 437 | * @param status see `enum GNUNET_SET_Status` |
436 | */ | 438 | */ |
437 | static void | 439 | static void |
438 | add_revocation (void *cls, | 440 | add_revocation (void *cls, |
439 | const struct GNUNET_SET_Element *element, | 441 | const struct GNUNET_SET_Element *element, |
442 | uint64_t current_size, | ||
440 | enum GNUNET_SET_Status status) | 443 | enum GNUNET_SET_Status status) |
441 | { | 444 | { |
442 | struct PeerEntry *peer_entry = cls; | 445 | struct PeerEntry *peer_entry = cls; |
@@ -450,11 +453,12 @@ add_revocation (void *cls, | |||
450 | GNUNET_break_op (0); | 453 | GNUNET_break_op (0); |
451 | return; | 454 | return; |
452 | } | 455 | } |
453 | if (0 != element->element_type) | 456 | if (GNUNET_BLOCK_TYPE_REVOCATION != element->element_type) |
454 | { | 457 | { |
455 | GNUNET_STATISTICS_update (stats, | 458 | GNUNET_STATISTICS_update (stats, |
456 | gettext_noop ("# unsupported revocations received via set union"), | 459 | gettext_noop ("# unsupported revocations received via set union"), |
457 | 1, GNUNET_NO); | 460 | 1, |
461 | GNUNET_NO); | ||
458 | return; | 462 | return; |
459 | } | 463 | } |
460 | rm = element->data; | 464 | rm = element->data; |
@@ -509,6 +513,7 @@ transmit_task_cb (void *cls) | |||
509 | &revocation_set_union_app_id, | 513 | &revocation_set_union_app_id, |
510 | NULL, | 514 | NULL, |
511 | GNUNET_SET_RESULT_ADDED, | 515 | GNUNET_SET_RESULT_ADDED, |
516 | (struct GNUNET_SET_Option[]) {{ 0 }}, | ||
512 | &add_revocation, | 517 | &add_revocation, |
513 | peer_entry); | 518 | peer_entry); |
514 | if (GNUNET_OK != | 519 | if (GNUNET_OK != |
@@ -601,12 +606,12 @@ handle_core_disconnect (void *cls, | |||
601 | void *internal_cls) | 606 | void *internal_cls) |
602 | { | 607 | { |
603 | struct PeerEntry *peer_entry = internal_cls; | 608 | struct PeerEntry *peer_entry = internal_cls; |
604 | 609 | ||
605 | if (0 == memcmp (peer, | 610 | if (0 == memcmp (peer, |
606 | &my_identity, | 611 | &my_identity, |
607 | sizeof (my_identity))) | 612 | sizeof (my_identity))) |
608 | return; | 613 | return; |
609 | GNUNET_assert (NULL != peer_entry); | 614 | GNUNET_assert (NULL != peer_entry); |
610 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 615 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
611 | "Peer `%s' disconnected from us\n", | 616 | "Peer `%s' disconnected from us\n", |
612 | GNUNET_i2s (peer)); | 617 | GNUNET_i2s (peer)); |
@@ -755,6 +760,7 @@ handle_revocation_union_request (void *cls, | |||
755 | } | 760 | } |
756 | peer_entry->so = GNUNET_SET_accept (request, | 761 | peer_entry->so = GNUNET_SET_accept (request, |
757 | GNUNET_SET_RESULT_ADDED, | 762 | GNUNET_SET_RESULT_ADDED, |
763 | (struct GNUNET_SET_Option[]) {{ 0 }}, | ||
758 | &add_revocation, | 764 | &add_revocation, |
759 | peer_entry); | 765 | peer_entry); |
760 | if (GNUNET_OK != | 766 | if (GNUNET_OK != |
@@ -779,7 +785,7 @@ handle_revocation_union_request (void *cls, | |||
779 | static void | 785 | static void |
780 | run (void *cls, | 786 | run (void *cls, |
781 | const struct GNUNET_CONFIGURATION_Handle *c, | 787 | const struct GNUNET_CONFIGURATION_Handle *c, |
782 | struct GNUNET_SERVICE_Handle *service) | 788 | struct GNUNET_SERVICE_Handle *service) |
783 | { | 789 | { |
784 | struct GNUNET_MQ_MessageHandler core_handlers[] = { | 790 | struct GNUNET_MQ_MessageHandler core_handlers[] = { |
785 | GNUNET_MQ_hd_fixed_size (p2p_revoke, | 791 | GNUNET_MQ_hd_fixed_size (p2p_revoke, |