- begin work on enhanced multipart receiving

[oweals/gnunet.git] / src / mesh / plugin_block_mesh.c

diff --git a/src/mesh/plugin_block_mesh.c b/src/mesh/plugin_block_mesh.c
index 3d99201f7877c2e6bfc91bc85e538d99eba1ce21..ae832488531293d9a2fca132de81de7f2b065e24 100644 (file)
--- a/src/mesh/plugin_block_mesh.c
+++ b/src/mesh/plugin_block_mesh.c
@@ -67,36 +67,6 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
   switch (type)
   {
     case GNUNET_BLOCK_TYPE_MESH_PEER:
-      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)  
-        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);
@@ -105,10 +75,7 @@ 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)
-      {
-        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 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
         }
         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;
   }
 }
@@ -138,9 +106,9 @@ block_plugin_mesh_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
  * @param cls closure
  * @param type block type
  * @param block block to get the key for
- * @param block_size number of bytes in block
+ * @param block_size number of bytes in @a block
  * @param key set to the key (query) for the given block
- * @return GNUNET_OK on success, GNUNET_SYSERR if type not supported
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR if type not supported
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
@@ -149,7 +117,6 @@ block_plugin_mesh_get_key (void *cls, enum GNUNET_BLOCK_Type type,
                            struct GNUNET_HashCode * key)
 {
   const struct PBlock *pb;
-  GNUNET_MESH_ApplicationType app_type;
   pb = block;
 
   switch (type)
@@ -157,11 +124,9 @@ block_plugin_mesh_get_key (void *cls, enum GNUNET_BLOCK_Type type,
   case GNUNET_BLOCK_TYPE_MESH_PEER:
     if (sizeof (struct PBlock) != block_size)
       return GNUNET_SYSERR;
-    *key = pb->id.hashPubKey;
-    return GNUNET_OK;
-  case GNUNET_BLOCK_TYPE_MESH_PEER_BY_TYPE:
-    app_type = ntohl (pb->type);
-    GNUNET_CRYPTO_hash (&app_type, sizeof(GNUNET_MESH_ApplicationType), key);
+    GNUNET_CRYPTO_hash (&pb->id,
+                       sizeof (struct GNUNET_PeerIdentity),
+                       key);
     return GNUNET_OK;
   default:
     GNUNET_break (0);
@@ -179,12 +144,11 @@ libgnunet_plugin_block_mesh_init (void *cls)
   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;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_mesh_evaluate;
   api->get_key = &block_plugin_mesh_get_key;
   api->types = types;