- handle cyclic IBFs and SEs correctly

3 files changed, 22 insertions, 10 deletions

diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 86624402a..a55c2188e 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -310,12 +310,14 @@ handle_client_disconnect (void *cls, struct GNUNET_SERVER_Client *client)
   {
     set->client = NULL;
     set_destroy (set);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(client's set destroyed)\n");
   }
   listener = listener_get (client);
   if (NULL != listener)
   {
     listener->client = NULL;
     listener_destroy (listener);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "(client's listener destroyed)\n");
   }
 }
 
@@ -908,9 +910,11 @@ dispatch_p2p_message (void *cls,
   struct TunnelContext *tc = *tunnel_ctx;
   int ret;
 
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dispatching mesh message\n");
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "dispatching mesh message (type: %u)\n",
+              ntohs (message->type));
   ret = tc->vt->msg_handler (tc->op, message);
   GNUNET_MESH_receive_done (tunnel);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "handled mesh message\n");
 
   return ret;
 }
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index 0c57d9414..8a183391e 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -745,7 +745,6 @@ handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
   struct StrataEstimator *remote_se;
   int diff;
 
-
   if (eo->phase != PHASE_EXPECT_SE)
   {
     fail_union_operation (eo);
@@ -756,8 +755,9 @@ handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
                                        SE_IBF_HASH_NUM);
   strata_estimator_read (&mh[1], remote_se);
   GNUNET_assert (NULL != eo->se);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got se, calculating diff\n");
   diff = strata_estimator_difference (remote_se, eo->se);
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "got se, diff=%d\n", diff);
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "se diff=%d\n", diff);
   strata_estimator_destroy (remote_se);
   strata_estimator_destroy (eo->se);
   eo->se = NULL;
@@ -800,7 +800,7 @@ send_element_iterator (void *cls,
       continue;
     }
     memcpy (&mh[1], element->data, element->size);
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element to client\n");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "sending element to peer\n");
     GNUNET_MQ_send (eo->mq, ev);
     ke = ke->next_colliding;
   }
@@ -837,6 +837,7 @@ decode_and_send (struct OperationState *eo)
 {
   struct IBF_Key key;
   int side;
+  unsigned int num_decoded;
   struct InvertibleBloomFilter *diff_ibf;
 
   GNUNET_assert (PHASE_EXPECT_ELEMENTS == eo->phase);
@@ -848,12 +849,18 @@ decode_and_send (struct OperationState *eo)
   ibf_destroy (eo->remote_ibf);
   eo->remote_ibf = NULL;
 
+  num_decoded = 0;
+
   while (1)
   {
     int res;
 
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "decoding IBF for elements\n");
     res = ibf_decode (diff_ibf, &side, &key);
-    if (GNUNET_SYSERR == res)
+    num_decoded += 1;
+    if (num_decoded > diff_ibf->size)
+      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "detected cyclic ibf\n");
+    if ((GNUNET_SYSERR == res) || (num_decoded > diff_ibf->size))
     {
       int next_order;
       next_order = 0;
diff --git a/src/set/strata_estimator.c b/src/set/strata_estimator.c
index 18c127cd6..543352331 100644
--- a/src/set/strata_estimator.c
+++ b/src/set/strata_estimator.c
@@ -109,25 +109,26 @@ strata_estimator_difference (const struct StrataEstimator *se1,
     struct InvertibleBloomFilter *diff;
     /* number of keys decoded from the ibf */
     int ibf_count;
-    int more;
-    ibf_count = 0;
     /* FIXME: implement this without always allocating new IBFs */
     diff = ibf_dup (se1->strata[i]);
     ibf_subtract (diff, se2->strata[i]);
-    for (;;)
+    for (ibf_count = 0; GNUNET_YES; ibf_count++)
     {
+      int more;
+
       more = ibf_decode (diff, NULL, NULL);
+      GNUNET_log (GNUNET_ERROR_TYPE_INFO, "decoding\n");
       if (GNUNET_NO == more)
       {
         count += ibf_count;
         break;
       }
-      if (GNUNET_SYSERR == more)
+      /* Estimate if decoding fails or would not terminate */
+      if ((GNUNET_SYSERR == more) || (ibf_count > diff->size))
       {
         ibf_destroy (diff);
         return count * (1 << (i + 1));
       }
-      ibf_count++;
     }
     ibf_destroy (diff);
   }