[GNUnet-SVN] r17028 - in gnunet/src: block include

[gnunet]

Author: grothoff
Date: 2011-09-26 22:38:18 +0200 (Mon, 26 Sep 2011)
New Revision: 17028

Modified:
   gnunet/src/block/plugin_block_fs.c
   gnunet/src/include/gnunet_block_lib.h
Log:
stuff

Modified: gnunet/src/block/plugin_block_fs.c
===================================================================
--- gnunet/src/block/plugin_block_fs.c  2011-09-26 20:37:14 UTC (rev 17027)
+++ gnunet/src/block/plugin_block_fs.c  2011-09-26 20:38:18 UTC (rev 17028)
@@ -90,18 +90,21 @@
     }
     if (reply_block == NULL)
       return GNUNET_BLOCK_EVALUATION_REQUEST_VALID;
-    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);
+    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;
   case GNUNET_BLOCK_TYPE_FS_SBLOCK:
     if (xquery_size != sizeof (GNUNET_HashCode))
@@ -128,18 +131,21 @@
                        ("Reply mismatched in terms of namespace.  
Discarded.\n"));
       return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
     }
-    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);
+    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;
   default:
     return GNUNET_BLOCK_EVALUATION_TYPE_NOT_SUPPORTED;

Modified: gnunet/src/include/gnunet_block_lib.h
===================================================================
--- gnunet/src/include/gnunet_block_lib.h       2011-09-26 20:37:14 UTC (rev 
17027)
+++ gnunet/src/include/gnunet_block_lib.h       2011-09-26 20:38:18 UTC (rev 
17028)
@@ -90,14 +90,7 @@
      */
   GNUNET_BLOCK_TYPE_TEST = 8,
 
-#if HAVE_MALICIOUS
     /**
-     * Block for simulating malicious peers.
-     */
-  GNUNET_BLOCK_DHT_MALICIOUS_MESSAGE_TYPE = 9,
-#endif
-
-    /**
      * Block for storing .gnunet-domains
      */
   GNUNET_BLOCK_TYPE_DNS = 10