diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-03-29 14:26:33 +0200 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2017-03-29 14:26:33 +0200 |
commit | ab281595eeb270120f89ec954a572f4fcf78fc53 (patch) | |
tree | 335a2caf503596adc400c5ebb9fb742f097bc5a3 /src/dht/gnunet-service-dht_neighbours.h | |
parent | 59d393a1124cfd1aaffdf994bf6f8a9baaac8361 (diff) | |
parent | 2b87f173e360aaf4a3bac3fbc6e5b4dc44cf58cd (diff) | |
download | gnunet-ab281595eeb270120f89ec954a572f4fcf78fc53.tar.gz gnunet-ab281595eeb270120f89ec954a572f4fcf78fc53.zip |
- merge with master
Diffstat (limited to 'src/dht/gnunet-service-dht_neighbours.h')
-rw-r--r-- | src/dht/gnunet-service-dht_neighbours.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dht/gnunet-service-dht_neighbours.h b/src/dht/gnunet-service-dht_neighbours.h index d89e5c54f..34b76ee8a 100644 --- a/src/dht/gnunet-service-dht_neighbours.h +++ b/src/dht/gnunet-service-dht_neighbours.h | |||
@@ -77,8 +77,7 @@ GDS_NEIGHBOURS_handle_put (enum GNUNET_BLOCK_Type type, | |||
77 | * @param key key for the content | 77 | * @param key key for the content |
78 | * @param xquery extended query | 78 | * @param xquery extended query |
79 | * @param xquery_size number of bytes in @a xquery | 79 | * @param xquery_size number of bytes in @a xquery |
80 | * @param reply_bf bloomfilter to filter duplicates | 80 | * @param bg block group to filter replies |
81 | * @param reply_bf_mutator mutator for @a reply_bf | ||
82 | * @param peer_bf filter for peers not to select (again, updated) | 81 | * @param peer_bf filter for peers not to select (again, updated) |
83 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not | 82 | * @return #GNUNET_OK if the request was forwarded, #GNUNET_NO if not |
84 | */ | 83 | */ |
@@ -88,9 +87,9 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type, | |||
88 | uint32_t desired_replication_level, | 87 | uint32_t desired_replication_level, |
89 | uint32_t hop_count, | 88 | uint32_t hop_count, |
90 | const struct GNUNET_HashCode *key, | 89 | const struct GNUNET_HashCode *key, |
91 | const void *xquery, size_t xquery_size, | 90 | const void *xquery, |
92 | const struct GNUNET_CONTAINER_BloomFilter *reply_bf, | 91 | size_t xquery_size, |
93 | uint32_t reply_bf_mutator, | 92 | struct GNUNET_BLOCK_Group *bg, |
94 | struct GNUNET_CONTAINER_BloomFilter *peer_bf); | 93 | struct GNUNET_CONTAINER_BloomFilter *peer_bf); |
95 | 94 | ||
96 | 95 | ||
@@ -114,12 +113,13 @@ void | |||
114 | GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target, | 113 | GDS_NEIGHBOURS_handle_reply (const struct GNUNET_PeerIdentity *target, |
115 | enum GNUNET_BLOCK_Type type, | 114 | enum GNUNET_BLOCK_Type type, |
116 | struct GNUNET_TIME_Absolute expiration_time, | 115 | struct GNUNET_TIME_Absolute expiration_time, |
117 | const struct GNUNET_HashCode * key, | 116 | const struct GNUNET_HashCode *key, |
118 | unsigned int put_path_length, | 117 | unsigned int put_path_length, |
119 | const struct GNUNET_PeerIdentity *put_path, | 118 | const struct GNUNET_PeerIdentity *put_path, |
120 | unsigned int get_path_length, | 119 | unsigned int get_path_length, |
121 | const struct GNUNET_PeerIdentity *get_path, | 120 | const struct GNUNET_PeerIdentity *get_path, |
122 | const void *data, size_t data_size); | 121 | const void *data, |
122 | size_t data_size); | ||
123 | 123 | ||
124 | 124 | ||
125 | /** | 125 | /** |