-more work on new GNS implementation

[oweals/gnunet.git] / src / gns / plugin_block_gns.c

diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 33699a32ce5c94883534416c3f3fc31962ccebf8..22e3d61fd46c789be880435e1b75457d541b1bbe 100644 (file)
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2010 Christian Grothoff (and other contributing authors)
+     (C) 2010-2013 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -26,8 +26,9 @@
 
 #include "platform.h"
 #include "gnunet_block_plugin.h"
-#include "block_gns.h"
+#include "gnunet_namestore_service.h"
 #include "gnunet_signatures.h"
+#include "gns_common.h"
 
 /**
  * Number of bits we set per entry in the bloomfilter.
@@ -45,27 +46,82 @@
  * @param cls closure
  * @param type block type
  * @param query original query (hash)
- * @param bf pointer to bloom filter associated with query; possibly updated (!)
- * @param bf_mutator mutation value for bf
- * @param xquery extrended query data (can be NULL, depending on type)
- * @param xquery_size number of bytes in xquery
+ * @param bf pointer to bloom filter associated with @a query; possibly updated (!)
+ * @param bf_mutator mutation value for @a bf
+ * @param xquery extrended query data (can be NULL, depending on @a type)
+ * @param xquery_size number of bytes in @a xquery
  * @param reply_block response to validate
- * @param reply_block_size number of bytes in reply block
+ * @param reply_block_size number of bytes in @a reply_block
  * @return characterization of result
  */
 static enum GNUNET_BLOCK_EvaluationResult
 block_plugin_gns_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)
 {
-  if (type != GNUNET_BLOCK_TYPE_GNS_RECORD)
+  const struct GNUNET_NAMESTORE_Block *block;
+  struct GNUNET_HashCode h;
+  struct GNUNET_HashCode chash;
+  struct GNUNET_HashCode mhash;
+
+  if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
     return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;
+  if (NULL == reply_block)
+  {
+    if (0 != xquery_size)
+    {
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_REQUEST_INVALID;
+    }
+    return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+  }
   
-  //FIXME check signatures here
-  return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
+  /* this is a reply */
+  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
+  block = reply_block;
+  if (ntohs (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EccSignature) + sizeof (struct GNUNET_CRYPTO_EccPublicKey) !=
+      reply_block_size)
+    {
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
+  GNUNET_CRYPTO_hash (&block->derived_key,
+                     sizeof (block->derived_key),
+                     &h);
+  if (0 != memcmp (&h, query, sizeof (struct GNUNET_HashCode)))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
+  if (GNUNET_OK != 
+      GNUNET_NAMESTORE_block_verify (block))
+    {
+      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;
+       }
+      else
+       {
+         *bf = GNUNET_CONTAINER_bloomfilter_init(NULL, 8, BLOOMFILTER_K);
+       }
+      GNUNET_CONTAINER_bloomfilter_add(*bf, &mhash);
+    }
+  return GNUNET_BLOCK_EVALUATION_OK_MORE;
 }
 
 
@@ -74,20 +130,30 @@ block_plugin_gns_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 reply_block block to get the key for
+ * @param reply_block_size number of bytes in @a reply_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
 block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
-                         const void *block, size_t block_size,
-                         GNUNET_HashCode * key)
+                         const void *reply_block, size_t reply_block_size,
+                         struct GNUNET_HashCode *key)
 {
-  if (type != GNUNET_BLOCK_TYPE_GNS_RECORD)
-    return GNUNET_NO;
-  //FIXME calculate key from name and hash(pkey) here
+  const struct GNUNET_NAMESTORE_Block *block;
+
+  if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
+    return GNUNET_SYSERR;
+  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+    {
+      GNUNET_break_op (0);
+      return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+    }
+  block = reply_block;
+  GNUNET_CRYPTO_hash (&block->derived_key,
+                     sizeof (block->derived_key),
+                     key);
   return GNUNET_OK;
 }
 
@@ -100,12 +166,12 @@ libgnunet_plugin_block_gns_init (void *cls)
 {
   static enum GNUNET_BLOCK_Type types[] =
   {
-    GNUNET_BLOCK_TYPE_GNS_RECORD,
+    GNUNET_BLOCK_TYPE_GNS_NAMERECORD,
     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_gns_evaluate;
   api->get_key = &block_plugin_gns_get_key;
   api->types = types;