-indentation, code cleanup

[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 22e3d61fd46c789be880435e1b75457d541b1bbe..65cf69f722bc4945317ad4cc874d82400120a759 100644 (file)
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -28,7 +28,6 @@
 #include "gnunet_block_plugin.h"
 #include "gnunet_namestore_service.h"
 #include "gnunet_signatures.h"
-#include "gns_common.h"
 
 /**
  * Number of bits we set per entry in the bloomfilter.
@@ -62,7 +61,7 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
                           size_t xquery_size, const void *reply_block,
                           size_t reply_block_size)
 {
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
   struct GNUNET_HashCode h;
   struct GNUNET_HashCode chash;
   struct GNUNET_HashCode mhash;
@@ -78,15 +77,15 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
     }
     return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
   }
-  
+
   /* this is a reply */
-  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_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) !=
+  if (ntohl (block->purpose.size) + sizeof (struct GNUNET_CRYPTO_EcdsaSignature) + sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) !=
       reply_block_size)
     {
       GNUNET_break_op (0);
@@ -100,8 +99,8 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
-  if (GNUNET_OK != 
-      GNUNET_NAMESTORE_block_verify (block))
+  if (GNUNET_OK !=
+      GNUNET_GNSRECORD_block_verify (block))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
@@ -141,11 +140,11 @@ block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
                          const void *reply_block, size_t reply_block_size,
                          struct GNUNET_HashCode *key)
 {
-  const struct GNUNET_NAMESTORE_Block *block;
+  const struct GNUNET_GNSRECORD_Block *block;
 
   if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
     return GNUNET_SYSERR;
-  if (reply_block_size < sizeof (struct GNUNET_NAMESTORE_Block))
+  if (reply_block_size < sizeof (struct GNUNET_GNSRECORD_Block))
     {
       GNUNET_break_op (0);
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;