diff options
Diffstat (limited to 'src/revocation/gnunet-service-revocation.c')
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 99bec1fc8..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, |
@@ -452,11 +453,12 @@ add_revocation (void *cls, | |||
452 | GNUNET_break_op (0); | 453 | GNUNET_break_op (0); |
453 | return; | 454 | return; |
454 | } | 455 | } |
455 | if (0 != element->element_type) | 456 | if (GNUNET_BLOCK_TYPE_REVOCATION != element->element_type) |
456 | { | 457 | { |
457 | GNUNET_STATISTICS_update (stats, | 458 | GNUNET_STATISTICS_update (stats, |
458 | gettext_noop ("# unsupported revocations received via set union"), | 459 | gettext_noop ("# unsupported revocations received via set union"), |
459 | 1, GNUNET_NO); | 460 | 1, |
461 | GNUNET_NO); | ||
460 | return; | 462 | return; |
461 | } | 463 | } |
462 | rm = element->data; | 464 | rm = element->data; |
@@ -604,12 +606,12 @@ handle_core_disconnect (void *cls, | |||
604 | void *internal_cls) | 606 | void *internal_cls) |
605 | { | 607 | { |
606 | struct PeerEntry *peer_entry = internal_cls; | 608 | struct PeerEntry *peer_entry = internal_cls; |
607 | 609 | ||
608 | if (0 == memcmp (peer, | 610 | if (0 == memcmp (peer, |
609 | &my_identity, | 611 | &my_identity, |
610 | sizeof (my_identity))) | 612 | sizeof (my_identity))) |
611 | return; | 613 | return; |
612 | GNUNET_assert (NULL != peer_entry); | 614 | GNUNET_assert (NULL != peer_entry); |
613 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 615 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
614 | "Peer `%s' disconnected from us\n", | 616 | "Peer `%s' disconnected from us\n", |
615 | GNUNET_i2s (peer)); | 617 | GNUNET_i2s (peer)); |
@@ -783,7 +785,7 @@ handle_revocation_union_request (void *cls, | |||
783 | static void | 785 | static void |
784 | run (void *cls, | 786 | run (void *cls, |
785 | const struct GNUNET_CONFIGURATION_Handle *c, | 787 | const struct GNUNET_CONFIGURATION_Handle *c, |
786 | struct GNUNET_SERVICE_Handle *service) | 788 | struct GNUNET_SERVICE_Handle *service) |
787 | { | 789 | { |
788 | struct GNUNET_MQ_MessageHandler core_handlers[] = { | 790 | struct GNUNET_MQ_MessageHandler core_handlers[] = { |
789 | GNUNET_MQ_hd_fixed_size (p2p_revoke, | 791 | GNUNET_MQ_hd_fixed_size (p2p_revoke, |