[GNUnet-SVN] r17063 - in gnunet/src: block dht

[gnunet]

Author: grothoff
Date: 2011-09-27 16:40:09 +0200 (Tue, 27 Sep 2011)
New Revision: 17063

Modified:
   gnunet/src/block/plugin_block_test.c
   gnunet/src/dht/gnunet-service-dht-new.c
Log:
fix

Modified: gnunet/src/block/plugin_block_test.c
===================================================================
--- gnunet/src/block/plugin_block_test.c        2011-09-27 14:35:30 UTC (rev 
17062)
+++ gnunet/src/block/plugin_block_test.c        2011-09-27 14:40:09 UTC (rev 
17063)
@@ -70,18 +70,21 @@
   if (reply_block_size == 0)
     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 (NULL != bf)
   {
-    if (GNUNET_YES == GNUNET_CONTAINER_bloomfilter_test (*bf, &mhash))
-      return GNUNET_BLOCK_EVALUATION_OK_DUPLICATE;
+    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);
   }
-  else
-  {
-    *bf = GNUNET_CONTAINER_bloomfilter_init (NULL, 8, BLOOMFILTER_K);
-  }
-  GNUNET_CONTAINER_bloomfilter_add (*bf, &mhash);
   return GNUNET_BLOCK_EVALUATION_OK_MORE;
 }
 

Modified: gnunet/src/dht/gnunet-service-dht-new.c
===================================================================
--- gnunet/src/dht/gnunet-service-dht-new.c     2011-09-27 14:35:30 UTC (rev 
17062)
+++ gnunet/src/dht/gnunet-service-dht-new.c     2011-09-27 14:40:09 UTC (rev 
17063)
@@ -114,7 +114,6 @@
   GDS_NEIGHBOURS_done ();
   GDS_DATACACHE_done ();
   GDS_ROUTING_done ();
-  GDS_CLIENTS_done ();
   GDS_HELLO_done ();
   GDS_NSE_done ();
   if (GDS_block_context != NULL)
@@ -182,11 +181,15 @@
 int
 main (int argc, char *const *argv)
 {
-  return (GNUNET_OK ==
-         GNUNET_SERVICE_run (argc, argv, 
-                             "dht", 
-                             GNUNET_SERVICE_OPTION_NONE,
-                             &run, NULL)) ? 0 : 1;
+  int ret;
+  
+  ret = (GNUNET_OK ==
+        GNUNET_SERVICE_run (argc, argv, 
+                            "dht", 
+                            GNUNET_SERVICE_OPTION_NONE,
+                            &run, NULL)) ? 0 : 1;
+  GDS_CLIENTS_done ();
+  return ret;
 }
 
 /* end of gnunet-service-dht.c */