diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2017-12-02 22:34:21 +0100 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2017-12-02 22:34:21 +0100 |
commit | b16fa2d88aabb18f222b40136d6ace68ffc104c6 (patch) | |
tree | 6d46f086f018b6e6c169a8d8312b5990c33c3561 /src/revocation/gnunet-service-revocation.c | |
parent | a9a7ac802811e76e33b54040bf31f00ea9438cea (diff) | |
parent | 862e488e08ca71db56dedd59059c5bb1a8c130a5 (diff) | |
download | gnunet-b16fa2d88aabb18f222b40136d6ace68ffc104c6.tar.gz gnunet-b16fa2d88aabb18f222b40136d6ace68ffc104c6.zip |
Merge remote-tracking branch 'origin/master' into identity_abe
Diffstat (limited to 'src/revocation/gnunet-service-revocation.c')
-rw-r--r-- | src/revocation/gnunet-service-revocation.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/revocation/gnunet-service-revocation.c b/src/revocation/gnunet-service-revocation.c index 9d077f874..8281e9a16 100644 --- a/src/revocation/gnunet-service-revocation.c +++ b/src/revocation/gnunet-service-revocation.c | |||
@@ -509,6 +509,7 @@ transmit_task_cb (void *cls) | |||
509 | "Starting set exchange with peer `%s'\n", | 509 | "Starting set exchange with peer `%s'\n", |
510 | GNUNET_i2s (&peer_entry->id)); | 510 | GNUNET_i2s (&peer_entry->id)); |
511 | peer_entry->transmit_task = NULL; | 511 | peer_entry->transmit_task = NULL; |
512 | GNUNET_assert (NULL == peer_entry->so); | ||
512 | peer_entry->so = GNUNET_SET_prepare (&peer_entry->id, | 513 | peer_entry->so = GNUNET_SET_prepare (&peer_entry->id, |
513 | &revocation_set_union_app_id, | 514 | &revocation_set_union_app_id, |
514 | NULL, | 515 | NULL, |
@@ -758,6 +759,7 @@ handle_revocation_union_request (void *cls, | |||
758 | { | 759 | { |
759 | peer_entry = new_peer_entry (other_peer); | 760 | peer_entry = new_peer_entry (other_peer); |
760 | } | 761 | } |
762 | GNUNET_assert (NULL == peer_entry->so); | ||
761 | peer_entry->so = GNUNET_SET_accept (request, | 763 | peer_entry->so = GNUNET_SET_accept (request, |
762 | GNUNET_SET_RESULT_ADDED, | 764 | GNUNET_SET_RESULT_ADDED, |
763 | (struct GNUNET_SET_Option[]) {{ 0 }}, | 765 | (struct GNUNET_SET_Option[]) {{ 0 }}, |