diff options
-rw-r--r-- | src/dht/gnunet-service-wdht_neighbours.c | 6 | ||||
-rw-r--r-- | src/dht/gnunet-service-xdht_neighbours.c | 16 | ||||
-rw-r--r-- | src/util/service_new.c | 2 |
3 files changed, 10 insertions, 14 deletions
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, | |||
642 | * @param key key for the content | 642 | * @param key key for the content |
643 | * @param xquery extended query | 643 | * @param xquery extended query |
644 | * @param xquery_size number of bytes in @a xquery | 644 | * @param xquery_size number of bytes in @a xquery |
645 | * @param reply_bf bloomfilter to filter duplicates | 645 | * @param bg block group to filter duplicates |
646 | * @param reply_bf_mutator mutator for @a reply_bf | ||
647 | * @param peer_bf filter for peers not to select (again, updated) | 646 | * @param peer_bf filter for peers not to select (again, updated) |
648 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not | 647 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not |
649 | */ | 648 | */ |
@@ -654,8 +653,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type, | |||
654 | uint32_t hop_count, | 653 | uint32_t hop_count, |
655 | const struct GNUNET_HashCode *key, | 654 | const struct GNUNET_HashCode *key, |
656 | const void *xquery, size_t xquery_size, | 655 | const void *xquery, size_t xquery_size, |
657 | const struct GNUNET_CONTAINER_BloomFilter *reply_bf, | 656 | struct GNUNET_BLOCK_Group *bg, |
658 | uint32_t reply_bf_mutator, | ||
659 | struct GNUNET_CONTAINER_BloomFilter *peer_bf) | 657 | struct GNUNET_CONTAINER_BloomFilter *peer_bf) |
660 | { | 658 | { |
661 | // find closest finger(s) on all layers | 659 | // 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, | |||
2301 | * @param key key for the content | 2301 | * @param key key for the content |
2302 | * @param xquery extended query | 2302 | * @param xquery extended query |
2303 | * @param xquery_size number of bytes in @a xquery | 2303 | * @param xquery_size number of bytes in @a xquery |
2304 | * @param reply_bf bloomfilter to filter duplicates | 2304 | * @param bg group to filter duplicates |
2305 | * @param reply_bf_mutator mutator for @a reply_bf | ||
2306 | * @param peer_bf filter for peers not to select (again, updated) | 2305 | * @param peer_bf filter for peers not to select (again, updated) |
2307 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not | 2306 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not |
2308 | */ | 2307 | */ |
@@ -2312,9 +2311,9 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type block_type, | |||
2312 | uint32_t desired_replication_level, | 2311 | uint32_t desired_replication_level, |
2313 | uint32_t hop_count, | 2312 | uint32_t hop_count, |
2314 | const struct GNUNET_HashCode *key, | 2313 | const struct GNUNET_HashCode *key, |
2315 | const void *xquery, size_t xquery_size, | 2314 | const void *xquery, |
2316 | const struct GNUNET_CONTAINER_BloomFilter *reply_bf, | 2315 | size_t xquery_size, |
2317 | uint32_t reply_bf_mutator, | 2316 | struct GNUNET_BLOCK_Group *bg, |
2318 | struct GNUNET_CONTAINER_BloomFilter *peer_bf) | 2317 | struct GNUNET_CONTAINER_BloomFilter *peer_bf) |
2319 | { | 2318 | { |
2320 | struct Closest_Peer successor; | 2319 | struct Closest_Peer successor; |
@@ -2339,8 +2338,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type block_type, | |||
2339 | block_type, | 2338 | block_type, |
2340 | NULL, | 2339 | NULL, |
2341 | 0, | 2340 | 0, |
2342 | NULL, | 2341 | bg, |
2343 | 0, | ||
2344 | &get_cb, | 2342 | &get_cb, |
2345 | NULL); | 2343 | NULL); |
2346 | return GNUNET_NO; | 2344 | return GNUNET_NO; |
@@ -3565,9 +3563,9 @@ handle_dht_p2p_put (void *cls, | |||
3565 | { | 3563 | { |
3566 | switch (GNUNET_BLOCK_evaluate (GDS_block_context, | 3564 | switch (GNUNET_BLOCK_evaluate (GDS_block_context, |
3567 | ntohl (put->block_type), | 3565 | ntohl (put->block_type), |
3566 | NULL, | ||
3568 | GNUNET_BLOCK_EO_NONE, | 3567 | GNUNET_BLOCK_EO_NONE, |
3569 | NULL, /* query */ | 3568 | NULL, /* query */ |
3570 | NULL, 0, /* bloom filer */ | ||
3571 | NULL, 0, /* xquery */ | 3569 | NULL, 0, /* xquery */ |
3572 | payload, | 3570 | payload, |
3573 | payload_size)) | 3571 | payload_size)) |
@@ -3806,7 +3804,6 @@ handle_dht_p2p_get (void *cls, | |||
3806 | NULL, | 3804 | NULL, |
3807 | 0, | 3805 | 0, |
3808 | NULL, | 3806 | NULL, |
3809 | 0, | ||
3810 | &get_cb, | 3807 | &get_cb, |
3811 | NULL); | 3808 | NULL); |
3812 | } | 3809 | } |
@@ -3817,7 +3814,6 @@ handle_dht_p2p_get (void *cls, | |||
3817 | NULL, | 3814 | NULL, |
3818 | 0, | 3815 | 0, |
3819 | NULL, | 3816 | NULL, |
3820 | 0, | ||
3821 | &get_cb, | 3817 | &get_cb, |
3822 | &gp[get_length - 2]); | 3818 | &gp[get_length - 2]); |
3823 | } | 3819 | } |
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) | |||
1969 | client->msg_pos += ret; | 1969 | client->msg_pos += ret; |
1970 | if (left > ret) | 1970 | if (left > ret) |
1971 | { | 1971 | { |
1972 | GNUNET_assert (NULL == client->drop_task); | ||
1972 | client->send_task | 1973 | client->send_task |
1973 | = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, | 1974 | = GNUNET_SCHEDULER_add_write_net (GNUNET_TIME_UNIT_FOREVER_REL, |
1974 | client->sock, | 1975 | client->sock, |
@@ -1996,6 +1997,7 @@ service_mq_send (struct GNUNET_MQ_Handle *mq, | |||
1996 | struct GNUNET_SERVICE_Client *client = impl_state; | 1997 | struct GNUNET_SERVICE_Client *client = impl_state; |
1997 | 1998 | ||
1998 | GNUNET_assert (NULL == client->send_task); | 1999 | GNUNET_assert (NULL == client->send_task); |
2000 | GNUNET_assert (NULL == client->drop_task); | ||
1999 | client->msg = msg; | 2001 | client->msg = msg; |
2000 | client->msg_pos = 0; | 2002 | client->msg_pos = 0; |
2001 | client->send_task | 2003 | client->send_task |