diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_set_service.h | 3 | ||||
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 9 | ||||
-rw-r--r-- | src/testbed/gnunet-daemon-testbed-blacklist.c | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index a2999aebc..0c14aa945 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h | |||
@@ -530,6 +530,7 @@ GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, | |||
530 | GNUNET_SET_ElementIterator iter, | 530 | GNUNET_SET_ElementIterator iter, |
531 | void *iter_cls); | 531 | void *iter_cls); |
532 | 532 | ||
533 | |||
533 | /** | 534 | /** |
534 | * Stop iteration over all elements in the given set. Can only | 535 | * Stop iteration over all elements in the given set. Can only |
535 | * be called before the iteration has "naturally" completed its | 536 | * be called before the iteration has "naturally" completed its |
@@ -540,6 +541,7 @@ GNUNET_SET_iterate (struct GNUNET_SET_Handle *set, | |||
540 | void | 541 | void |
541 | GNUNET_SET_iterate_cancel (struct GNUNET_SET_Handle *set); | 542 | GNUNET_SET_iterate_cancel (struct GNUNET_SET_Handle *set); |
542 | 543 | ||
544 | |||
543 | /** | 545 | /** |
544 | * Create a copy of an element. The copy | 546 | * Create a copy of an element. The copy |
545 | * must be GNUNET_free-d by the caller. | 547 | * must be GNUNET_free-d by the caller. |
@@ -550,6 +552,7 @@ GNUNET_SET_iterate_cancel (struct GNUNET_SET_Handle *set); | |||
550 | struct GNUNET_SET_Element * | 552 | struct GNUNET_SET_Element * |
551 | GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element); | 553 | GNUNET_SET_element_dup (const struct GNUNET_SET_Element *element); |
552 | 554 | ||
555 | |||
553 | /** | 556 | /** |
554 | * Hash a set element. | 557 | * Hash a set element. |
555 | * | 558 | * |
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 8281e9a16..23f654141 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -759,7 +759,11 @@ handle_revocation_union_request (void *cls, | |||
759 | { | 759 | { |
760 | peer_entry = new_peer_entry (other_peer); | 760 | peer_entry = new_peer_entry (other_peer); |
761 | } | 761 | } |
762 | GNUNET_assert (NULL == peer_entry->so); | 762 | if (NULL != peer_entry->so) |
763 | { | ||
764 | GNUNET_break_op (0); | ||
765 | return; | ||
766 | } | ||
763 | peer_entry->so = GNUNET_SET_accept (request, | 767 | peer_entry->so = GNUNET_SET_accept (request, |
764 | GNUNET_SET_RESULT_ADDED, | 768 | GNUNET_SET_RESULT_ADDED, |
765 | (struct GNUNET_SET_Option[]) {{ 0 }}, | 769 | (struct GNUNET_SET_Option[]) {{ 0 }}, |
@@ -769,8 +773,7 @@ handle_revocation_union_request (void *cls, | |||
769 | GNUNET_SET_commit (peer_entry->so, | 773 | GNUNET_SET_commit (peer_entry->so, |
770 | revocation_set)) | 774 | revocation_set)) |
771 | { | 775 | { |
772 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 776 | GNUNET_break (0); |
773 | _("SET service crashed, terminating revocation service\n")); | ||
774 | GNUNET_SCHEDULER_shutdown (); | 777 | GNUNET_SCHEDULER_shutdown (); |
775 | return; | 778 | return; |
776 | } | 779 | } |
diff --git a/src/testbed/gnunet-daemon-testbed-blacklist.c b/src/testbed/gnunet-daemon-testbed-blacklist.c index f2f96ee09..3ebe20258 100644 --- a/src/testbed/gnunet-daemon-testbed-blacklist.c +++ b/src/testbed/gnunet-daemon-testbed-blacklist.c | |||
@@ -190,7 +190,8 @@ run (void *cls, | |||
190 | char *fname; | 190 | char *fname; |
191 | 191 | ||
192 | if (GNUNET_OK != | 192 | if (GNUNET_OK != |
193 | GNUNET_CONFIGURATION_get_value_filename (c, "PATHS", | 193 | GNUNET_CONFIGURATION_get_value_filename (c, |
194 | "PATHS", | ||
194 | "GNUNET_HOME", | 195 | "GNUNET_HOME", |
195 | &shome)) | 196 | &shome)) |
196 | { | 197 | { |
@@ -208,6 +209,7 @@ run (void *cls, | |||
208 | GNUNET_free (fname); | 209 | GNUNET_free (fname); |
209 | return; | 210 | return; |
210 | } | 211 | } |
212 | GNUNET_free (fname); | ||
211 | GNUNET_asprintf (&fname, | 213 | GNUNET_asprintf (&fname, |
212 | "%s/blacklist", | 214 | "%s/blacklist", |
213 | shome); | 215 | shome); |