check

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

diff --git a/src/block/plugin_block_fs.c b/src/block/plugin_block_fs.c
index a5219b706bee7e17c9a4d420e4a7d4cbce18138a..caf009ddfe5f5eb047325b9f354100a8d34f7c40 100644 (file)
--- a/src/block/plugin_block_fs.c
+++ b/src/block/plugin_block_fs.c
@@ -25,7 +25,7 @@
  */
 
 #include "platform.h"
-#include "plugin_block.h"
+#include "gnunet_block_plugin.h"
 #include "block_fs.h"
 #include "gnunet_signatures.h"
 
@@ -74,8 +74,8 @@ block_plugin_fs_evaluate (void *cls,
 
   switch (type)
     {
-    case GNUNET_BLOCK_TYPE_DBLOCK:
-    case GNUNET_BLOCK_TYPE_IBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_DBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_IBLOCK:
       if (xquery_size != 0) 
        {
          GNUNET_break_op (0);
@@ -84,8 +84,8 @@ block_plugin_fs_evaluate (void *cls,
       if (reply_block == NULL)
        return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
       return GNUNET_BLOCK_EVALUATION_OK_LAST;
-    case GNUNET_BLOCK_TYPE_KBLOCK:
-    case GNUNET_BLOCK_TYPE_NBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_KBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_NBLOCK:
       if (xquery_size != 0) 
        {
          GNUNET_break_op (0);
@@ -111,7 +111,7 @@ block_plugin_fs_evaluate (void *cls,
        }
       GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
       return GNUNET_BLOCK_EVALUATION_OK_MORE;
-    case GNUNET_BLOCK_TYPE_SBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_SBLOCK:
       if (xquery_size != sizeof (GNUNET_HashCode)) 
        {
          GNUNET_break_op (0);
@@ -120,8 +120,11 @@ block_plugin_fs_evaluate (void *cls,
       if (reply_block == NULL)
        return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
       nsid = xquery;
-      if (reply_block_size < sizeof (struct NBlock))
-       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+      if (reply_block_size < sizeof (struct SBlock))
+       {
+         GNUNET_break_op (0);
+         return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
+       }
       sb = reply_block;
       GNUNET_CRYPTO_hash (&sb->subspace,
                          sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
@@ -130,8 +133,9 @@ block_plugin_fs_evaluate (void *cls,
                       &sh,
                       sizeof (GNUNET_HashCode)))
        {
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     _("Reply mismatched in terms of namespace.  Discarded.\n"));
+         GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING,
+                          "block-fs",
+                          _("Reply mismatched in terms of namespace.  Discarded.\n"));
          return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
        }
       GNUNET_CRYPTO_hash (reply_block,
@@ -182,15 +186,15 @@ block_plugin_fs_get_key (void *cls,
 
   switch (type)
     {
-    case GNUNET_BLOCK_TYPE_DBLOCK:
-    case GNUNET_BLOCK_TYPE_IBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_DBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_IBLOCK:
       GNUNET_CRYPTO_hash (block, block_size, key);
       return GNUNET_OK;
-    case GNUNET_BLOCK_TYPE_KBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_KBLOCK:
       if (block_size < sizeof (struct KBlock))
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       kb = block;
       if (block_size - sizeof (struct KBlock) !=
@@ -199,7 +203,7 @@ block_plugin_fs_get_key (void *cls,
          - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (GNUNET_OK !=
          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_KBLOCK,
@@ -208,25 +212,25 @@ block_plugin_fs_get_key (void *cls,
                                    &kb->keyspace)) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (key != NULL)
        GNUNET_CRYPTO_hash (&kb->keyspace,
                            sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
                            key);
       return GNUNET_OK;
-    case GNUNET_BLOCK_TYPE_SBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_SBLOCK:
       if (block_size < sizeof (struct SBlock))
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       sb = block;
       if (block_size !=
          ntohl (sb->purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (GNUNET_OK !=
          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_SBLOCK,
@@ -235,16 +239,16 @@ block_plugin_fs_get_key (void *cls,
                                    &sb->subspace)) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (key != NULL)
        *key = sb->identifier;
       return GNUNET_OK;
-    case GNUNET_BLOCK_TYPE_NBLOCK:
+    case GNUNET_BLOCK_TYPE_FS_NBLOCK:
       if (block_size < sizeof (struct NBlock))
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       nb = block;
       if (block_size - sizeof (struct NBlock) !=
@@ -253,13 +257,13 @@ block_plugin_fs_get_key (void *cls,
          - sizeof (struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded) ) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (block_size !=
          ntohl (nb->ksk_purpose.size) + sizeof (struct GNUNET_CRYPTO_RsaSignature))
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (GNUNET_OK !=
          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK_KSIG,
@@ -268,7 +272,7 @@ block_plugin_fs_get_key (void *cls,
                                    &nb->keyspace)) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       if (GNUNET_OK !=
          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_FS_NBLOCK,
@@ -277,7 +281,7 @@ block_plugin_fs_get_key (void *cls,
                                    &nb->subspace)) 
        {
          GNUNET_break_op (0);
-         return GNUNET_SYSERR;
+         return GNUNET_NO;
        }
       /* FIXME: we used to xor ID with NSID,
         why not here? */
@@ -300,11 +304,11 @@ libgnunet_plugin_block_fs_init (void *cls)
 {
   static enum GNUNET_BLOCK_Type types[] = 
     {
-      GNUNET_BLOCK_TYPE_DBLOCK,
-      GNUNET_BLOCK_TYPE_IBLOCK,
-      GNUNET_BLOCK_TYPE_KBLOCK,
-      GNUNET_BLOCK_TYPE_SBLOCK,
-      GNUNET_BLOCK_TYPE_NBLOCK,
+      GNUNET_BLOCK_TYPE_FS_DBLOCK,
+      GNUNET_BLOCK_TYPE_FS_IBLOCK,
+      GNUNET_BLOCK_TYPE_FS_KBLOCK,
+      GNUNET_BLOCK_TYPE_FS_SBLOCK,
+      GNUNET_BLOCK_TYPE_FS_NBLOCK,
       GNUNET_BLOCK_TYPE_ANY /* end of list */
     };
   struct GNUNET_BLOCK_PluginFunctions *api;