-fix off-by-1

[oweals/gnunet.git] / src / dht / gnunet-service-dht_routing.c

diff --git a/src/dht/gnunet-service-dht_routing.c b/src/dht/gnunet-service-dht_routing.c
index 8dfae370938a805ca0e088ed478ba33b79740a8b..bda43d435dab5ae0327bc3d909461b1932d16876 100644 (file)
--- a/src/dht/gnunet-service-dht_routing.c
+++ b/src/dht/gnunet-service-dht_routing.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2011 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2011 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -153,11 +153,11 @@ struct ProcessContext
 /**
  * Forward the result to the given peer if it matches the request.
  *
- * @param cls the 'struct ProcessContext' with the result
+ * @param cls the `struct ProcessContext` with the result
  * @param key the query
- * @param value the 'struct RecentRequest' with the request
- * @return GNUNET_OK (continue to iterate),
- *         GNUNET_SYSERR if the result is malformed or type unsupported
+ * @param value the `struct RecentRequest` with the request
+ * @return #GNUNET_OK (continue to iterate),
+ *         #GNUNET_SYSERR if the result is malformed or type unsupported
  */
 static int
 process (void *cls, const struct GNUNET_HashCode * key, void *value)
@@ -199,9 +199,16 @@ process (void *cls, const struct GNUNET_HashCode * key, void *value)
     eval_key = key;
   }
   eval =
-      GNUNET_BLOCK_evaluate (GDS_block_context, pc->type, eval_key,
-                             &rr->reply_bf, rr->reply_bf_mutator, rr->xquery,
-                             rr->xquery_size, pc->data, pc->data_size);
+      GNUNET_BLOCK_evaluate (GDS_block_context,
+                             pc->type,
+                             GNUNET_BLOCK_EO_NONE,
+                             eval_key,
+                             &rr->reply_bf,
+                             rr->reply_bf_mutator,
+                             rr->xquery,
+                             rr->xquery_size,
+                             pc->data,
+                             pc->data_size);
   switch (eval)
   {
   case GNUNET_BLOCK_EVALUATION_OK_MORE:
@@ -321,8 +328,8 @@ expire_oldest_entry ()
   GNUNET_CONTAINER_heap_remove_node (recent_req->heap_node);
   GNUNET_CONTAINER_bloomfilter_free (recent_req->reply_bf);
   GNUNET_assert (GNUNET_YES ==
-                GNUNET_CONTAINER_multihashmap_remove (recent_map, 
-                                                      &recent_req->key, 
+                GNUNET_CONTAINER_multihashmap_remove (recent_map,
+                                                      &recent_req->key,
                                                       recent_req));
   GNUNET_free (recent_req);
 }
@@ -362,8 +369,7 @@ try_combine_recent (void *cls, const struct GNUNET_HashCode * key, void *value)
   else
   {
     GNUNET_CONTAINER_bloomfilter_or2 (rr->reply_bf,
-                                     in->reply_bf,
-                                     GNUNET_CONTAINER_bloomfilter_get_size (in->reply_bf));
+                                     in->reply_bf);
     GNUNET_CONTAINER_bloomfilter_free (in->reply_bf);
   }
   GNUNET_free (in);
@@ -379,10 +385,10 @@ try_combine_recent (void *cls, const struct GNUNET_HashCode * key, void *value)
  * @param options options for processing
  * @param key key for the content
  * @param xquery extended query
- * @param xquery_size number of bytes in xquery
+ * @param xquery_size number of bytes in @a xquery
  * @param reply_bf bloomfilter to filter duplicates
- * @param reply_bf_mutator mutator for reply_bf
-*/
+ * @param reply_bf_mutator mutator for @a reply_bf
+ */
 void
 GDS_ROUTING_add (const struct GNUNET_PeerIdentity *sender,
                  enum GNUNET_BLOCK_Type type,