-fix

[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 77e7c0ab961b18f433fe2bc1dc77c5f71ac86828..1675fdb1c0bdbdb7a69b648a26be80e14f2e9004 100644 (file)
--- a/src/block/plugin_block_template.c
+++ b/src/block/plugin_block_template.c
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_block_plugin.h"
 
-#define DEBUG_TEMPLATE GNUNET_NO
+#define DEBUG_TEMPLATE GNUNET_EXTRA_LOGGING
 
 
 /**
@@ -46,16 +46,34 @@
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
-block_plugin_template_evaluate (void *cls,
-                         enum GNUNET_BLOCK_Type type,
-                         const 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)
+block_plugin_template_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
+                                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;
 }
 
@@ -72,15 +90,13 @@ block_plugin_template_evaluate (void *cls,
  *         (or if extracting a key from a block of this type does not work)
  */
 static int
-block_plugin_template_get_key (void *cls,
-                        enum GNUNET_BLOCK_Type type,
-                        const void *block,
-                        size_t block_size,
-                        GNUNET_HashCode *key)
+block_plugin_template_get_key (void *cls, enum GNUNET_BLOCK_Type type,
+                               const void *block, size_t block_size,
+                              struct GNUNET_HashCode * key)
 {
   return GNUNET_SYSERR;
 }
-                                 
+
 
 /**
  * Entry point for the plugin.
@@ -88,11 +104,11 @@ block_plugin_template_get_key (void *cls,
 void *
 libgnunet_plugin_block_template_init (void *cls)
 {
-  static enum GNUNET_BLOCK_Type types[] = 
-    {
-      /* FIXME: insert supported block types here */
-      GNUNET_BLOCK_TYPE_ANY /* end of list */
-    };
+  static enum GNUNET_BLOCK_Type types[] =
+  {
+    /* FIXME: insert supported block types here */
+    GNUNET_BLOCK_TYPE_ANY       /* end of list */
+  };
   struct GNUNET_BLOCK_PluginFunctions *api;
 
   api = GNUNET_malloc (sizeof (struct GNUNET_BLOCK_PluginFunctions));