[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27710 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27710 - gnunet/src/mesh |
Date: |
Mon, 1 Jul 2013 20:11:20 +0200 |
Author: bartpolot
Date: 2013-07-01 20:11:19 +0200 (Mon, 01 Jul 2013)
New Revision: 27710
Modified:
gnunet/src/mesh/plugin_block_mesh.c
Log:
- remove dead code
Modified: gnunet/src/mesh/plugin_block_mesh.c
===================================================================
--- gnunet/src/mesh/plugin_block_mesh.c 2013-07-01 18:09:05 UTC (rev 27709)
+++ gnunet/src/mesh/plugin_block_mesh.c 2013-07-01 18:11:19 UTC (rev 27710)
@@ -74,41 +74,8 @@
}
if (NULL == reply_block)
return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
- if (sizeof (struct PBlock) != reply_block_size)
- 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;
- }
- else
- {
- *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
- }
- GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
- }
-
- return GNUNET_BLOCK_EVALUATION_OK_LAST;
-
-
- case GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE:
- /* FIXME: have an xquery? not sure */
- if (0 != xquery_size)
- {
- GNUNET_break_op (0);
- return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
- }
- if (NULL == reply_block)
- return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
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);
@@ -124,9 +91,10 @@
}
GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
}
- return GNUNET_BLOCK_EVALUATION_OK_MORE;
+ return GNUNET_BLOCK_EVALUATION_OK_LAST;
default:
+ GNUNET_break(0);
return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
}
}
@@ -174,7 +142,6 @@
static enum GNUNET_BLOCK_Type types[] =
{
GNUNET_BLOCK_TYPE_MESH_PEER,
- GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE,
GNUNET_BLOCK_TYPE_ANY /* end of list */
};
struct GNUNET_BLOCK_PluginFunctions *api;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27710 - gnunet/src/mesh,
gnunet <=