From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 22 Feb 2017 19:58:41 +0000 (+0100)
Subject: fix compile errors
X-Git-Tag: taler-0.2.1~78
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=964c35548954ae5af96150ed674d3f853bd5c2be;p=oweals%2Fgnunet.git

fix compile errors
---

diff --git a/src/dht/gnunet-service-wdht_neighbours.c b/src/dht/gnunet-service-wdht_neighbours.c
index 78a04d66d..0fe61cffe 100644
--- a/src/dht/gnunet-service-wdht_neighbours.c
+++ b/src/dht/gnunet-service-wdht_neighbours.c
@@ -642,8 +642,7 @@ GDS_NEIGHBOURS_handle_put (enum GNUNET_BLOCK_Type block_type,
  * @param key key for the content
  * @param xquery extended query
  * @param xquery_size number of bytes in @a xquery
- * @param reply_bf bloomfilter to filter duplicates
- * @param reply_bf_mutator mutator for @a reply_bf
+ * @param bg block group to filter duplicates
  * @param peer_bf filter for peers not to select (again, updated)
  * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not
  */
@@ -654,8 +653,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
                            uint32_t hop_count,
                            const struct GNUNET_HashCode *key,
                            const void *xquery, size_t xquery_size,
-                           const struct GNUNET_CONTAINER_BloomFilter *reply_bf,
-                           uint32_t reply_bf_mutator,
+                           struct GNUNET_BLOCK_Group *bg,
                            struct GNUNET_CONTAINER_BloomFilter *peer_bf)
 {
   // find closest finger(s) on all layers
diff --git a/src/dht/gnunet-service-xdht_neighbours.c b/src/dht/gnunet-service-xdht_neighbours.c
index d41eb1900..dd45d5a4b 100644
--- a/src/dht/gnunet-service-xdht_neighbours.c
+++ b/src/dht/gnunet-service-xdht_neighbours.c
@@ -2301,8 +2301,7 @@ get_cb (void *cls,
  * @param key key for the content
  * @param xquery extended query
  * @param xquery_size number of bytes in @a xquery
- * @param reply_bf bloomfilter to filter duplicates
- * @param reply_bf_mutator mutator for @a reply_bf
+ * @param bg group to filter duplicates
  * @param peer_bf filter for peers not to select (again, updated)
  * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not
  */
@@ -2312,9 +2311,9 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type block_type,
                            uint32_t desired_replication_level,
                            uint32_t hop_count,
                            const struct GNUNET_HashCode *key,
-                           const void *xquery, size_t xquery_size,
-                           const struct GNUNET_CONTAINER_BloomFilter *reply_bf,
-                           uint32_t reply_bf_mutator,
+                           const void *xquery,
+                           size_t xquery_size,
+                           struct GNUNET_BLOCK_Group *bg,
                            struct GNUNET_CONTAINER_BloomFilter *peer_bf)
 {
   struct Closest_Peer successor;
@@ -2339,8 +2338,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type block_type,
 			      block_type,
 			      NULL,
 			      0,
-                              NULL,
-			      0,
+                              bg,
                               &get_cb,
                               NULL);
     return GNUNET_NO;
@@ -3565,9 +3563,9 @@ handle_dht_p2p_put (void *cls,
   {
     switch (GNUNET_BLOCK_evaluate (GDS_block_context,
                                    ntohl (put->block_type),
+                                   NULL,
                                    GNUNET_BLOCK_EO_NONE,
                                    NULL,    /* query */
-                                   NULL, 0, /* bloom filer */
                                    NULL, 0, /* xquery */
                                    payload,
 				   payload_size))
@@ -3806,7 +3804,6 @@ handle_dht_p2p_get (void *cls,
 				NULL,
 				0,
                                 NULL,
-				0,
 				&get_cb,
                                 NULL);
     }
@@ -3817,7 +3814,6 @@ handle_dht_p2p_get (void *cls,
 				NULL,
 				0,
 				NULL,
-				0,
                                 &get_cb,
                                 &gp[get_length - 2]);
     }
diff --git a/src/util/service_new.c b/src/util/service_new.c
index ded53917a..731be2cfe 100644
--- a/src/util/service_new.c
+++ b/src/util/service_new.c
@@ -1969,6 +1969,7 @@ do_send (void *cls)
   client->msg_pos += ret;
   if (left > ret)
   {
+    GNUNET_assert (NULL == client->drop_task);
     client->send_task
       = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL,
 					client->sock,
@@ -1996,6 +1997,7 @@ service_mq_send (struct GNUNET_MQ_Handle *mq,
   struct GNUNET_SERVICE_Client *client = impl_state;
 
   GNUNET_assert (NULL == client->send_task);
+  GNUNET_assert (NULL == client->drop_task);
   client->msg = msg;
   client->msg_pos = 0;
   client->send_task