- improved debug messages, added break_op for malformed block

diff --git a/src/mesh/gnunet-service-mesh_new.c b/src/mesh/gnunet-service-mesh_new.c
index 52485dcddf068ee82cab4475f004b2be35867b1b..23d462e22797469134a85e4f127cb5bea0ab81e2 100644 (file)
--- a/src/mesh/gnunet-service-mesh_new.c
+++ b/src/mesh/gnunet-service-mesh_new.c
@@ -740,8 +740,11 @@ regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
                 "  regex dht put for state %s\n",
                 GNUNET_h2s(key));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "  proof: %s\n",
+                "   proof: %s\n",
                 proof);
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "   num edges: %u\n",
+                num_edges);
 
     opt = GNUNET_DHT_RO_DEMULTIPLEX_EVERYWHERE;
     if (GNUNET_YES == accepting)
@@ -749,7 +752,7 @@ regex_iterator (void *cls, const struct GNUNET_HashCode *key, const char *proof,
         struct MeshRegexAccept block;
 
         GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                    "  state %s is accepting, putting own id\n",
+                    "   state %s is accepting, putting own id\n",
                     GNUNET_h2s(key));
         size = sizeof (block);
         block.key = *key;

diff --git a/src/mesh/plugin_block_mesh.c b/src/mesh/plugin_block_mesh.c
index 1a530cdc0780cb88bf1e54468e87174b0250bc7d..8c080c48514797cfa375cf766788d3f469999ddb 100644 (file)
--- a/src/mesh/plugin_block_mesh.c
+++ b/src/mesh/plugin_block_mesh.c
@@ -87,20 +87,23 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
     }
     if (NULL == reply_block)
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
-    if (sizeof (struct PBlock) != reply_block_size)  
-      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;  
+    if (sizeof (struct PBlock) != reply_block_size)
+    {
+      GNUNET_break_op(0);
+      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
     if (NULL != bf)
     {
       GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
       GNUNET_BLOCK_mingle_hash (&chash, bf_mutator, &mhash);
       if (NULL != *bf)
       {
-       if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
-         return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+        if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
+          return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
       }
       else
       {
-       *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
+        *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
       }
       GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
     }
@@ -115,7 +118,10 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
     if (GNUNET_OK != GNUNET_MESH_regex_block_check (reply_block,
                                                     reply_block_size))
+    {
+      GNUNET_break_op(0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
     if (NULL != bf)
     {
       GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);
@@ -140,8 +146,11 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
     }
     if (NULL == reply_block)
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
-    if (sizeof (struct MeshRegexAccept) != reply_block_size)  
+    if (sizeof (struct MeshRegexAccept) != reply_block_size)
+    {
+      GNUNET_break_op(0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
     if (NULL != bf)
     {
       GNUNET_CRYPTO_hash (reply_block, reply_block_size, &chash);