[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r22497 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r22497 - gnunet/src/mesh |
Date: |
Thu, 5 Jul 2012 15:55:50 +0200 |
Author: bartpolot
Date: 2012-07-05 15:55:50 +0200 (Thu, 05 Jul 2012)
New Revision: 22497
Modified:
gnunet/src/mesh/gnunet-service-mesh_new.c
gnunet/src/mesh/plugin_block_mesh.c
Log:
- improved debug messages, added break_op for malformed block
Modified: gnunet/src/mesh/gnunet-service-mesh_new.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_new.c 2012-07-05 13:54:59 UTC (rev
22496)
+++ gnunet/src/mesh/gnunet-service-mesh_new.c 2012-07-05 13:55:50 UTC (rev
22497)
@@ -740,8 +740,11 @@
" 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 @@
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;
Modified: gnunet/src/mesh/plugin_block_mesh.c
===================================================================
--- gnunet/src/mesh/plugin_block_mesh.c 2012-07-05 13:54:59 UTC (rev 22496)
+++ gnunet/src/mesh/plugin_block_mesh.c 2012-07-05 13:55:50 UTC (rev 22497)
@@ -87,20 +87,23 @@
}
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 @@
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 @@
}
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);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r22497 - gnunet/src/mesh,
gnunet <=