-must notify client on timeout

[oweals/gnunet.git] / src / block / plugin_block_template.c

diff --git a/src/block/plugin_block_template.c b/src/block/plugin_block_template.c
index 6ed675dc9a6624bfaf3f3b86fe555aeb3e78a968..18809b1b18acc5acad5408d54cef19544ef6382d 100644 (file)
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -47,12 +47,33 @@
  */
 static enum GNUNET_BLOCK_EvaluationResult
 block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
-                                const GNUNET_HashCode * query,
+                                const struct GNUNET_HashCode * query,
                                 struct GNUNET_CONTAINER_BloomFilter **bf,
                                 int32_t bf_mutator, const void *xquery,
                                 size_t xquery_size, const void *reply_block,
                                 size_t reply_block_size)
 {
+  struct GNUNET_HashCode chash;
+  struct GNUNET_HashCode mhash;
+  /* FIXME: check validity first... */
+
+  /* mandatory duplicate-detection code... */
+  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, 64 /* BLOOMFILTER_K */);
+    }
+    GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
+  }
+  /* FIXME: other stuff here... */
   return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
 }
 
@@ -71,7 +92,7 @@ block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
 static int
 block_plugin_template_get_key (void *cls, enum GNUNET_BLOCK_Type type,
                                const void *block, size_t block_size,
-                               GNUNET_HashCode * key)
+                              struct GNUNET_HashCode * key)
 {
   return GNUNET_SYSERR;
 }
@@ -90,7 +111,7 @@ libgnunet_plugin_block_template_init (void *cls)
   };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
-  api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));
+  api = GNUNET_new (struct GNUNET_BLOCK_PluginFunctions);
   api->evaluate = &block_plugin_template_evaluate;
   api->get_key = &block_plugin_template_get_key;
   api->types = types;