-consensus fixes

2 files changed, 5 insertions, 3 deletions

diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 8a6bfa448..644f975b6 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -873,8 +873,9 @@ decode_and_send (struct OperationState *eo)
       last_key = key;
 
     res = ibf_decode (diff_ibf, &side, &key);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoded ibf key %lx\n",
-                key.key_val);
+    if (res == GNUNET_OK)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoded ibf key %lx\n",
+                  key.key_val);
     num_decoded += 1;
     if (num_decoded > diff_ibf->size || (num_decoded > 1 && last_key.key_val == key.key_val))
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "detected cyclic ibf (decoded %u/%u)\n",
diff --git a/src/set/set_api.c b/src/set/set_api.c
index c2e88e65f..b2e62cb4d 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -564,8 +564,9 @@ GNUNET_SET_listen (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh)
 {
-  GNUNET_CLIENT_disconnect (lh->client);
+  LOG (GNUNET_ERROR_TYPE_DEBUG, "canceling listener\n");
   GNUNET_MQ_destroy (lh->mq);
+  GNUNET_CLIENT_disconnect (lh->client);
   GNUNET_free (lh);
 }