aboutsummaryrefslogtreecommitdiff
path: root/src/include/gnunet_block_lib.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/include/gnunet_block_lib.h')
-rw-r--r--src/include/gnunet_block_lib.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h
index fb417412f..fdccbab78 100644
--- a/src/include/gnunet_block_lib.h
+++ b/src/include/gnunet_block_lib.h
@@ -19,6 +19,9 @@
19 */ 19 */
20 20
21/** 21/**
22 * @addtogroup dht_libs DHT and support libraries
23 * @{
24 *
22 * @author Christian Grothoff 25 * @author Christian Grothoff
23 * 26 *
24 * @file 27 * @file
@@ -31,6 +34,7 @@
31#ifndef GNUNET_BLOCK_LIB_H 34#ifndef GNUNET_BLOCK_LIB_H
32#define GNUNET_BLOCK_LIB_H 35#define GNUNET_BLOCK_LIB_H
33 36
37
34#include "gnunet_util_lib.h" 38#include "gnunet_util_lib.h"
35#include "gnunet_dht_block_types.h" 39#include "gnunet_dht_block_types.h"
36 40
@@ -128,7 +132,6 @@ struct GNUNET_BLOCK_Group;
128 * 132 *
129 * @param ctx block context in which the block group is created 133 * @param ctx block context in which the block group is created
130 * @param type type of the block for which we are creating the group 134 * @param type type of the block for which we are creating the group
131 * @param nonce random value used to seed the group creation
132 * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh 135 * @param raw_data optional serialized prior state of the group, NULL if unavailable/fresh
133 * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh 136 * @param raw_data_size number of bytes in @a raw_data, 0 if unavailable/fresh
134 * @param ... type-specific additional data, can be empty 137 * @param ... type-specific additional data, can be empty
@@ -138,7 +141,6 @@ struct GNUNET_BLOCK_Group;
138struct GNUNET_BLOCK_Group * 141struct GNUNET_BLOCK_Group *
139GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx, 142GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
140 enum GNUNET_BLOCK_Type type, 143 enum GNUNET_BLOCK_Type type,
141 uint32_t nonce,
142 const void *raw_data, 144 const void *raw_data,
143 size_t raw_data_size, 145 size_t raw_data_size,
144 ...); 146 ...);
@@ -148,7 +150,6 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
148 * Serialize state of a block group. 150 * Serialize state of a block group.
149 * 151 *
150 * @param bg group to serialize 152 * @param bg group to serialize
151 * @param[out] nonce set to the nonce of the @a bg
152 * @param[out] raw_data set to the serialized state 153 * @param[out] raw_data set to the serialized state
153 * @param[out] raw_data_size set to the number of bytes in @a raw_data 154 * @param[out] raw_data_size set to the number of bytes in @a raw_data
154 * @return #GNUNET_OK on success, #GNUNET_NO if serialization is not 155 * @return #GNUNET_OK on success, #GNUNET_NO if serialization is not
@@ -156,7 +157,6 @@ GNUNET_BLOCK_group_create (struct GNUNET_BLOCK_Context *ctx,
156 */ 157 */
157enum GNUNET_GenericReturnValue 158enum GNUNET_GenericReturnValue
158GNUNET_BLOCK_group_serialize (struct GNUNET_BLOCK_Group *bg, 159GNUNET_BLOCK_group_serialize (struct GNUNET_BLOCK_Group *bg,
159 uint32_t *nonce,
160 void **raw_data, 160 void **raw_data,
161 size_t *raw_data_size); 161 size_t *raw_data_size);
162 162
@@ -272,7 +272,7 @@ GNUNET_BLOCK_group_set_seen (struct GNUNET_BLOCK_Group *bg,
272 272
273/** 273/**
274 * Try merging two block groups. Afterwards, @a bg1 should remain 274 * Try merging two block groups. Afterwards, @a bg1 should remain
275 * valid and contain the rules from both @a bg1 and @bg2, and 275 * valid and contain the rules from both @a bg1 and @a bg2, and
276 * @a bg2 should be destroyed (as part of this call). The latter 276 * @a bg2 should be destroyed (as part of this call). The latter
277 * should happen even if merging is not supported. 277 * should happen even if merging is not supported.
278 * 278 *
@@ -299,4 +299,6 @@ GNUNET_BLOCK_group_merge (struct GNUNET_BLOCK_Group *bg1,
299 299
300/** @} */ /* end of group */ 300/** @} */ /* end of group */
301 301
302/** @} */ /* end of group addition */
303
302/* end of gnunet_block_lib.h */ 304/* end of gnunet_block_lib.h */