diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:55:28 +0000 |
commit | 61c39c60565b386e0e12ea669556b030e8cd7180 (patch) | |
tree | 59109aeab8297bdc996faca8c4e38ec7426c36cf /src/include | |
parent | 780eb09dd8040ecf8649d40ddf8314464e0fc48e (diff) | |
download | gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.tar.gz gnunet-61c39c60565b386e0e12ea669556b030e8cd7180.zip |
-remove trailing whitespace
Diffstat (limited to 'src/include')
61 files changed, 717 insertions, 717 deletions
diff --git a/src/include/block_regex.h b/src/include/block_regex.h index 8e43c2377..77f778c95 100644 --- a/src/include/block_regex.h +++ b/src/include/block_regex.h | |||
@@ -63,7 +63,7 @@ struct RegexAcceptBlock | |||
63 | * The key of the state. | 63 | * The key of the state. |
64 | */ | 64 | */ |
65 | struct GNUNET_HashCode key; | 65 | struct GNUNET_HashCode key; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * Public key of the peer signing. | 68 | * Public key of the peer signing. |
69 | */ | 69 | */ |
diff --git a/src/include/gnunet_arm_service.h b/src/include/gnunet_arm_service.h index 7c35b0b20..e1f44620f 100644 --- a/src/include/gnunet_arm_service.h +++ b/src/include/gnunet_arm_service.h | |||
@@ -180,7 +180,7 @@ struct GNUNET_ARM_Handle; | |||
180 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, | 180 | * @param connected GNUNET_YES if connected, GNUNET_NO if disconnected, |
181 | * GNUNET_SYSERR if there was an error. | 181 | * GNUNET_SYSERR if there was an error. |
182 | */ | 182 | */ |
183 | typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, | 183 | typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, |
184 | int connected); | 184 | int connected); |
185 | 185 | ||
186 | 186 | ||
@@ -195,9 +195,9 @@ typedef void (*GNUNET_ARM_ConnectionStatusCallback) (void *cls, | |||
195 | * @param service service name | 195 | * @param service service name |
196 | * @param result result of the operation | 196 | * @param result result of the operation |
197 | */ | 197 | */ |
198 | typedef void (*GNUNET_ARM_ResultCallback) (void *cls, | 198 | typedef void (*GNUNET_ARM_ResultCallback) (void *cls, |
199 | enum GNUNET_ARM_RequestStatus rs, | 199 | enum GNUNET_ARM_RequestStatus rs, |
200 | const char *service, | 200 | const char *service, |
201 | enum GNUNET_ARM_Result result); | 201 | enum GNUNET_ARM_Result result); |
202 | 202 | ||
203 | 203 | ||
@@ -212,9 +212,9 @@ typedef void (*GNUNET_ARM_ResultCallback) (void *cls, | |||
212 | * @param count number of strings in the list | 212 | * @param count number of strings in the list |
213 | * @param list list of running services | 213 | * @param list list of running services |
214 | */ | 214 | */ |
215 | typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, | 215 | typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, |
216 | enum GNUNET_ARM_RequestStatus rs, | 216 | enum GNUNET_ARM_RequestStatus rs, |
217 | unsigned int count, | 217 | unsigned int count, |
218 | const char *const*list); | 218 | const char *const*list); |
219 | 219 | ||
220 | 220 | ||
@@ -231,7 +231,7 @@ typedef void (*GNUNET_ARM_ServiceListCallback) (void *cls, | |||
231 | */ | 231 | */ |
232 | struct GNUNET_ARM_Handle * | 232 | struct GNUNET_ARM_Handle * |
233 | GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | 233 | GNUNET_ARM_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
234 | GNUNET_ARM_ConnectionStatusCallback conn_status, | 234 | GNUNET_ARM_ConnectionStatusCallback conn_status, |
235 | void *cls); | 235 | void *cls); |
236 | 236 | ||
237 | 237 | ||
@@ -274,7 +274,7 @@ GNUNET_ARM_request_service_list (struct GNUNET_ARM_Handle *h, | |||
274 | */ | 274 | */ |
275 | void | 275 | void |
276 | GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h, | 276 | GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h, |
277 | const char *service_name, | 277 | const char *service_name, |
278 | struct GNUNET_TIME_Relative timeout, | 278 | struct GNUNET_TIME_Relative timeout, |
279 | GNUNET_ARM_ResultCallback cont, void *cont_cls); | 279 | GNUNET_ARM_ResultCallback cont, void *cont_cls); |
280 | 280 | ||
@@ -291,9 +291,9 @@ GNUNET_ARM_request_service_stop (struct GNUNET_ARM_Handle *h, | |||
291 | */ | 291 | */ |
292 | void | 292 | void |
293 | GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h, | 293 | GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h, |
294 | const char *service_name, | 294 | const char *service_name, |
295 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | 295 | enum GNUNET_OS_InheritStdioFlags std_inheritance, |
296 | struct GNUNET_TIME_Relative timeout, | 296 | struct GNUNET_TIME_Relative timeout, |
297 | GNUNET_ARM_ResultCallback cont, | 297 | GNUNET_ARM_ResultCallback cont, |
298 | void *cont_cls); | 298 | void *cont_cls); |
299 | 299 | ||
@@ -312,8 +312,8 @@ struct GNUNET_ARM_MonitorHandle; | |||
312 | * @param service service name | 312 | * @param service service name |
313 | * @param status status of the service | 313 | * @param status status of the service |
314 | */ | 314 | */ |
315 | typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, | 315 | typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, |
316 | const char *service, | 316 | const char *service, |
317 | enum GNUNET_ARM_ServiceStatus status); | 317 | enum GNUNET_ARM_ServiceStatus status); |
318 | 318 | ||
319 | 319 | ||
@@ -330,7 +330,7 @@ typedef void (*GNUNET_ARM_ServiceStatusCallback) (void *cls, | |||
330 | */ | 330 | */ |
331 | struct GNUNET_ARM_MonitorHandle * | 331 | struct GNUNET_ARM_MonitorHandle * |
332 | GNUNET_ARM_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg, | 332 | GNUNET_ARM_monitor (const struct GNUNET_CONFIGURATION_Handle *cfg, |
333 | GNUNET_ARM_ServiceStatusCallback cont, | 333 | GNUNET_ARM_ServiceStatusCallback cont, |
334 | void *cont_cls); | 334 | void *cont_cls); |
335 | 335 | ||
336 | 336 | ||
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h index a9ac0c1cd..261288396 100644 --- a/src/include/gnunet_bio_lib.h +++ b/src/include/gnunet_bio_lib.h | |||
@@ -93,7 +93,7 @@ GNUNET_BIO_read (struct GNUNET_BIO_ReadHandle *h, const char *what, | |||
93 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure | 93 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure |
94 | */ | 94 | */ |
95 | int | 95 | int |
96 | GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h, | 96 | GNUNET_BIO_read_fn (struct GNUNET_BIO_ReadHandle *h, |
97 | const char *file, int line, | 97 | const char *file, int line, |
98 | void *result, size_t len); | 98 | void *result, size_t len); |
99 | 99 | ||
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index 38ad78686..5f3bbda96 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h | |||
@@ -88,7 +88,7 @@ enum GNUNET_BLOCK_Type | |||
88 | * Block for testing. | 88 | * Block for testing. |
89 | */ | 89 | */ |
90 | GNUNET_BLOCK_TYPE_TEST = 8, | 90 | GNUNET_BLOCK_TYPE_TEST = 8, |
91 | 91 | ||
92 | /** | 92 | /** |
93 | * Type of a block representing any type of search result | 93 | * Type of a block representing any type of search result |
94 | * (universal). Implemented in the context of #2564, replaces | 94 | * (universal). Implemented in the context of #2564, replaces |
@@ -132,7 +132,7 @@ enum GNUNET_BLOCK_EvaluationResult | |||
132 | * Valid result, and there may be more. | 132 | * Valid result, and there may be more. |
133 | */ | 133 | */ |
134 | GNUNET_BLOCK_EVALUATION_OK_MORE = 0, | 134 | GNUNET_BLOCK_EVALUATION_OK_MORE = 0, |
135 | 135 | ||
136 | /** | 136 | /** |
137 | * Last possible valid result. | 137 | * Last possible valid result. |
138 | */ | 138 | */ |
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h index aadfdb5a4..91f278d38 100644 --- a/src/include/gnunet_block_plugin.h +++ b/src/include/gnunet_block_plugin.h | |||
@@ -51,7 +51,7 @@ | |||
51 | * @param reply_block_size number of bytes in @a reply_block | 51 | * @param reply_block_size number of bytes in @a reply_block |
52 | * @return characterization of result | 52 | * @return characterization of result |
53 | */ | 53 | */ |
54 | typedef enum GNUNET_BLOCK_EvaluationResult | 54 | typedef enum GNUNET_BLOCK_EvaluationResult |
55 | (*GNUNET_BLOCK_EvaluationFunction) (void *cls, | 55 | (*GNUNET_BLOCK_EvaluationFunction) (void *cls, |
56 | enum GNUNET_BLOCK_Type type, | 56 | enum GNUNET_BLOCK_Type type, |
57 | const struct GNUNET_HashCode *query, | 57 | const struct GNUNET_HashCode *query, |
diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h index 37f152d97..687083ad4 100644 --- a/src/include/gnunet_client_lib.h +++ b/src/include/gnunet_client_lib.h | |||
@@ -128,7 +128,7 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *client, | |||
128 | size_t size, | 128 | size_t size, |
129 | struct GNUNET_TIME_Relative timeout, | 129 | struct GNUNET_TIME_Relative timeout, |
130 | int auto_retry, | 130 | int auto_retry, |
131 | GNUNET_CONNECTION_TransmitReadyNotify notify, | 131 | GNUNET_CONNECTION_TransmitReadyNotify notify, |
132 | void *notify_cls); | 132 | void *notify_cls); |
133 | 133 | ||
134 | 134 | ||
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index d599b87e9..450a45a7e 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -217,7 +217,7 @@ extern "C" | |||
217 | /** | 217 | /** |
218 | * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32 | 218 | * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32 |
219 | */ | 219 | */ |
220 | #define GNUNET_NETWORK_STRUCT_BEGIN | 220 | #define GNUNET_NETWORK_STRUCT_BEGIN |
221 | 221 | ||
222 | /** | 222 | /** |
223 | * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32; | 223 | * Define as empty, GNUNET_PACKED should suffice, but this won't work on W32; |
@@ -307,9 +307,9 @@ GNUNET_get_log_skip (); | |||
307 | 307 | ||
308 | #if !defined(GNUNET_CULL_LOGGING) | 308 | #if !defined(GNUNET_CULL_LOGGING) |
309 | int | 309 | int |
310 | GNUNET_get_log_call_status (int caller_level, | 310 | GNUNET_get_log_call_status (int caller_level, |
311 | const char *comp, | 311 | const char *comp, |
312 | const char *file, | 312 | const char *file, |
313 | const char *function, int line); | 313 | const char *function, int line); |
314 | #endif | 314 | #endif |
315 | 315 | ||
@@ -403,7 +403,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind, const char *comp, | |||
403 | * @param option name of missing option | 403 | * @param option name of missing option |
404 | */ | 404 | */ |
405 | void | 405 | void |
406 | GNUNET_log_config_missing (enum GNUNET_ErrorType kind, | 406 | GNUNET_log_config_missing (enum GNUNET_ErrorType kind, |
407 | const char *section, | 407 | const char *section, |
408 | const char *option); | 408 | const char *option); |
409 | 409 | ||
@@ -418,7 +418,7 @@ GNUNET_log_config_missing (enum GNUNET_ErrorType kind, | |||
418 | * @param required what is required that is invalid about the option | 418 | * @param required what is required that is invalid about the option |
419 | */ | 419 | */ |
420 | void | 420 | void |
421 | GNUNET_log_config_invalid (enum GNUNET_ErrorType kind, | 421 | GNUNET_log_config_invalid (enum GNUNET_ErrorType kind, |
422 | const char *section, | 422 | const char *section, |
423 | const char *option, | 423 | const char *option, |
424 | const char *required); | 424 | const char *required); |
@@ -651,7 +651,7 @@ GNUNET_htonll (uint64_t n); | |||
651 | * @param d the value in network byte order | 651 | * @param d the value in network byte order |
652 | * @return the same value in host byte order | 652 | * @return the same value in host byte order |
653 | */ | 653 | */ |
654 | double | 654 | double |
655 | GNUNET_hton_double (double d); | 655 | GNUNET_hton_double (double d); |
656 | 656 | ||
657 | /** | 657 | /** |
@@ -659,7 +659,7 @@ GNUNET_hton_double (double d); | |||
659 | * @param d the value in network byte order | 659 | * @param d the value in network byte order |
660 | * @return the same value in host byte order | 660 | * @return the same value in host byte order |
661 | */ | 661 | */ |
662 | double | 662 | double |
663 | GNUNET_ntoh_double (double d); | 663 | GNUNET_ntoh_double (double d); |
664 | 664 | ||
665 | /* ************************* allocation functions ****************** */ | 665 | /* ************************* allocation functions ****************** */ |
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h index 05ba8a2db..08cf1558a 100644 --- a/src/include/gnunet_configuration_lib.h +++ b/src/include/gnunet_configuration_lib.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * @file include/gnunet_configuration_lib.h | 22 | * @file include/gnunet_configuration_lib.h |
23 | * @brief configuration API | 23 | * @brief configuration API |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @defgroup configuration Configuration management | 25 | * @defgroup configuration Configuration management |
26 | * @{ | 26 | * @{ |
27 | */ | 27 | */ |
28 | #ifndef GNUNET_CONFIGURATION_LIB_H | 28 | #ifndef GNUNET_CONFIGURATION_LIB_H |
@@ -324,9 +324,9 @@ GNUNET_CONFIGURATION_have_value (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
324 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 324 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
325 | */ | 325 | */ |
326 | int | 326 | int |
327 | GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg, | 327 | GNUNET_CONFIGURATION_get_value_string (const struct GNUNET_CONFIGURATION_Handle *cfg, |
328 | const char *section, | 328 | const char *section, |
329 | const char *option, | 329 | const char *option, |
330 | char **value); | 330 | char **value); |
331 | 331 | ||
332 | 332 | ||
diff --git a/src/include/gnunet_consensus_service.h b/src/include/gnunet_consensus_service.h index fc1255506..b7085a801 100644 --- a/src/include/gnunet_consensus_service.h +++ b/src/include/gnunet_consensus_service.h | |||
@@ -95,7 +95,7 @@ GNUNET_CONSENSUS_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
95 | * GNUNET_CONSENSUS_destroy instead. | 95 | * GNUNET_CONSENSUS_destroy instead. |
96 | * | 96 | * |
97 | * @param cls | 97 | * @param cls |
98 | * @param success GNUNET_OK on success, GNUNET_SYSERR if | 98 | * @param success GNUNET_OK on success, GNUNET_SYSERR if |
99 | * the insertion and thus the consensus failed for good | 99 | * the insertion and thus the consensus failed for good |
100 | */ | 100 | */ |
101 | typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls, | 101 | typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls, |
@@ -111,7 +111,7 @@ typedef void (*GNUNET_CONSENSUS_InsertDoneCallback) (void *cls, | |||
111 | * | 111 | * |
112 | * @param consensus handle for the consensus session | 112 | * @param consensus handle for the consensus session |
113 | * @param element the element to be inserted | 113 | * @param element the element to be inserted |
114 | * @param idc function called when we are done with this element and it | 114 | * @param idc function called when we are done with this element and it |
115 | * is thus allowed to call GNUNET_CONSENSUS_insert again | 115 | * is thus allowed to call GNUNET_CONSENSUS_insert again |
116 | * @param idc_cls closure for 'idc' | 116 | * @param idc_cls closure for 'idc' |
117 | */ | 117 | */ |
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h index 5f37f8922..730a3d6d7 100644 --- a/src/include/gnunet_constants.h +++ b/src/include/gnunet_constants.h | |||
@@ -119,7 +119,7 @@ extern "C" | |||
119 | 119 | ||
120 | /** | 120 | /** |
121 | * Largest block that can be stored in the DHT. | 121 | * Largest block that can be stored in the DHT. |
122 | */ | 122 | */ |
123 | #define GNUNET_CONSTANTS_MAX_BLOCK_SIZE (62 * 1024) | 123 | #define GNUNET_CONSTANTS_MAX_BLOCK_SIZE (62 * 1024) |
124 | 124 | ||
125 | 125 | ||
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index 39176e93b..00540d9ea 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h | |||
@@ -612,10 +612,10 @@ typedef int (*GNUNET_CONTAINER_HashMapIterator) (void *cls, | |||
612 | * @param len initial size (map will grow as needed) | 612 | * @param len initial size (map will grow as needed) |
613 | * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default; | 613 | * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default; |
614 | * #GNUNET_YES means that on 'put', the 'key' does not have | 614 | * #GNUNET_YES means that on 'put', the 'key' does not have |
615 | * to be copied as the destination of the pointer is | 615 | * to be copied as the destination of the pointer is |
616 | * guaranteed to be life as long as the value is stored in | 616 | * guaranteed to be life as long as the value is stored in |
617 | * the hashmap. This can significantly reduce memory | 617 | * the hashmap. This can significantly reduce memory |
618 | * consumption, but of course is also a recipie for | 618 | * consumption, but of course is also a recipie for |
619 | * heap corruption if the assumption is not true. Only | 619 | * heap corruption if the assumption is not true. Only |
620 | * use this if (1) memory use is important in this case and | 620 | * use this if (1) memory use is important in this case and |
621 | * (2) you have triple-checked that the invariant holds | 621 | * (2) you have triple-checked that the invariant holds |
@@ -649,7 +649,7 @@ GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap *map | |||
649 | * key-value pairs with value NULL | 649 | * key-value pairs with value NULL |
650 | */ | 650 | */ |
651 | void * | 651 | void * |
652 | GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *map, | 652 | GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *map, |
653 | const struct GNUNET_HashCode *key); | 653 | const struct GNUNET_HashCode *key); |
654 | 654 | ||
655 | 655 | ||
@@ -667,7 +667,7 @@ GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap *m | |||
667 | */ | 667 | */ |
668 | int | 668 | int |
669 | GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, | 669 | GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, |
670 | const struct GNUNET_HashCode *key, | 670 | const struct GNUNET_HashCode *key, |
671 | const void *value); | 671 | const void *value); |
672 | 672 | ||
673 | /** | 673 | /** |
@@ -680,7 +680,7 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, | |||
680 | * @return number of values removed | 680 | * @return number of values removed |
681 | */ | 681 | */ |
682 | int | 682 | int |
683 | GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap *map, | 683 | GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap *map, |
684 | const struct GNUNET_HashCode *key); | 684 | const struct GNUNET_HashCode *key); |
685 | 685 | ||
686 | 686 | ||
@@ -711,7 +711,7 @@ GNUNET_CONTAINER_multihashmap_contains (const struct GNUNET_CONTAINER_MultiHashM | |||
711 | * #GNUNET_NO if not | 711 | * #GNUNET_NO if not |
712 | */ | 712 | */ |
713 | int | 713 | int |
714 | GNUNET_CONTAINER_multihashmap_contains_value (const struct GNUNET_CONTAINER_MultiHashMap *map, | 714 | GNUNET_CONTAINER_multihashmap_contains_value (const struct GNUNET_CONTAINER_MultiHashMap *map, |
715 | const struct GNUNET_HashCode *key, | 715 | const struct GNUNET_HashCode *key, |
716 | const void *value); | 716 | const void *value); |
717 | 717 | ||
@@ -782,7 +782,7 @@ GNUNET_CONTAINER_multihashmap_iterator_create (const struct GNUNET_CONTAINER_Mul | |||
782 | 782 | ||
783 | 783 | ||
784 | /** | 784 | /** |
785 | * @ingroup hashmap | 785 | * @ingroup hashmap |
786 | * Retrieve the next element from the hash map at the iterator's | 786 | * Retrieve the next element from the hash map at the iterator's |
787 | * position. If there are no elements left, #GNUNET_NO is returned, | 787 | * position. If there are no elements left, #GNUNET_NO is returned, |
788 | * and @a key and @a value are not modified. This operation is only | 788 | * and @a key and @a value are not modified. This operation is only |
@@ -798,12 +798,12 @@ GNUNET_CONTAINER_multihashmap_iterator_create (const struct GNUNET_CONTAINER_Mul | |||
798 | */ | 798 | */ |
799 | int | 799 | int |
800 | GNUNET_CONTAINER_multihashmap_iterator_next (struct GNUNET_CONTAINER_MultiHashMapIterator *iter, | 800 | GNUNET_CONTAINER_multihashmap_iterator_next (struct GNUNET_CONTAINER_MultiHashMapIterator *iter, |
801 | struct GNUNET_HashCode *key, | 801 | struct GNUNET_HashCode *key, |
802 | const void **value); | 802 | const void **value); |
803 | 803 | ||
804 | 804 | ||
805 | /** | 805 | /** |
806 | * @ingroup hashmap | 806 | * @ingroup hashmap |
807 | * Destroy a multihashmap iterator. | 807 | * Destroy a multihashmap iterator. |
808 | * | 808 | * |
809 | * @param iter the iterator to destroy | 809 | * @param iter the iterator to destroy |
@@ -813,7 +813,7 @@ GNUNET_CONTAINER_multihashmap_iterator_destroy (struct GNUNET_CONTAINER_MultiHas | |||
813 | 813 | ||
814 | 814 | ||
815 | /** | 815 | /** |
816 | * @ingroup hashmap | 816 | * @ingroup hashmap |
817 | * Iterate over all entries in the map that match a particular key. | 817 | * Iterate over all entries in the map that match a particular key. |
818 | * | 818 | * |
819 | * @param map the map | 819 | * @param map the map |
@@ -856,10 +856,10 @@ typedef int (*GNUNET_CONTAINER_PeerMapIterator) (void *cls, | |||
856 | * @param len initial size (map will grow as needed) | 856 | * @param len initial size (map will grow as needed) |
857 | * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default; | 857 | * @param do_not_copy_keys #GNUNET_NO is always safe and should be used by default; |
858 | * #GNUNET_YES means that on 'put', the 'key' does not have | 858 | * #GNUNET_YES means that on 'put', the 'key' does not have |
859 | * to be copied as the destination of the pointer is | 859 | * to be copied as the destination of the pointer is |
860 | * guaranteed to be life as long as the value is stored in | 860 | * guaranteed to be life as long as the value is stored in |
861 | * the hashmap. This can significantly reduce memory | 861 | * the hashmap. This can significantly reduce memory |
862 | * consumption, but of course is also a recipie for | 862 | * consumption, but of course is also a recipie for |
863 | * heap corruption if the assumption is not true. Only | 863 | * heap corruption if the assumption is not true. Only |
864 | * use this if (1) memory use is important in this case and | 864 | * use this if (1) memory use is important in this case and |
865 | * (2) you have triple-checked that the invariant holds | 865 | * (2) you have triple-checked that the invariant holds |
@@ -893,7 +893,7 @@ GNUNET_CONTAINER_multipeermap_destroy (struct GNUNET_CONTAINER_MultiPeerMap *map | |||
893 | * key-value pairs with value NULL | 893 | * key-value pairs with value NULL |
894 | */ | 894 | */ |
895 | void * | 895 | void * |
896 | GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *map, | 896 | GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *map, |
897 | const struct GNUNET_PeerIdentity *key); | 897 | const struct GNUNET_PeerIdentity *key); |
898 | 898 | ||
899 | 899 | ||
@@ -911,7 +911,7 @@ GNUNET_CONTAINER_multipeermap_get (const struct GNUNET_CONTAINER_MultiPeerMap *m | |||
911 | */ | 911 | */ |
912 | int | 912 | int |
913 | GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map, | 913 | GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map, |
914 | const struct GNUNET_PeerIdentity * key, | 914 | const struct GNUNET_PeerIdentity * key, |
915 | const void *value); | 915 | const void *value); |
916 | 916 | ||
917 | /** | 917 | /** |
@@ -924,7 +924,7 @@ GNUNET_CONTAINER_multipeermap_remove (struct GNUNET_CONTAINER_MultiPeerMap *map, | |||
924 | * @return number of values removed | 924 | * @return number of values removed |
925 | */ | 925 | */ |
926 | int | 926 | int |
927 | GNUNET_CONTAINER_multipeermap_remove_all (struct GNUNET_CONTAINER_MultiPeerMap *map, | 927 | GNUNET_CONTAINER_multipeermap_remove_all (struct GNUNET_CONTAINER_MultiPeerMap *map, |
928 | const struct GNUNET_PeerIdentity *key); | 928 | const struct GNUNET_PeerIdentity *key); |
929 | 929 | ||
930 | 930 | ||
@@ -955,7 +955,7 @@ GNUNET_CONTAINER_multipeermap_contains (const struct GNUNET_CONTAINER_MultiPeerM | |||
955 | * #GNUNET_NO if not | 955 | * #GNUNET_NO if not |
956 | */ | 956 | */ |
957 | int | 957 | int |
958 | GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_MultiPeerMap *map, | 958 | GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_MultiPeerMap *map, |
959 | const struct GNUNET_PeerIdentity * key, | 959 | const struct GNUNET_PeerIdentity * key, |
960 | const void *value); | 960 | const void *value); |
961 | 961 | ||
@@ -975,7 +975,7 @@ GNUNET_CONTAINER_multipeermap_contains_value (const struct GNUNET_CONTAINER_Mult | |||
975 | */ | 975 | */ |
976 | int | 976 | int |
977 | GNUNET_CONTAINER_multipeermap_put (struct GNUNET_CONTAINER_MultiPeerMap *map, | 977 | GNUNET_CONTAINER_multipeermap_put (struct GNUNET_CONTAINER_MultiPeerMap *map, |
978 | const struct GNUNET_PeerIdentity *key, | 978 | const struct GNUNET_PeerIdentity *key, |
979 | void *value, | 979 | void *value, |
980 | enum GNUNET_CONTAINER_MultiHashMapOption opt); | 980 | enum GNUNET_CONTAINER_MultiHashMapOption opt); |
981 | 981 | ||
@@ -1025,7 +1025,7 @@ GNUNET_CONTAINER_multipeermap_iterator_create (const struct GNUNET_CONTAINER_Mul | |||
1025 | 1025 | ||
1026 | 1026 | ||
1027 | /** | 1027 | /** |
1028 | * @ingroup hashmap | 1028 | * @ingroup hashmap |
1029 | * Retrieve the next element from the hash map at the iterator's | 1029 | * Retrieve the next element from the hash map at the iterator's |
1030 | * position. If there are no elements left, #GNUNET_NO is returned, | 1030 | * position. If there are no elements left, #GNUNET_NO is returned, |
1031 | * and @a key and @a value are not modified. This operation is only | 1031 | * and @a key and @a value are not modified. This operation is only |
@@ -1041,12 +1041,12 @@ GNUNET_CONTAINER_multipeermap_iterator_create (const struct GNUNET_CONTAINER_Mul | |||
1041 | */ | 1041 | */ |
1042 | int | 1042 | int |
1043 | GNUNET_CONTAINER_multipeermap_iterator_next (struct GNUNET_CONTAINER_MultiPeerMapIterator *iter, | 1043 | GNUNET_CONTAINER_multipeermap_iterator_next (struct GNUNET_CONTAINER_MultiPeerMapIterator *iter, |
1044 | struct GNUNET_PeerIdentity *key, | 1044 | struct GNUNET_PeerIdentity *key, |
1045 | const void **value); | 1045 | const void **value); |
1046 | 1046 | ||
1047 | 1047 | ||
1048 | /** | 1048 | /** |
1049 | * @ingroup hashmap | 1049 | * @ingroup hashmap |
1050 | * Destroy a multipeermap iterator. | 1050 | * Destroy a multipeermap iterator. |
1051 | * | 1051 | * |
1052 | * @param iter the iterator to destroy | 1052 | * @param iter the iterator to destroy |
@@ -1056,7 +1056,7 @@ GNUNET_CONTAINER_multipeermap_iterator_destroy (struct GNUNET_CONTAINER_MultiPee | |||
1056 | 1056 | ||
1057 | 1057 | ||
1058 | /** | 1058 | /** |
1059 | * @ingroup hashmap | 1059 | * @ingroup hashmap |
1060 | * Iterate over all entries in the map that match a particular key. | 1060 | * Iterate over all entries in the map that match a particular key. |
1061 | * | 1061 | * |
1062 | * @param map the map | 1062 | * @param map the map |
@@ -1077,14 +1077,14 @@ GNUNET_CONTAINER_multipeermap_get_multiple (const struct GNUNET_CONTAINER_MultiP | |||
1077 | /* Version of multihashmap with 32 bit keys */ | 1077 | /* Version of multihashmap with 32 bit keys */ |
1078 | 1078 | ||
1079 | /** | 1079 | /** |
1080 | * @ingroup hashmap | 1080 | * @ingroup hashmap |
1081 | * Opaque handle for the 32-bit key HashMap. | 1081 | * Opaque handle for the 32-bit key HashMap. |
1082 | */ | 1082 | */ |
1083 | struct GNUNET_CONTAINER_MultiHashMap32; | 1083 | struct GNUNET_CONTAINER_MultiHashMap32; |
1084 | 1084 | ||
1085 | 1085 | ||
1086 | /** | 1086 | /** |
1087 | * @ingroup hashmap | 1087 | * @ingroup hashmap |
1088 | * Iterator over hash map entries. | 1088 | * Iterator over hash map entries. |
1089 | * | 1089 | * |
1090 | * @param cls closure | 1090 | * @param cls closure |
@@ -1100,7 +1100,7 @@ typedef int (*GNUNET_CONTAINER_HashMapIterator32) (void *cls, | |||
1100 | 1100 | ||
1101 | 1101 | ||
1102 | /** | 1102 | /** |
1103 | * @ingroup hashmap | 1103 | * @ingroup hashmap |
1104 | * Create a 32-bit key multi hash map. | 1104 | * Create a 32-bit key multi hash map. |
1105 | * | 1105 | * |
1106 | * @param len initial size (map will grow as needed) | 1106 | * @param len initial size (map will grow as needed) |
@@ -1111,7 +1111,7 @@ GNUNET_CONTAINER_multihashmap32_create (unsigned int len); | |||
1111 | 1111 | ||
1112 | 1112 | ||
1113 | /** | 1113 | /** |
1114 | * @ingroup hashmap | 1114 | * @ingroup hashmap |
1115 | * Destroy a 32-bit key hash map. Will not free any values | 1115 | * Destroy a 32-bit key hash map. Will not free any values |
1116 | * stored in the hash map! | 1116 | * stored in the hash map! |
1117 | * | 1117 | * |
@@ -1123,7 +1123,7 @@ GNUNET_CONTAINER_multihashmap32_destroy (struct GNUNET_CONTAINER_MultiHashMap32 | |||
1123 | 1123 | ||
1124 | 1124 | ||
1125 | /** | 1125 | /** |
1126 | * @ingroup hashmap | 1126 | * @ingroup hashmap |
1127 | * Get the number of key-value pairs in the map. | 1127 | * Get the number of key-value pairs in the map. |
1128 | * | 1128 | * |
1129 | * @param map the map | 1129 | * @param map the map |
@@ -1135,7 +1135,7 @@ GNUNET_CONTAINER_multihashmap32_size (const struct | |||
1135 | 1135 | ||
1136 | 1136 | ||
1137 | /** | 1137 | /** |
1138 | * @ingroup hashmap | 1138 | * @ingroup hashmap |
1139 | * Given a key find a value in the map matching the key. | 1139 | * Given a key find a value in the map matching the key. |
1140 | * | 1140 | * |
1141 | * @param map the map | 1141 | * @param map the map |
@@ -1146,13 +1146,13 @@ GNUNET_CONTAINER_multihashmap32_size (const struct | |||
1146 | * key-value pairs with value NULL | 1146 | * key-value pairs with value NULL |
1147 | */ | 1147 | */ |
1148 | void * | 1148 | void * |
1149 | GNUNET_CONTAINER_multihashmap32_get (const struct | 1149 | GNUNET_CONTAINER_multihashmap32_get (const struct |
1150 | GNUNET_CONTAINER_MultiHashMap32 *map, | 1150 | GNUNET_CONTAINER_MultiHashMap32 *map, |
1151 | uint32_t key); | 1151 | uint32_t key); |
1152 | 1152 | ||
1153 | 1153 | ||
1154 | /** | 1154 | /** |
1155 | * @ingroup hashmap | 1155 | * @ingroup hashmap |
1156 | * Iterate over all entries in the map. | 1156 | * Iterate over all entries in the map. |
1157 | * | 1157 | * |
1158 | * @param map the map | 1158 | * @param map the map |
@@ -1169,7 +1169,7 @@ GNUNET_CONTAINER_multihashmap32_iterate (const struct | |||
1169 | 1169 | ||
1170 | 1170 | ||
1171 | /** | 1171 | /** |
1172 | * @ingroup hashmap | 1172 | * @ingroup hashmap |
1173 | * Remove the given key-value pair from the map. Note that if the | 1173 | * Remove the given key-value pair from the map. Note that if the |
1174 | * key-value pair is in the map multiple times, only one of the pairs | 1174 | * key-value pair is in the map multiple times, only one of the pairs |
1175 | * will be removed. | 1175 | * will be removed. |
@@ -1182,12 +1182,12 @@ GNUNET_CONTAINER_multihashmap32_iterate (const struct | |||
1182 | */ | 1182 | */ |
1183 | int | 1183 | int |
1184 | GNUNET_CONTAINER_multihashmap32_remove (struct GNUNET_CONTAINER_MultiHashMap32 *map, | 1184 | GNUNET_CONTAINER_multihashmap32_remove (struct GNUNET_CONTAINER_MultiHashMap32 *map, |
1185 | uint32_t key, | 1185 | uint32_t key, |
1186 | const void *value); | 1186 | const void *value); |
1187 | 1187 | ||
1188 | 1188 | ||
1189 | /** | 1189 | /** |
1190 | * @ingroup hashmap | 1190 | * @ingroup hashmap |
1191 | * Remove all entries for the given key from the map. | 1191 | * Remove all entries for the given key from the map. |
1192 | * Note that the values would not be "freed". | 1192 | * Note that the values would not be "freed". |
1193 | * | 1193 | * |
@@ -1201,7 +1201,7 @@ GNUNET_CONTAINER_multihashmap32_remove_all (struct GNUNET_CONTAINER_MultiHashMap | |||
1201 | 1201 | ||
1202 | 1202 | ||
1203 | /** | 1203 | /** |
1204 | * @ingroup hashmap | 1204 | * @ingroup hashmap |
1205 | * Check if the map contains any value under the given | 1205 | * Check if the map contains any value under the given |
1206 | * key (including values that are NULL). | 1206 | * key (including values that are NULL). |
1207 | * | 1207 | * |
@@ -1216,7 +1216,7 @@ GNUNET_CONTAINER_multihashmap32_contains (const struct GNUNET_CONTAINER_MultiHas | |||
1216 | 1216 | ||
1217 | 1217 | ||
1218 | /** | 1218 | /** |
1219 | * @ingroup hashmap | 1219 | * @ingroup hashmap |
1220 | * Check if the map contains the given value under the given | 1220 | * Check if the map contains the given value under the given |
1221 | * key. | 1221 | * key. |
1222 | * | 1222 | * |
@@ -1227,13 +1227,13 @@ GNUNET_CONTAINER_multihashmap32_contains (const struct GNUNET_CONTAINER_MultiHas | |||
1227 | * #GNUNET_NO if not | 1227 | * #GNUNET_NO if not |
1228 | */ | 1228 | */ |
1229 | int | 1229 | int |
1230 | GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_MultiHashMap32 *map, | 1230 | GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_MultiHashMap32 *map, |
1231 | uint32_t key, | 1231 | uint32_t key, |
1232 | const void *value); | 1232 | const void *value); |
1233 | 1233 | ||
1234 | 1234 | ||
1235 | /** | 1235 | /** |
1236 | * @ingroup hashmap | 1236 | * @ingroup hashmap |
1237 | * Store a key-value pair in the map. | 1237 | * Store a key-value pair in the map. |
1238 | * | 1238 | * |
1239 | * @param map the map | 1239 | * @param map the map |
@@ -1246,14 +1246,14 @@ GNUNET_CONTAINER_multihashmap32_contains_value (const struct GNUNET_CONTAINER_Mu | |||
1246 | * value already exists | 1246 | * value already exists |
1247 | */ | 1247 | */ |
1248 | int | 1248 | int |
1249 | GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map, | 1249 | GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map, |
1250 | uint32_t key, | 1250 | uint32_t key, |
1251 | void *value, | 1251 | void *value, |
1252 | enum GNUNET_CONTAINER_MultiHashMapOption opt); | 1252 | enum GNUNET_CONTAINER_MultiHashMapOption opt); |
1253 | 1253 | ||
1254 | 1254 | ||
1255 | /** | 1255 | /** |
1256 | * @ingroup hashmap | 1256 | * @ingroup hashmap |
1257 | * Iterate over all entries in the map that match a particular key. | 1257 | * Iterate over all entries in the map that match a particular key. |
1258 | * | 1258 | * |
1259 | * @param map the map | 1259 | * @param map the map |
@@ -1264,7 +1264,7 @@ GNUNET_CONTAINER_multihashmap32_put (struct GNUNET_CONTAINER_MultiHashMap32 *map | |||
1264 | * #GNUNET_SYSERR if it aborted iteration | 1264 | * #GNUNET_SYSERR if it aborted iteration |
1265 | */ | 1265 | */ |
1266 | int | 1266 | int |
1267 | GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_MultiHashMap32 *map, | 1267 | GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_MultiHashMap32 *map, |
1268 | uint32_t key, | 1268 | uint32_t key, |
1269 | GNUNET_CONTAINER_HashMapIterator32 it, | 1269 | GNUNET_CONTAINER_HashMapIterator32 it, |
1270 | void *it_cls); | 1270 | void *it_cls); |
@@ -1276,7 +1276,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1276 | /* To avoid mistakes: head->prev == tail->next == NULL */ | 1276 | /* To avoid mistakes: head->prev == tail->next == NULL */ |
1277 | 1277 | ||
1278 | /** | 1278 | /** |
1279 | * @ingroup dll | 1279 | * @ingroup dll |
1280 | * Insert an element at the head of a DLL. Assumes that head, tail and | 1280 | * Insert an element at the head of a DLL. Assumes that head, tail and |
1281 | * element are structs with prev and next fields. | 1281 | * element are structs with prev and next fields. |
1282 | * | 1282 | * |
@@ -1297,7 +1297,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1297 | 1297 | ||
1298 | 1298 | ||
1299 | /** | 1299 | /** |
1300 | * @ingroup dll | 1300 | * @ingroup dll |
1301 | * Insert an element at the tail of a DLL. Assumes that head, tail and | 1301 | * Insert an element at the tail of a DLL. Assumes that head, tail and |
1302 | * element are structs with prev and next fields. | 1302 | * element are structs with prev and next fields. |
1303 | * | 1303 | * |
@@ -1318,7 +1318,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1318 | 1318 | ||
1319 | 1319 | ||
1320 | /** | 1320 | /** |
1321 | * @ingroup dll | 1321 | * @ingroup dll |
1322 | * Insert an element into a DLL after the given other element. Insert | 1322 | * Insert an element into a DLL after the given other element. Insert |
1323 | * at the head if the other element is NULL. | 1323 | * at the head if the other element is NULL. |
1324 | * | 1324 | * |
@@ -1348,7 +1348,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1348 | 1348 | ||
1349 | 1349 | ||
1350 | /** | 1350 | /** |
1351 | * @ingroup dll | 1351 | * @ingroup dll |
1352 | * Insert an element into a DLL before the given other element. Insert | 1352 | * Insert an element into a DLL before the given other element. Insert |
1353 | * at the tail if the other element is NULL. | 1353 | * at the tail if the other element is NULL. |
1354 | * | 1354 | * |
@@ -1378,7 +1378,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1378 | 1378 | ||
1379 | 1379 | ||
1380 | /** | 1380 | /** |
1381 | * @ingroup dll | 1381 | * @ingroup dll |
1382 | * Remove an element from a DLL. Assumes that head, tail and | 1382 | * Remove an element from a DLL. Assumes that head, tail and |
1383 | * element point to structs with prev and next fields. | 1383 | * element point to structs with prev and next fields. |
1384 | * | 1384 | * |
@@ -1410,7 +1410,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1410 | in multiple lists at the same time *********************** */ | 1410 | in multiple lists at the same time *********************** */ |
1411 | 1411 | ||
1412 | /** | 1412 | /** |
1413 | * @ingroup dll | 1413 | * @ingroup dll |
1414 | * Insert an element at the head of a MDLL. Assumes that head, tail and | 1414 | * Insert an element at the head of a MDLL. Assumes that head, tail and |
1415 | * element are structs with prev and next fields. | 1415 | * element are structs with prev and next fields. |
1416 | * | 1416 | * |
@@ -1432,7 +1432,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1432 | 1432 | ||
1433 | 1433 | ||
1434 | /** | 1434 | /** |
1435 | * @ingroup dll | 1435 | * @ingroup dll |
1436 | * Insert an element at the tail of a MDLL. Assumes that head, tail and | 1436 | * Insert an element at the tail of a MDLL. Assumes that head, tail and |
1437 | * element are structs with prev and next fields. | 1437 | * element are structs with prev and next fields. |
1438 | * | 1438 | * |
@@ -1454,7 +1454,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1454 | 1454 | ||
1455 | 1455 | ||
1456 | /** | 1456 | /** |
1457 | * @ingroup dll | 1457 | * @ingroup dll |
1458 | * Insert an element into a MDLL after the given other element. Insert | 1458 | * Insert an element into a MDLL after the given other element. Insert |
1459 | * at the head if the other element is NULL. | 1459 | * at the head if the other element is NULL. |
1460 | * | 1460 | * |
@@ -1485,7 +1485,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1485 | 1485 | ||
1486 | 1486 | ||
1487 | /** | 1487 | /** |
1488 | * @ingroup dll | 1488 | * @ingroup dll |
1489 | * Insert an element into a MDLL before the given other element. Insert | 1489 | * Insert an element into a MDLL before the given other element. Insert |
1490 | * at the tail if the other element is NULL. | 1490 | * at the tail if the other element is NULL. |
1491 | * | 1491 | * |
@@ -1516,7 +1516,7 @@ GNUNET_CONTAINER_multihashmap32_get_multiple (const struct GNUNET_CONTAINER_Mult | |||
1516 | 1516 | ||
1517 | 1517 | ||
1518 | /** | 1518 | /** |
1519 | * @ingroup dll | 1519 | * @ingroup dll |
1520 | * Remove an element from a MDLL. Assumes | 1520 | * Remove an element from a MDLL. Assumes |
1521 | * that head, tail and element are structs | 1521 | * that head, tail and element are structs |
1522 | * with prev and next fields. | 1522 | * with prev and next fields. |
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index cb84fcc67..3ef3c2f3d 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h | |||
@@ -1,17 +1,17 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
7 | by the Free Software Foundation; either version 3, or (at your | 7 | by the Free Software Foundation; either version 3, or (at your |
8 | option) any later version. | 8 | option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | General Public License for more details. | 13 | General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with GNUnet; see the file COPYING. If not, write to the | 16 | along with GNUnet; see the file COPYING. If not, write to the |
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
@@ -25,7 +25,7 @@ | |||
25 | * @author Andreas Fuchs | 25 | * @author Andreas Fuchs |
26 | * @author Christian Grothoff | 26 | * @author Christian Grothoff |
27 | * | 27 | * |
28 | * | 28 | * |
29 | * NOTE: This API is deliberately deceptively simple; the idea | 29 | * NOTE: This API is deliberately deceptively simple; the idea |
30 | * is that advanced features (such as answering machines) will | 30 | * is that advanced features (such as answering machines) will |
31 | * be done with a separate service (an answering machine service) | 31 | * be done with a separate service (an answering machine service) |
@@ -109,17 +109,17 @@ struct GNUNET_CONVERSATION_PhoneRecord | |||
109 | enum GNUNET_CONVERSATION_EventCode | 109 | enum GNUNET_CONVERSATION_EventCode |
110 | { | 110 | { |
111 | /** | 111 | /** |
112 | * The phone is ringing, caller ID is provided in the varargs as | 112 | * The phone is ringing, caller ID is provided in the varargs as |
113 | * a `const char *`. The caller ID will be a GNS name. | 113 | * a `const char *`. The caller ID will be a GNS name. |
114 | */ | 114 | */ |
115 | GNUNET_CONVERSATION_EC_RING, | 115 | GNUNET_CONVERSATION_EC_RING, |
116 | 116 | ||
117 | /** | 117 | /** |
118 | * We are the caller and are now ringing the other party. | 118 | * We are the caller and are now ringing the other party. |
119 | * The varargs will be empty. | 119 | * The varargs will be empty. |
120 | */ | 120 | */ |
121 | GNUNET_CONVERSATION_EC_RINGING, | 121 | GNUNET_CONVERSATION_EC_RINGING, |
122 | 122 | ||
123 | /** | 123 | /** |
124 | * We are ready to talk, metadata about the call may be supplied | 124 | * We are ready to talk, metadata about the call may be supplied |
125 | * as a `const char *` in the varargs. | 125 | * as a `const char *` in the varargs. |
@@ -139,7 +139,7 @@ enum GNUNET_CONVERSATION_EventCode | |||
139 | * client must no longer call #GNUNET_CONVERSATION_call_stop. | 139 | * client must no longer call #GNUNET_CONVERSATION_call_stop. |
140 | */ | 140 | */ |
141 | GNUNET_CONVERSATION_EC_BUSY, | 141 | GNUNET_CONVERSATION_EC_BUSY, |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * The conversation was terminated, a reason may be supplied as a | 144 | * The conversation was terminated, a reason may be supplied as a |
145 | * `const char *` in the varargs. After this invocation, the | 145 | * `const char *` in the varargs. After this invocation, the |
@@ -147,7 +147,7 @@ enum GNUNET_CONVERSATION_EventCode | |||
147 | * client must no longer call #GNUNET_CONVERSATION_call_stop. | 147 | * client must no longer call #GNUNET_CONVERSATION_call_stop. |
148 | */ | 148 | */ |
149 | GNUNET_CONVERSATION_EC_TERMINATED | 149 | GNUNET_CONVERSATION_EC_TERMINATED |
150 | 150 | ||
151 | }; | 151 | }; |
152 | 152 | ||
153 | 153 | ||
@@ -207,7 +207,7 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone, | |||
207 | 207 | ||
208 | 208 | ||
209 | /** | 209 | /** |
210 | * Picks up a (ringing) phone. This will connect the speaker | 210 | * Picks up a (ringing) phone. This will connect the speaker |
211 | * to the microphone of the other party, and vice versa. | 211 | * to the microphone of the other party, and vice versa. |
212 | * | 212 | * |
213 | * @param phone phone to pick up | 213 | * @param phone phone to pick up |
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 19c2acbdf..64daadcea 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -281,7 +281,7 @@ GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
281 | * expected to track which peers are connected based on the connect/disconnect | 281 | * expected to track which peers are connected based on the connect/disconnect |
282 | * callbacks from #GNUNET_CORE_connect. This function is NOT part of the | 282 | * callbacks from #GNUNET_CORE_connect. This function is NOT part of the |
283 | * 'versioned', 'official' API. This function returns | 283 | * 'versioned', 'official' API. This function returns |
284 | * synchronously after looking in the CORE API cache. | 284 | * synchronously after looking in the CORE API cache. |
285 | * | 285 | * |
286 | * @param h the core handle | 286 | * @param h the core handle |
287 | * @param pid the identity of the peer to check if it has been connected to us | 287 | * @param pid the identity of the peer to check if it has been connected to us |
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index eda23077b..c9cae17a2 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
@@ -202,7 +202,7 @@ struct GNUNET_PeerIdentity | |||
202 | * Public ECC key (always for NIST P-521) encoded in a format suitable | 202 | * Public ECC key (always for NIST P-521) encoded in a format suitable |
203 | * for network transmission and encryption (ECDH). | 203 | * for network transmission and encryption (ECDH). |
204 | */ | 204 | */ |
205 | struct GNUNET_CRYPTO_EccPublicEncryptKey | 205 | struct GNUNET_CRYPTO_EccPublicEncryptKey |
206 | { | 206 | { |
207 | /** | 207 | /** |
208 | * Q consists of an x- and a y-value, each mod p (256 bits), | 208 | * Q consists of an x- and a y-value, each mod p (256 bits), |
@@ -397,7 +397,7 @@ GNUNET_CRYPTO_symmetric_create_session_key (struct GNUNET_CRYPTO_SymmetricSessio | |||
397 | ssize_t | 397 | ssize_t |
398 | GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len, | 398 | GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len, |
399 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, | 399 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, |
400 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 400 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
401 | void *result); | 401 | void *result); |
402 | 402 | ||
403 | 403 | ||
@@ -415,7 +415,7 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len, | |||
415 | ssize_t | 415 | ssize_t |
416 | GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, | 416 | GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size, |
417 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, | 417 | const struct GNUNET_CRYPTO_SymmetricSessionKey *sessionkey, |
418 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 418 | const struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
419 | void *result); | 419 | void *result); |
420 | 420 | ||
421 | 421 | ||
@@ -446,8 +446,8 @@ GNUNET_CRYPTO_symmetric_derive_iv (struct GNUNET_CRYPTO_SymmetricInitializationV | |||
446 | void | 446 | void |
447 | GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, | 447 | GNUNET_CRYPTO_symmetric_derive_iv_v (struct GNUNET_CRYPTO_SymmetricInitializationVector *iv, |
448 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, | 448 | const struct GNUNET_CRYPTO_SymmetricSessionKey *skey, |
449 | const void *salt, | 449 | const void *salt, |
450 | size_t salt_len, | 450 | size_t salt_len, |
451 | va_list argp); | 451 | va_list argp); |
452 | 452 | ||
453 | 453 | ||
@@ -653,7 +653,7 @@ GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode * hc, | |||
653 | * @return Bit \a bit from hashcode \a code, -1 for invalid index | 653 | * @return Bit \a bit from hashcode \a code, -1 for invalid index |
654 | */ | 654 | */ |
655 | int | 655 | int |
656 | GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code, | 656 | GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode *code, |
657 | unsigned int bit); | 657 | unsigned int bit); |
658 | 658 | ||
659 | 659 | ||
@@ -865,7 +865,7 @@ GNUNET_CRYPTO_ecc_public_sign_key_to_string (const struct GNUNET_CRYPTO_EccPubli | |||
865 | * @return #GNUNET_OK on success | 865 | * @return #GNUNET_OK on success |
866 | */ | 866 | */ |
867 | int | 867 | int |
868 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (const char *enc, | 868 | GNUNET_CRYPTO_ecc_public_sign_key_from_string (const char *enc, |
869 | size_t enclen, | 869 | size_t enclen, |
870 | struct GNUNET_CRYPTO_EccPublicSignKey *pub); | 870 | struct GNUNET_CRYPTO_EccPublicSignKey *pub); |
871 | 871 | ||
@@ -890,7 +890,7 @@ GNUNET_CRYPTO_ecc_public_encrypt_key_to_string (const struct GNUNET_CRYPTO_EccPu | |||
890 | * @return #GNUNET_OK on success | 890 | * @return #GNUNET_OK on success |
891 | */ | 891 | */ |
892 | int | 892 | int |
893 | GNUNET_CRYPTO_ecc_public_encrypt_key_from_string (const char *enc, | 893 | GNUNET_CRYPTO_ecc_public_encrypt_key_from_string (const char *enc, |
894 | size_t enclen, | 894 | size_t enclen, |
895 | struct GNUNET_CRYPTO_EccPublicEncryptKey *pub); | 895 | struct GNUNET_CRYPTO_EccPublicEncryptKey *pub); |
896 | 896 | ||
@@ -939,7 +939,7 @@ GNUNET_CRYPTO_ecc_key_create (void); | |||
939 | 939 | ||
940 | /** | 940 | /** |
941 | * @ingroup crypto | 941 | * @ingroup crypto |
942 | * Clear memory that was used to store a private key. | 942 | * Clear memory that was used to store a private key. |
943 | * | 943 | * |
944 | * @param pk location of the key | 944 | * @param pk location of the key |
945 | */ | 945 | */ |
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index 0099666d6..082173fff 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h | |||
@@ -140,7 +140,7 @@ typedef int (*PluginPut) (void *cls, const struct GNUNET_HashCode * key, uint32_ | |||
140 | * @param key key in the data store | 140 | * @param key key in the data store |
141 | * @param count how many values are stored under this key in the datastore | 141 | * @param count how many values are stored under this key in the datastore |
142 | */ | 142 | */ |
143 | typedef void (*PluginKeyProcessor) (void *cls, | 143 | typedef void (*PluginKeyProcessor) (void *cls, |
144 | const struct GNUNET_HashCode *key, | 144 | const struct GNUNET_HashCode *key, |
145 | unsigned int count); | 145 | unsigned int count); |
146 | 146 | ||
@@ -322,7 +322,7 @@ struct GNUNET_DATASTORE_PluginFunctions | |||
322 | * Iterate over all keys in the database. | 322 | * Iterate over all keys in the database. |
323 | */ | 323 | */ |
324 | PluginGetKeys get_keys; | 324 | PluginGetKeys get_keys; |
325 | 325 | ||
326 | }; | 326 | }; |
327 | 327 | ||
328 | 328 | ||
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index 1370e6bd9..3e59f2b6d 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h | |||
@@ -165,7 +165,7 @@ typedef void (*GNUNET_DHT_PutContinuation)(void *cls, | |||
165 | * (size too big) | 165 | * (size too big) |
166 | */ | 166 | */ |
167 | struct GNUNET_DHT_PutHandle * | 167 | struct GNUNET_DHT_PutHandle * |
168 | GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, | 168 | GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, |
169 | const struct GNUNET_HashCode *key, | 169 | const struct GNUNET_HashCode *key, |
170 | uint32_t desired_replication_level, | 170 | uint32_t desired_replication_level, |
171 | enum GNUNET_DHT_RouteOption options, | 171 | enum GNUNET_DHT_RouteOption options, |
@@ -182,7 +182,7 @@ GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, | |||
182 | * go out over the network (we can't stop that); However, if the PUT | 182 | * go out over the network (we can't stop that); However, if the PUT |
183 | * has not yet been sent to the service, cancelling the PUT will stop | 183 | * has not yet been sent to the service, cancelling the PUT will stop |
184 | * this from happening (but there is no way for the user of this API | 184 | * this from happening (but there is no way for the user of this API |
185 | * to tell if that is the case). The only use for this API is to | 185 | * to tell if that is the case). The only use for this API is to |
186 | * prevent a later call to 'cont' from #GNUNET_DHT_put (i.e. because | 186 | * prevent a later call to 'cont' from #GNUNET_DHT_put (i.e. because |
187 | * the system is shutting down). | 187 | * the system is shutting down). |
188 | * | 188 | * |
@@ -212,9 +212,9 @@ GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph); | |||
212 | typedef void (*GNUNET_DHT_GetIterator) (void *cls, | 212 | typedef void (*GNUNET_DHT_GetIterator) (void *cls, |
213 | struct GNUNET_TIME_Absolute exp, | 213 | struct GNUNET_TIME_Absolute exp, |
214 | const struct GNUNET_HashCode *key, | 214 | const struct GNUNET_HashCode *key, |
215 | const struct GNUNET_PeerIdentity *get_path, | 215 | const struct GNUNET_PeerIdentity *get_path, |
216 | unsigned int get_path_length, | 216 | unsigned int get_path_length, |
217 | const struct GNUNET_PeerIdentity *put_path, | 217 | const struct GNUNET_PeerIdentity *put_path, |
218 | unsigned int put_path_length, | 218 | unsigned int put_path_length, |
219 | enum GNUNET_BLOCK_Type type, | 219 | enum GNUNET_BLOCK_Type type, |
220 | size_t size, const void *data); | 220 | size_t size, const void *data); |
@@ -239,11 +239,11 @@ typedef void (*GNUNET_DHT_GetIterator) (void *cls, | |||
239 | */ | 239 | */ |
240 | struct GNUNET_DHT_GetHandle * | 240 | struct GNUNET_DHT_GetHandle * |
241 | GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, | 241 | GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, |
242 | enum GNUNET_BLOCK_Type type, | 242 | enum GNUNET_BLOCK_Type type, |
243 | const struct GNUNET_HashCode *key, | 243 | const struct GNUNET_HashCode *key, |
244 | uint32_t desired_replication_level, | 244 | uint32_t desired_replication_level, |
245 | enum GNUNET_DHT_RouteOption options, | 245 | enum GNUNET_DHT_RouteOption options, |
246 | const void *xquery, size_t xquery_size, | 246 | const void *xquery, size_t xquery_size, |
247 | GNUNET_DHT_GetIterator iter, void *iter_cls); | 247 | GNUNET_DHT_GetIterator iter, void *iter_cls); |
248 | 248 | ||
249 | 249 | ||
@@ -297,7 +297,7 @@ typedef void (*GNUNET_DHT_MonitorGetCB) (void *cls, | |||
297 | enum GNUNET_DHT_RouteOption options, | 297 | enum GNUNET_DHT_RouteOption options, |
298 | enum GNUNET_BLOCK_Type type, | 298 | enum GNUNET_BLOCK_Type type, |
299 | uint32_t hop_count, | 299 | uint32_t hop_count, |
300 | uint32_t desired_replication_level, | 300 | uint32_t desired_replication_level, |
301 | unsigned int path_length, | 301 | unsigned int path_length, |
302 | const struct GNUNET_PeerIdentity *path, | 302 | const struct GNUNET_PeerIdentity *path, |
303 | const struct GNUNET_HashCode * key); | 303 | const struct GNUNET_HashCode * key); |
@@ -346,7 +346,7 @@ typedef void (*GNUNET_DHT_MonitorPutCB) (void *cls, | |||
346 | enum GNUNET_DHT_RouteOption options, | 346 | enum GNUNET_DHT_RouteOption options, |
347 | enum GNUNET_BLOCK_Type type, | 347 | enum GNUNET_BLOCK_Type type, |
348 | uint32_t hop_count, | 348 | uint32_t hop_count, |
349 | uint32_t desired_replication_level, | 349 | uint32_t desired_replication_level, |
350 | unsigned int path_length, | 350 | unsigned int path_length, |
351 | const struct GNUNET_PeerIdentity *path, | 351 | const struct GNUNET_PeerIdentity *path, |
352 | struct GNUNET_TIME_Absolute exp, | 352 | struct GNUNET_TIME_Absolute exp, |
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index 0a3abce49..369f09492 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h | |||
@@ -43,8 +43,8 @@ enum GNUNET_FILE_Type | |||
43 | { | 43 | { |
44 | /** | 44 | /** |
45 | * Handle represents a file. | 45 | * Handle represents a file. |
46 | */ | 46 | */ |
47 | GNUNET_DISK_HANLDE_TYPE_FILE, | 47 | GNUNET_DISK_HANLDE_TYPE_FILE, |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Handle represents a pipe. | 50 | * Handle represents a pipe. |
@@ -157,7 +157,7 @@ enum GNUNET_DISK_MapType | |||
157 | * Read-only memory map. | 157 | * Read-only memory map. |
158 | */ | 158 | */ |
159 | GNUNET_DISK_MAP_TYPE_READ = 1, | 159 | GNUNET_DISK_MAP_TYPE_READ = 1, |
160 | 160 | ||
161 | /** | 161 | /** |
162 | * Write-able memory map. | 162 | * Write-able memory map. |
163 | */ | 163 | */ |
@@ -328,7 +328,7 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, OFF_T offset, | |||
328 | */ | 328 | */ |
329 | int | 329 | int |
330 | GNUNET_DISK_file_size (const char *filename, uint64_t *size, | 330 | GNUNET_DISK_file_size (const char *filename, uint64_t *size, |
331 | int include_symbolic_links, | 331 | int include_symbolic_links, |
332 | int single_file_mode); | 332 | int single_file_mode); |
333 | 333 | ||
334 | 334 | ||
@@ -348,7 +348,7 @@ GNUNET_DISK_file_size (const char *filename, uint64_t *size, | |||
348 | * @return GNUNET_OK on success | 348 | * @return GNUNET_OK on success |
349 | */ | 349 | */ |
350 | int | 350 | int |
351 | GNUNET_DISK_file_get_identifiers (const char *filename, | 351 | GNUNET_DISK_file_get_identifiers (const char *filename, |
352 | uint64_t *dev, | 352 | uint64_t *dev, |
353 | uint64_t *ino); | 353 | uint64_t *ino); |
354 | 354 | ||
@@ -394,7 +394,7 @@ GNUNET_DISK_mkdtemp (const char *t); | |||
394 | * @return IO handle on success, NULL on error | 394 | * @return IO handle on success, NULL on error |
395 | */ | 395 | */ |
396 | struct GNUNET_DISK_FileHandle * | 396 | struct GNUNET_DISK_FileHandle * |
397 | GNUNET_DISK_file_open (const char *fn, | 397 | GNUNET_DISK_file_open (const char *fn, |
398 | enum GNUNET_DISK_OpenFlags flags, | 398 | enum GNUNET_DISK_OpenFlags flags, |
399 | enum GNUNET_DISK_AccessPermissions perm); | 399 | enum GNUNET_DISK_AccessPermissions perm); |
400 | 400 | ||
@@ -421,9 +421,9 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh, | |||
421 | * @return handle to the new pipe, NULL on error | 421 | * @return handle to the new pipe, NULL on error |
422 | */ | 422 | */ |
423 | struct GNUNET_DISK_PipeHandle * | 423 | struct GNUNET_DISK_PipeHandle * |
424 | GNUNET_DISK_pipe (int blocking_read, | 424 | GNUNET_DISK_pipe (int blocking_read, |
425 | int blocking_write, | 425 | int blocking_write, |
426 | int inherit_read, | 426 | int inherit_read, |
427 | int inherit_write); | 427 | int inherit_write); |
428 | 428 | ||
429 | 429 | ||
@@ -438,8 +438,8 @@ GNUNET_DISK_pipe (int blocking_read, | |||
438 | * @return handle to the new pipe, NULL on error | 438 | * @return handle to the new pipe, NULL on error |
439 | */ | 439 | */ |
440 | struct GNUNET_DISK_PipeHandle * | 440 | struct GNUNET_DISK_PipeHandle * |
441 | GNUNET_DISK_pipe_from_fd (int blocking_read, | 441 | GNUNET_DISK_pipe_from_fd (int blocking_read, |
442 | int blocking_write, | 442 | int blocking_write, |
443 | int fd[2]); | 443 | int fd[2]); |
444 | 444 | ||
445 | 445 | ||
@@ -544,7 +544,7 @@ GNUNET_DISK_get_handle_from_native (FILE *fd); | |||
544 | * @return the number of bytes read on success, #GNUNET_SYSERR on failure | 544 | * @return the number of bytes read on success, #GNUNET_SYSERR on failure |
545 | */ | 545 | */ |
546 | ssize_t | 546 | ssize_t |
547 | GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, | 547 | GNUNET_DISK_file_read (const struct GNUNET_DISK_FileHandle *h, |
548 | void *result, | 548 | void *result, |
549 | size_t len); | 549 | size_t len); |
550 | 550 | ||
@@ -575,7 +575,7 @@ GNUNET_DISK_file_read_non_blocking (const struct GNUNET_DISK_FileHandle * h, | |||
575 | */ | 575 | */ |
576 | ssize_t | 576 | ssize_t |
577 | GNUNET_DISK_fn_read (const char *fn, | 577 | GNUNET_DISK_fn_read (const char *fn, |
578 | void *result, | 578 | void *result, |
579 | size_t len); | 579 | size_t len); |
580 | 580 | ||
581 | 581 | ||
@@ -589,7 +589,7 @@ GNUNET_DISK_fn_read (const char *fn, | |||
589 | */ | 589 | */ |
590 | ssize_t | 590 | ssize_t |
591 | GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h, | 591 | GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h, |
592 | const void *buffer, | 592 | const void *buffer, |
593 | size_t n); | 593 | size_t n); |
594 | 594 | ||
595 | 595 | ||
@@ -603,7 +603,7 @@ GNUNET_DISK_file_write (const struct GNUNET_DISK_FileHandle *h, | |||
603 | */ | 603 | */ |
604 | ssize_t | 604 | ssize_t |
605 | GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h, | 605 | GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h, |
606 | const void *buffer, | 606 | const void *buffer, |
607 | size_t n); | 607 | size_t n); |
608 | 608 | ||
609 | 609 | ||
@@ -619,7 +619,7 @@ GNUNET_DISK_file_write_blocking (const struct GNUNET_DISK_FileHandle *h, | |||
619 | */ | 619 | */ |
620 | ssize_t | 620 | ssize_t |
621 | GNUNET_DISK_fn_write (const char *fn, | 621 | GNUNET_DISK_fn_write (const char *fn, |
622 | const void *buffer, | 622 | const void *buffer, |
623 | size_t n, | 623 | size_t n, |
624 | enum GNUNET_DISK_AccessPermissions mode); | 624 | enum GNUNET_DISK_AccessPermissions mode); |
625 | 625 | ||
@@ -766,7 +766,7 @@ GNUNET_DISK_directory_create (const char *dir); | |||
766 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 766 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
767 | */ | 767 | */ |
768 | int | 768 | int |
769 | GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, | 769 | GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, |
770 | OFF_T lock_start, | 770 | OFF_T lock_start, |
771 | OFF_T lock_end, int excl); | 771 | OFF_T lock_end, int excl); |
772 | 772 | ||
@@ -780,7 +780,7 @@ GNUNET_DISK_file_lock (struct GNUNET_DISK_FileHandle *fh, | |||
780 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 780 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
781 | */ | 781 | */ |
782 | int | 782 | int |
783 | GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, | 783 | GNUNET_DISK_file_unlock (struct GNUNET_DISK_FileHandle *fh, |
784 | OFF_T unlock_start, | 784 | OFF_T unlock_start, |
785 | OFF_T unlock_end); | 785 | OFF_T unlock_end); |
786 | 786 | ||
diff --git a/src/include/gnunet_dns_service.h b/src/include/gnunet_dns_service.h index d9a43ff8b..581d7f044 100644 --- a/src/include/gnunet_dns_service.h +++ b/src/include/gnunet_dns_service.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_dns_service.h | 22 | * @file include/gnunet_dns_service.h |
23 | * @brief API to access the DNS service. | 23 | * @brief API to access the DNS service. |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #ifndef GNUNET_DNS_SERVICE_H | 26 | #ifndef GNUNET_DNS_SERVICE_H |
@@ -41,7 +41,7 @@ struct GNUNET_DNS_RequestHandle; | |||
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Flags that specify when to call the client's handler. | 43 | * Flags that specify when to call the client's handler. |
44 | */ | 44 | */ |
45 | enum GNUNET_DNS_Flags | 45 | enum GNUNET_DNS_Flags |
46 | { | 46 | { |
47 | 47 | ||
@@ -153,7 +153,7 @@ GNUNET_DNS_request_drop (struct GNUNET_DNS_RequestHandle *rh); | |||
153 | * @param reply reply data | 153 | * @param reply reply data |
154 | */ | 154 | */ |
155 | void | 155 | void |
156 | GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh, | 156 | GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh, |
157 | uint16_t reply_length, | 157 | uint16_t reply_length, |
158 | const char *reply); | 158 | const char *reply); |
159 | 159 | ||
@@ -165,7 +165,7 @@ GNUNET_DNS_request_answer (struct GNUNET_DNS_RequestHandle *rh, | |||
165 | * @param flags when to call rh | 165 | * @param flags when to call rh |
166 | * @param rh function to call with DNS requests | 166 | * @param rh function to call with DNS requests |
167 | * @param rh_cls closure to pass to rh | 167 | * @param rh_cls closure to pass to rh |
168 | * @return DNS handle | 168 | * @return DNS handle |
169 | */ | 169 | */ |
170 | struct GNUNET_DNS_Handle * | 170 | struct GNUNET_DNS_Handle * |
171 | GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | 171 | GNUNET_DNS_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h index c4b4546c8..68b6597ff 100644 --- a/src/include/gnunet_dnsparser_lib.h +++ b/src/include/gnunet_dnsparser_lib.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_dnsparser_lib.h | 22 | * @file include/gnunet_dnsparser_lib.h |
23 | * @brief API for helper library to parse DNS packets. | 23 | * @brief API for helper library to parse DNS packets. |
24 | * @author Philipp Toelke | 24 | * @author Philipp Toelke |
25 | * @author Christian Grothoff | 25 | * @author Christian Grothoff |
26 | */ | 26 | */ |
@@ -64,7 +64,7 @@ struct GNUNET_DNSPARSER_Query | |||
64 | 64 | ||
65 | /** | 65 | /** |
66 | * Name of the record that the query is for (0-terminated). | 66 | * Name of the record that the query is for (0-terminated). |
67 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 67 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
68 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 68 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
69 | * individual label is well-formed. If a given name is not well-formed, | 69 | * individual label is well-formed. If a given name is not well-formed, |
70 | * creating the DNS packet will fail. | 70 | * creating the DNS packet will fail. |
@@ -89,7 +89,7 @@ struct GNUNET_DNSPARSER_Query | |||
89 | */ | 89 | */ |
90 | struct GNUNET_DNSPARSER_MxRecord | 90 | struct GNUNET_DNSPARSER_MxRecord |
91 | { | 91 | { |
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Preference for this entry (lower value is higher preference). | 94 | * Preference for this entry (lower value is higher preference). |
95 | */ | 95 | */ |
@@ -97,7 +97,7 @@ struct GNUNET_DNSPARSER_MxRecord | |||
97 | 97 | ||
98 | /** | 98 | /** |
99 | * Name of the mail server. | 99 | * Name of the mail server. |
100 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 100 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
101 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 101 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
102 | * individual label is well-formed. If a given name is not well-formed, | 102 | * individual label is well-formed. If a given name is not well-formed, |
103 | * creating the DNS packet will fail. | 103 | * creating the DNS packet will fail. |
@@ -120,11 +120,11 @@ struct GNUNET_DNSPARSER_MxRecord | |||
120 | */ | 120 | */ |
121 | struct GNUNET_DNSPARSER_SrvRecord | 121 | struct GNUNET_DNSPARSER_SrvRecord |
122 | { | 122 | { |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * Service name without the underscore (!). Note that RFC 6335 clarifies the | 125 | * Service name without the underscore (!). Note that RFC 6335 clarifies the |
126 | * set of legal characters for service names. | 126 | * set of legal characters for service names. |
127 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 127 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
128 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 128 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
129 | * individual label is well-formed. If a given name is not well-formed, | 129 | * individual label is well-formed. If a given name is not well-formed, |
130 | * creating the DNS packet will fail. | 130 | * creating the DNS packet will fail. |
@@ -139,7 +139,7 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
139 | 139 | ||
140 | /** | 140 | /** |
141 | * Domain name for which the record is valid | 141 | * Domain name for which the record is valid |
142 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 142 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
143 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 143 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
144 | * individual label is well-formed. If a given name is not well-formed, | 144 | * individual label is well-formed. If a given name is not well-formed, |
145 | * creating the DNS packet will fail. | 145 | * creating the DNS packet will fail. |
@@ -148,7 +148,7 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
148 | 148 | ||
149 | /** | 149 | /** |
150 | * Hostname offering the service. | 150 | * Hostname offering the service. |
151 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 151 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
152 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 152 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
153 | * individual label is well-formed. If a given name is not well-formed, | 153 | * individual label is well-formed. If a given name is not well-formed, |
154 | * creating the DNS packet will fail. | 154 | * creating the DNS packet will fail. |
@@ -176,17 +176,17 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
176 | 176 | ||
177 | }; | 177 | }; |
178 | 178 | ||
179 | 179 | ||
180 | /** | 180 | /** |
181 | * Information from SOA records (RFC 1035). | 181 | * Information from SOA records (RFC 1035). |
182 | */ | 182 | */ |
183 | struct GNUNET_DNSPARSER_SoaRecord | 183 | struct GNUNET_DNSPARSER_SoaRecord |
184 | { | 184 | { |
185 | 185 | ||
186 | /** | 186 | /** |
187 | * The domainname of the name server that was the | 187 | * The domainname of the name server that was the |
188 | * original or primary source of data for this zone. | 188 | * original or primary source of data for this zone. |
189 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 189 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
190 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 190 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an |
191 | * individual label is well-formed. If a given name is not well-formed, | 191 | * individual label is well-formed. If a given name is not well-formed, |
192 | * creating the DNS packet will fail. | 192 | * creating the DNS packet will fail. |
@@ -196,7 +196,7 @@ struct GNUNET_DNSPARSER_SoaRecord | |||
196 | /** | 196 | /** |
197 | * A domainname which specifies the mailbox of the | 197 | * A domainname which specifies the mailbox of the |
198 | * person responsible for this zone. | 198 | * person responsible for this zone. |
199 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 199 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
200 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 200 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an |
201 | * individual label is well-formed. If a given name is not well-formed, | 201 | * individual label is well-formed. If a given name is not well-formed, |
202 | * creating the DNS packet will fail. | 202 | * creating the DNS packet will fail. |
@@ -204,7 +204,7 @@ struct GNUNET_DNSPARSER_SoaRecord | |||
204 | char *rname; | 204 | char *rname; |
205 | 205 | ||
206 | /** | 206 | /** |
207 | * The version number of the original copy of the zone. | 207 | * The version number of the original copy of the zone. |
208 | */ | 208 | */ |
209 | uint32_t serial; | 209 | uint32_t serial; |
210 | 210 | ||
@@ -230,7 +230,7 @@ struct GNUNET_DNSPARSER_SoaRecord | |||
230 | * from this zone. | 230 | * from this zone. |
231 | */ | 231 | */ |
232 | uint32_t minimum_ttl; | 232 | uint32_t minimum_ttl; |
233 | 233 | ||
234 | }; | 234 | }; |
235 | 235 | ||
236 | 236 | ||
@@ -260,7 +260,7 @@ struct GNUNET_DNSPARSER_Record | |||
260 | 260 | ||
261 | /** | 261 | /** |
262 | * Name of the record that the query is for (0-terminated). | 262 | * Name of the record that the query is for (0-terminated). |
263 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 263 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
264 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 264 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an |
265 | * individual label is well-formed. If a given name is not well-formed, | 265 | * individual label is well-formed. If a given name is not well-formed, |
266 | * creating the DNS packet will fail. | 266 | * creating the DNS packet will fail. |
@@ -270,23 +270,23 @@ struct GNUNET_DNSPARSER_Record | |||
270 | /** | 270 | /** |
271 | * Payload of the record (which one of these is valid depends on the 'type'). | 271 | * Payload of the record (which one of these is valid depends on the 'type'). |
272 | */ | 272 | */ |
273 | union | 273 | union |
274 | { | 274 | { |
275 | 275 | ||
276 | /** | 276 | /** |
277 | * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname. | 277 | * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname. |
278 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 278 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
279 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 279 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an |
280 | * individual label is well-formed. If a given name is not well-formed, | 280 | * individual label is well-formed. If a given name is not well-formed, |
281 | * creating the DNS packet will fail. | 281 | * creating the DNS packet will fail. |
282 | */ | 282 | */ |
283 | char *hostname; | 283 | char *hostname; |
284 | 284 | ||
285 | /** | 285 | /** |
286 | * SOA data for SOA records. | 286 | * SOA data for SOA records. |
287 | */ | 287 | */ |
288 | struct GNUNET_DNSPARSER_SoaRecord *soa; | 288 | struct GNUNET_DNSPARSER_SoaRecord *soa; |
289 | 289 | ||
290 | /** | 290 | /** |
291 | * MX data for MX records. | 291 | * MX data for MX records. |
292 | */ | 292 | */ |
@@ -370,7 +370,7 @@ struct GNUNET_DNSPARSER_Packet | |||
370 | 370 | ||
371 | /** | 371 | /** |
372 | * Bitfield of DNS flags. | 372 | * Bitfield of DNS flags. |
373 | */ | 373 | */ |
374 | struct GNUNET_TUN_DnsFlags flags; | 374 | struct GNUNET_TUN_DnsFlags flags; |
375 | 375 | ||
376 | /** | 376 | /** |
@@ -411,7 +411,7 @@ GNUNET_DNSPARSER_check_name (const char *name); | |||
411 | * processing and manipulation. | 411 | * processing and manipulation. |
412 | * | 412 | * |
413 | * @param udp_payload wire-format of the DNS packet | 413 | * @param udp_payload wire-format of the DNS packet |
414 | * @param udp_payload_length number of bytes in @a udp_payload | 414 | * @param udp_payload_length number of bytes in @a udp_payload |
415 | * @return NULL on error, otherwise the parsed packet | 415 | * @return NULL on error, otherwise the parsed packet |
416 | */ | 416 | */ |
417 | struct GNUNET_DNSPARSER_Packet * | 417 | struct GNUNET_DNSPARSER_Packet * |
@@ -431,7 +431,7 @@ GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p); | |||
431 | /** | 431 | /** |
432 | * Given a DNS packet @a p, generate the corresponding UDP payload. | 432 | * Given a DNS packet @a p, generate the corresponding UDP payload. |
433 | * Note that we do not attempt to pack the strings with pointers | 433 | * Note that we do not attempt to pack the strings with pointers |
434 | * as this would complicate the code and this is about being | 434 | * as this would complicate the code and this is about being |
435 | * simple and secure, not fast, fancy and broken like bind. | 435 | * simple and secure, not fast, fancy and broken like bind. |
436 | * | 436 | * |
437 | * @param p packet to pack | 437 | * @param p packet to pack |
@@ -645,7 +645,7 @@ GNUNET_DNSPARSER_parse_srv (const char *r_name, | |||
645 | 645 | ||
646 | /** | 646 | /** |
647 | * Free the given DNS record. | 647 | * Free the given DNS record. |
648 | * | 648 | * |
649 | * @param r record to free | 649 | * @param r record to free |
650 | */ | 650 | */ |
651 | void | 651 | void |
diff --git a/src/include/gnunet_dnsstub_lib.h b/src/include/gnunet_dnsstub_lib.h index 0269fac17..73db0a49b 100644 --- a/src/include/gnunet_dnsstub_lib.h +++ b/src/include/gnunet_dnsstub_lib.h | |||
@@ -31,12 +31,12 @@ | |||
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Opaque handle to the stub resolver. | 33 | * Opaque handle to the stub resolver. |
34 | */ | 34 | */ |
35 | struct GNUNET_DNSSTUB_Context; | 35 | struct GNUNET_DNSSTUB_Context; |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * Opaque handle to a socket doing UDP requests. | 38 | * Opaque handle to a socket doing UDP requests. |
39 | */ | 39 | */ |
40 | struct GNUNET_DNSSTUB_RequestSocket; | 40 | struct GNUNET_DNSSTUB_RequestSocket; |
41 | 41 | ||
42 | 42 | ||
diff --git a/src/include/gnunet_env_lib.h b/src/include/gnunet_env_lib.h index 89c41d2c1..857ad45c2 100644 --- a/src/include/gnunet_env_lib.h +++ b/src/include/gnunet_env_lib.h | |||
@@ -18,7 +18,7 @@ | |||
18 | * Boston, MA 02111-1307, USA. | 18 | * Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_env_lib.h | 22 | * @file include/gnunet_env_lib.h |
23 | * @brief Library providing operations for the @e environment of | 23 | * @brief Library providing operations for the @e environment of |
24 | * PSYC and Social messages, and for (de)serializing variable values. | 24 | * PSYC and Social messages, and for (de)serializing variable values. |
@@ -38,38 +38,38 @@ extern "C" | |||
38 | #endif | 38 | #endif |
39 | 39 | ||
40 | 40 | ||
41 | /** | 41 | /** |
42 | * Possible operations on PSYC state (persistent) and transient variables (per message). | 42 | * Possible operations on PSYC state (persistent) and transient variables (per message). |
43 | */ | 43 | */ |
44 | enum GNUNET_ENV_Operator | 44 | enum GNUNET_ENV_Operator |
45 | { | 45 | { |
46 | /** | 46 | /** |
47 | * Set value of a transient variable. | 47 | * Set value of a transient variable. |
48 | */ | 48 | */ |
49 | GNUNET_ENV_OP_SET = ':', | 49 | GNUNET_ENV_OP_SET = ':', |
50 | 50 | ||
51 | /** | 51 | /** |
52 | * Assign value for a persistent state variable. | 52 | * Assign value for a persistent state variable. |
53 | * | 53 | * |
54 | * If an assigned value is NULL, the variable is deleted. | 54 | * If an assigned value is NULL, the variable is deleted. |
55 | */ | 55 | */ |
56 | GNUNET_ENV_OP_ASSIGN = '=', | 56 | GNUNET_ENV_OP_ASSIGN = '=', |
57 | 57 | ||
58 | /** | 58 | /** |
59 | * Augment state variable. | 59 | * Augment state variable. |
60 | * | 60 | * |
61 | * Used for appending strings, adding numbers, and adding new items to a list or dictionary. | 61 | * Used for appending strings, adding numbers, and adding new items to a list or dictionary. |
62 | */ | 62 | */ |
63 | GNUNET_ENV_OP_AUGMENT = '+', | 63 | GNUNET_ENV_OP_AUGMENT = '+', |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * Diminish state variable. | 66 | * Diminish state variable. |
67 | * | 67 | * |
68 | * Used for subtracting numbers, and removing items from a list or dictionary. | 68 | * Used for subtracting numbers, and removing items from a list or dictionary. |
69 | */ | 69 | */ |
70 | GNUNET_ENV_OP_DIMINISH = '-', | 70 | GNUNET_ENV_OP_DIMINISH = '-', |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Update state variable. | 73 | * Update state variable. |
74 | * | 74 | * |
75 | * Used for modifying a single item of a list or dictionary. | 75 | * Used for modifying a single item of a list or dictionary. |
@@ -78,7 +78,7 @@ enum GNUNET_ENV_Operator | |||
78 | }; | 78 | }; |
79 | 79 | ||
80 | 80 | ||
81 | /** | 81 | /** |
82 | * PSYC variable types. | 82 | * PSYC variable types. |
83 | */ | 83 | */ |
84 | enum GNUNET_ENV_Type | 84 | enum GNUNET_ENV_Type |
@@ -90,26 +90,26 @@ enum GNUNET_ENV_Type | |||
90 | }; | 90 | }; |
91 | 91 | ||
92 | 92 | ||
93 | /** | 93 | /** |
94 | * PSYC state modifier. | 94 | * PSYC state modifier. |
95 | */ | 95 | */ |
96 | struct GNUNET_ENV_Modifier { | 96 | struct GNUNET_ENV_Modifier { |
97 | /** | 97 | /** |
98 | * State operation. | 98 | * State operation. |
99 | */ | 99 | */ |
100 | enum GNUNET_ENV_Operator oper; | 100 | enum GNUNET_ENV_Operator oper; |
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Variable name. | 103 | * Variable name. |
104 | */ | 104 | */ |
105 | const char *name; | 105 | const char *name; |
106 | 106 | ||
107 | /** | 107 | /** |
108 | * Size of @a value. | 108 | * Size of @a value. |
109 | */ | 109 | */ |
110 | size_t value_size; | 110 | size_t value_size; |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Value of variable. | 113 | * Value of variable. |
114 | */ | 114 | */ |
115 | const void *value; | 115 | const void *value; |
@@ -126,7 +126,7 @@ struct GNUNET_ENV_Modifier { | |||
126 | }; | 126 | }; |
127 | 127 | ||
128 | 128 | ||
129 | /** | 129 | /** |
130 | * Environment for a message. | 130 | * Environment for a message. |
131 | * | 131 | * |
132 | * Contains modifiers. | 132 | * Contains modifiers. |
@@ -134,16 +134,16 @@ struct GNUNET_ENV_Modifier { | |||
134 | struct GNUNET_ENV_Environment; | 134 | struct GNUNET_ENV_Environment; |
135 | 135 | ||
136 | 136 | ||
137 | /** | 137 | /** |
138 | * Create an environment. | 138 | * Create an environment. |
139 | * | 139 | * |
140 | * @return A newly allocated environment. | 140 | * @return A newly allocated environment. |
141 | */ | 141 | */ |
142 | struct GNUNET_ENV_Environment * | 142 | struct GNUNET_ENV_Environment * |
143 | GNUNET_ENV_environment_create (); | 143 | GNUNET_ENV_environment_create (); |
144 | 144 | ||
145 | 145 | ||
146 | /** | 146 | /** |
147 | * Add a modifier to the environment. | 147 | * Add a modifier to the environment. |
148 | * | 148 | * |
149 | * @param env The environment. | 149 | * @param env The environment. |
@@ -158,7 +158,7 @@ GNUNET_ENV_environment_add_mod (struct GNUNET_ENV_Environment *env, | |||
158 | const void *value, size_t value_size); | 158 | const void *value, size_t value_size); |
159 | 159 | ||
160 | 160 | ||
161 | /** | 161 | /** |
162 | * Iterator for modifiers in the environment. | 162 | * Iterator for modifiers in the environment. |
163 | * | 163 | * |
164 | * @param cls Closure. | 164 | * @param cls Closure. |
@@ -171,7 +171,7 @@ typedef int | |||
171 | (*GNUNET_ENV_Iterator) (void *cls, struct GNUNET_ENV_Modifier *mod); | 171 | (*GNUNET_ENV_Iterator) (void *cls, struct GNUNET_ENV_Modifier *mod); |
172 | 172 | ||
173 | 173 | ||
174 | /** | 174 | /** |
175 | * Iterate through all modifiers in the environment. | 175 | * Iterate through all modifiers in the environment. |
176 | * | 176 | * |
177 | * @param env The environment. | 177 | * @param env The environment. |
@@ -183,7 +183,7 @@ GNUNET_ENV_environment_iterate (const struct GNUNET_ENV_Environment *env, | |||
183 | GNUNET_ENV_Iterator it, void *it_cls); | 183 | GNUNET_ENV_Iterator it, void *it_cls); |
184 | 184 | ||
185 | 185 | ||
186 | /** | 186 | /** |
187 | * Get the number of modifiers in the environment. | 187 | * Get the number of modifiers in the environment. |
188 | * | 188 | * |
189 | * @param env The environment. | 189 | * @param env The environment. |
@@ -194,7 +194,7 @@ size_t | |||
194 | GNUNET_ENV_environment_get_mod_count (const struct GNUNET_ENV_Environment *env); | 194 | GNUNET_ENV_environment_get_mod_count (const struct GNUNET_ENV_Environment *env); |
195 | 195 | ||
196 | 196 | ||
197 | /** | 197 | /** |
198 | * Destroy an environment. | 198 | * Destroy an environment. |
199 | * | 199 | * |
200 | * @param env The environment to destroy. | 200 | * @param env The environment to destroy. |
@@ -203,18 +203,18 @@ void | |||
203 | GNUNET_ENV_environment_destroy (struct GNUNET_ENV_Environment *env); | 203 | GNUNET_ENV_environment_destroy (struct GNUNET_ENV_Environment *env); |
204 | 204 | ||
205 | 205 | ||
206 | /** | 206 | /** |
207 | * Get the type of variable. | 207 | * Get the type of variable. |
208 | * | 208 | * |
209 | * @param name Name of the variable. | 209 | * @param name Name of the variable. |
210 | * | 210 | * |
211 | * @return Variable type. | 211 | * @return Variable type. |
212 | */ | 212 | */ |
213 | enum GNUNET_ENV_Type | 213 | enum GNUNET_ENV_Type |
214 | GNUNET_ENV_var_get_type (char *name); | 214 | GNUNET_ENV_var_get_type (char *name); |
215 | 215 | ||
216 | 216 | ||
217 | /** | 217 | /** |
218 | * Perform an operation on a variable. | 218 | * Perform an operation on a variable. |
219 | * | 219 | * |
220 | * @param name Name of variable. | 220 | * @param name Name of variable. |
@@ -225,7 +225,7 @@ GNUNET_ENV_var_get_type (char *name); | |||
225 | * @param args_size Size of @a args. | 225 | * @param args_size Size of @a args. |
226 | * @param return_value Return value. | 226 | * @param return_value Return value. |
227 | * @param return_value_size Size of @a return_value. | 227 | * @param return_value_size Size of @a return_value. |
228 | * | 228 | * |
229 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 229 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
230 | */ | 230 | */ |
231 | int | 231 | int |
@@ -234,7 +234,7 @@ GNUNET_ENV_operation (char *name, void *current_value, size_t current_value_size | |||
234 | void **return_value, size_t *return_value_size); | 234 | void **return_value, size_t *return_value_size); |
235 | 235 | ||
236 | 236 | ||
237 | /** | 237 | /** |
238 | * Get the variable's value as an integer. | 238 | * Get the variable's value as an integer. |
239 | * | 239 | * |
240 | * @param size Size of value. | 240 | * @param size Size of value. |
@@ -247,7 +247,7 @@ int | |||
247 | GNUNET_ENV_value_to_number (size_t size, const void *value, int64_t *number); | 247 | GNUNET_ENV_value_to_number (size_t size, const void *value, int64_t *number); |
248 | 248 | ||
249 | 249 | ||
250 | /** | 250 | /** |
251 | * Get the variable's value as a list. | 251 | * Get the variable's value as a list. |
252 | * | 252 | * |
253 | * @param size Size of value. | 253 | * @param size Size of value. |
@@ -260,7 +260,7 @@ int | |||
260 | GNUNET_ENV_value_to_list (size_t size, const void *value, struct GNUNET_CONTAINER_SList **list); | 260 | GNUNET_ENV_value_to_list (size_t size, const void *value, struct GNUNET_CONTAINER_SList **list); |
261 | 261 | ||
262 | 262 | ||
263 | /** | 263 | /** |
264 | * Get the variable's value as a dictionary. | 264 | * Get the variable's value as a dictionary. |
265 | * | 265 | * |
266 | * @param size Size of value. | 266 | * @param size Size of value. |
@@ -273,36 +273,36 @@ int | |||
273 | GNUNET_ENV_value_to_dict (size_t size, const void *value, struct GNUNET_CONTAINER_MultiHashMap **dict); | 273 | GNUNET_ENV_value_to_dict (size_t size, const void *value, struct GNUNET_CONTAINER_MultiHashMap **dict); |
274 | 274 | ||
275 | 275 | ||
276 | /** | 276 | /** |
277 | * Create a PSYC variable value from an integer. | 277 | * Create a PSYC variable value from an integer. |
278 | * | 278 | * |
279 | * @param number The number to convert. | 279 | * @param number The number to convert. |
280 | * @param[out] value_size Size of returned value. | 280 | * @param[out] value_size Size of returned value. |
281 | * | 281 | * |
282 | * @return A newly allocated value or NULL on error. | 282 | * @return A newly allocated value or NULL on error. |
283 | */ | 283 | */ |
284 | void * | 284 | void * |
285 | GNUNET_ENV_value_from_number (int64_t number, size_t *value_size); | 285 | GNUNET_ENV_value_from_number (int64_t number, size_t *value_size); |
286 | 286 | ||
287 | 287 | ||
288 | /** | 288 | /** |
289 | * Create a PSYC variable value from a list. | 289 | * Create a PSYC variable value from a list. |
290 | * | 290 | * |
291 | * @param list The list to convert. | 291 | * @param list The list to convert. |
292 | * @param[out] value_size Size of returned value. | 292 | * @param[out] value_size Size of returned value. |
293 | * | 293 | * |
294 | * @return A newly allocated value or NULL on error. | 294 | * @return A newly allocated value or NULL on error. |
295 | */ | 295 | */ |
296 | void * | 296 | void * |
297 | GNUNET_ENV_value_from_list (struct GNUNET_CONTAINER_SList *list, size_t *value_size); | 297 | GNUNET_ENV_value_from_list (struct GNUNET_CONTAINER_SList *list, size_t *value_size); |
298 | 298 | ||
299 | 299 | ||
300 | /** | 300 | /** |
301 | * Create a PSYC variable value from a dictionary. | 301 | * Create a PSYC variable value from a dictionary. |
302 | * | 302 | * |
303 | * @param dict The dict to convert. | 303 | * @param dict The dict to convert. |
304 | * @param[out] value_size Size of returned value. | 304 | * @param[out] value_size Size of returned value. |
305 | * | 305 | * |
306 | * @return A newly allocated value or NULL on error. | 306 | * @return A newly allocated value or NULL on error. |
307 | */ | 307 | */ |
308 | void * | 308 | void * |
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index dbd885353..a13c3b91c 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -134,7 +134,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri); | |||
134 | * @param is_mandatory is this keyword mandatory? | 134 | * @param is_mandatory is this keyword mandatory? |
135 | */ | 135 | */ |
136 | void | 136 | void |
137 | GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri, | 137 | GNUNET_FS_uri_ksk_add_keyword (struct GNUNET_FS_Uri *uri, |
138 | const char *keyword, | 138 | const char *keyword, |
139 | int is_mandatory); | 139 | int is_mandatory); |
140 | 140 | ||
@@ -303,7 +303,7 @@ GNUNET_FS_uri_ksk_create (const char *keywords, char **emsg); | |||
303 | * if keywords is not legal (i.e. empty). | 303 | * if keywords is not legal (i.e. empty). |
304 | */ | 304 | */ |
305 | struct GNUNET_FS_Uri * | 305 | struct GNUNET_FS_Uri * |
306 | GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, | 306 | GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, |
307 | const char **argv); | 307 | const char **argv); |
308 | 308 | ||
309 | 309 | ||
@@ -337,7 +337,7 @@ GNUNET_FS_uri_test_sks (const struct GNUNET_FS_Uri *uri); | |||
337 | * @return an FS URI for the given namespace and identifier | 337 | * @return an FS URI for the given namespace and identifier |
338 | */ | 338 | */ |
339 | struct GNUNET_FS_Uri * | 339 | struct GNUNET_FS_Uri * |
340 | GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns, | 340 | GNUNET_FS_uri_sks_create (const struct GNUNET_CRYPTO_EccPublicSignKey *ns, |
341 | const char *id); | 341 | const char *id); |
342 | 342 | ||
343 | 343 | ||
@@ -1698,7 +1698,7 @@ typedef int (*GNUNET_FS_FileInformationProcessor) (void *cls, | |||
1698 | * file information structures. | 1698 | * file information structures. |
1699 | * | 1699 | * |
1700 | * @param s structure to get the filename for | 1700 | * @param s structure to get the filename for |
1701 | * @return NULL on error, otherwise filename that can be used | 1701 | * @return NULL on error, otherwise filename that can be used |
1702 | * to read this fi-struct from disk. | 1702 | * to read this fi-struct from disk. |
1703 | */ | 1703 | */ |
1704 | const char * | 1704 | const char * |
@@ -2055,7 +2055,7 @@ struct GNUNET_FS_PublishSksContext; | |||
2055 | struct GNUNET_FS_PublishSksContext * | 2055 | struct GNUNET_FS_PublishSksContext * |
2056 | GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, | 2056 | GNUNET_FS_publish_sks (struct GNUNET_FS_Handle *h, |
2057 | const struct GNUNET_CRYPTO_EccPrivateKey *ns, | 2057 | const struct GNUNET_CRYPTO_EccPrivateKey *ns, |
2058 | const char *identifier, | 2058 | const char *identifier, |
2059 | const char *update, | 2059 | const char *update, |
2060 | const struct GNUNET_CONTAINER_MetaData *meta, | 2060 | const struct GNUNET_CONTAINER_MetaData *meta, |
2061 | const struct GNUNET_FS_Uri *uri, | 2061 | const struct GNUNET_FS_Uri *uri, |
@@ -2146,10 +2146,10 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc); | |||
2146 | * @param last_meta metadata associated with @a last_uri | 2146 | * @param last_meta metadata associated with @a last_uri |
2147 | * @param next_id identifier that should be used for updates | 2147 | * @param next_id identifier that should be used for updates |
2148 | */ | 2148 | */ |
2149 | typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, | 2149 | typedef void (*GNUNET_FS_IdentifierProcessor) (void *cls, |
2150 | const char *last_id, | 2150 | const char *last_id, |
2151 | const struct GNUNET_FS_Uri *last_uri, | 2151 | const struct GNUNET_FS_Uri *last_uri, |
2152 | const struct GNUNET_CONTAINER_MetaData *last_meta, | 2152 | const struct GNUNET_CONTAINER_MetaData *last_meta, |
2153 | const char *next_id); | 2153 | const char *next_id); |
2154 | 2154 | ||
2155 | 2155 | ||
@@ -2283,7 +2283,7 @@ enum GNUNET_FS_DownloadOptions | |||
2283 | * No options (use defaults for everything). | 2283 | * No options (use defaults for everything). |
2284 | */ | 2284 | */ |
2285 | GNUNET_FS_DOWNLOAD_OPTION_NONE = 0, | 2285 | GNUNET_FS_DOWNLOAD_OPTION_NONE = 0, |
2286 | 2286 | ||
2287 | /** | 2287 | /** |
2288 | * Only download from the local host, do not access remote systems (no P2P) | 2288 | * Only download from the local host, do not access remote systems (no P2P) |
2289 | */ | 2289 | */ |
@@ -2600,9 +2600,9 @@ enum GNUNET_FS_DirScannerProgressUpdateReason | |||
2600 | * #GNUNET_SYSERR if it is neither (or unknown) | 2600 | * #GNUNET_SYSERR if it is neither (or unknown) |
2601 | * @param reason kind of progress we are making | 2601 | * @param reason kind of progress we are making |
2602 | */ | 2602 | */ |
2603 | typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls, | 2603 | typedef void (*GNUNET_FS_DirScannerProgressCallback) (void *cls, |
2604 | const char *filename, | 2604 | const char *filename, |
2605 | int is_directory, | 2605 | int is_directory, |
2606 | enum GNUNET_FS_DirScannerProgressUpdateReason reason); | 2606 | enum GNUNET_FS_DirScannerProgressUpdateReason reason); |
2607 | 2607 | ||
2608 | 2608 | ||
@@ -2685,9 +2685,9 @@ struct GNUNET_FS_DirScanner; | |||
2685 | */ | 2685 | */ |
2686 | struct GNUNET_FS_DirScanner * | 2686 | struct GNUNET_FS_DirScanner * |
2687 | GNUNET_FS_directory_scan_start (const char *filename, | 2687 | GNUNET_FS_directory_scan_start (const char *filename, |
2688 | int disable_extractor, | 2688 | int disable_extractor, |
2689 | const char *ex, | 2689 | const char *ex, |
2690 | GNUNET_FS_DirScannerProgressCallback cb, | 2690 | GNUNET_FS_DirScannerProgressCallback cb, |
2691 | void *cb_cls); | 2691 | void *cb_cls); |
2692 | 2692 | ||
2693 | 2693 | ||
diff --git a/src/include/gnunet_helper_lib.h b/src/include/gnunet_helper_lib.h index fde0a69ed..9c4c0c986 100644 --- a/src/include/gnunet_helper_lib.h +++ b/src/include/gnunet_helper_lib.h | |||
@@ -120,7 +120,7 @@ GNUNET_HELPER_stop (struct GNUNET_HELPER_Handle *h, int soft_kill); | |||
120 | 120 | ||
121 | /** | 121 | /** |
122 | * Continuation function. | 122 | * Continuation function. |
123 | * | 123 | * |
124 | * @param cls closure | 124 | * @param cls closure |
125 | * @param result #GNUNET_OK on success, | 125 | * @param result #GNUNET_OK on success, |
126 | * #GNUNET_NO if helper process died | 126 | * #GNUNET_NO if helper process died |
@@ -145,12 +145,12 @@ struct GNUNET_HELPER_SendHandle; | |||
145 | * @param cont continuation to run once the message is out (#GNUNET_OK on succees, #GNUNET_NO | 145 | * @param cont continuation to run once the message is out (#GNUNET_OK on succees, #GNUNET_NO |
146 | * if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy). | 146 | * if the helper process died, #GNUNET_SYSERR during #GNUNET_HELPER_destroy). |
147 | * @param cont_cls closure for @a cont | 147 | * @param cont_cls closure for @a cont |
148 | * @return NULL if the message was dropped, | 148 | * @return NULL if the message was dropped, |
149 | * otherwise handle to cancel @a cont (actual transmission may | 149 | * otherwise handle to cancel @a cont (actual transmission may |
150 | * not be abortable) | 150 | * not be abortable) |
151 | */ | 151 | */ |
152 | struct GNUNET_HELPER_SendHandle * | 152 | struct GNUNET_HELPER_SendHandle * |
153 | GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h, | 153 | GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h, |
154 | const struct GNUNET_MessageHeader *msg, | 154 | const struct GNUNET_MessageHeader *msg, |
155 | int can_drop, | 155 | int can_drop, |
156 | GNUNET_HELPER_Continuation cont, | 156 | GNUNET_HELPER_Continuation cont, |
@@ -166,5 +166,5 @@ GNUNET_HELPER_send (struct GNUNET_HELPER_Handle *h, | |||
166 | void | 166 | void |
167 | GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh); | 167 | GNUNET_HELPER_send_cancel (struct GNUNET_HELPER_SendHandle *sh); |
168 | 168 | ||
169 | #endif | 169 | #endif |
170 | /* end of include guard: GNUNET_HELPER_LIB_H */ | 170 | /* end of include guard: GNUNET_HELPER_LIB_H */ |
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index 6c572e737..79d27fa02 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_identity_service.h | 22 | * @file include/gnunet_identity_service.h |
23 | * @brief Identity service; implements identity management for GNUnet | 23 | * @brief Identity service; implements identity management for GNUnet |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
@@ -49,22 +49,22 @@ extern "C" | |||
49 | #include "gnunet_util_lib.h" | 49 | #include "gnunet_util_lib.h" |
50 | 50 | ||
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Version number of GNUnet Identity API. | 53 | * Version number of GNUnet Identity API. |
54 | */ | 54 | */ |
55 | #define GNUNET_IDENTITY_VERSION 0x00000000 | 55 | #define GNUNET_IDENTITY_VERSION 0x00000000 |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Handle to access the identity service. | 58 | * Handle to access the identity service. |
59 | */ | 59 | */ |
60 | struct GNUNET_IDENTITY_Handle; | 60 | struct GNUNET_IDENTITY_Handle; |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Handle for a ego. | 63 | * Handle for a ego. |
64 | */ | 64 | */ |
65 | struct GNUNET_IDENTITY_Ego; | 65 | struct GNUNET_IDENTITY_Ego; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * Handle for an operation with the identity service. | 68 | * Handle for an operation with the identity service. |
69 | */ | 69 | */ |
70 | struct GNUNET_IDENTITY_Operation; | 70 | struct GNUNET_IDENTITY_Operation; |
@@ -100,9 +100,9 @@ GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego, | |||
100 | struct GNUNET_CRYPTO_EccPublicSignKey *pk); | 100 | struct GNUNET_CRYPTO_EccPublicSignKey *pk); |
101 | 101 | ||
102 | 102 | ||
103 | /** | 103 | /** |
104 | * Method called to inform about the egos of | 104 | * Method called to inform about the egos of |
105 | * this peer. | 105 | * this peer. |
106 | * | 106 | * |
107 | * When used with #GNUNET_IDENTITY_connect, this function is | 107 | * When used with #GNUNET_IDENTITY_connect, this function is |
108 | * initially called for all egos and then again whenever a | 108 | * initially called for all egos and then again whenever a |
@@ -116,11 +116,11 @@ GNUNET_IDENTITY_ego_get_public_key (const struct GNUNET_IDENTITY_Ego *ego, | |||
116 | * @a ego does indicate an error (i.e. name is taken or no default | 116 | * @a ego does indicate an error (i.e. name is taken or no default |
117 | * value is known). If @a ego is non-NULL and if '*ctx' | 117 | * value is known). If @a ego is non-NULL and if '*ctx' |
118 | * is set in those callbacks, the value WILL be passed to a subsequent | 118 | * is set in those callbacks, the value WILL be passed to a subsequent |
119 | * call to the identity callback of #GNUNET_IDENTITY_connect (if | 119 | * call to the identity callback of #GNUNET_IDENTITY_connect (if |
120 | * that one was not NULL). | 120 | * that one was not NULL). |
121 | * | 121 | * |
122 | * When an identity is renamed, this function is called with the | 122 | * When an identity is renamed, this function is called with the |
123 | * (known) @a ego but the NEW @a name. | 123 | * (known) @a ego but the NEW @a name. |
124 | * | 124 | * |
125 | * When an identity is deleted, this function is called with the | 125 | * When an identity is deleted, this function is called with the |
126 | * (known) ego and "NULL" for the @a name. In this case, | 126 | * (known) ego and "NULL" for the @a name. In this case, |
@@ -141,7 +141,7 @@ typedef void (*GNUNET_IDENTITY_Callback)(void *cls, | |||
141 | const char *name); | 141 | const char *name); |
142 | 142 | ||
143 | 143 | ||
144 | /** | 144 | /** |
145 | * Connect to the identity service. | 145 | * Connect to the identity service. |
146 | * | 146 | * |
147 | * @param cfg Configuration to contact the identity service. | 147 | * @param cfg Configuration to contact the identity service. |
@@ -205,12 +205,12 @@ GNUNET_IDENTITY_set (struct GNUNET_IDENTITY_Handle *id, | |||
205 | * Disconnect from identity service. | 205 | * Disconnect from identity service. |
206 | * | 206 | * |
207 | * @param h identity service to disconnect | 207 | * @param h identity service to disconnect |
208 | */ | 208 | */ |
209 | void | 209 | void |
210 | GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h); | 210 | GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h); |
211 | 211 | ||
212 | 212 | ||
213 | /** | 213 | /** |
214 | * Create a new identity with the given name. | 214 | * Create a new identity with the given name. |
215 | * | 215 | * |
216 | * @param id identity service to use | 216 | * @param id identity service to use |
@@ -226,7 +226,7 @@ GNUNET_IDENTITY_create (struct GNUNET_IDENTITY_Handle *id, | |||
226 | void *cont_cls); | 226 | void *cont_cls); |
227 | 227 | ||
228 | 228 | ||
229 | /** | 229 | /** |
230 | * Renames an existing identity. | 230 | * Renames an existing identity. |
231 | * | 231 | * |
232 | * @param id identity service to use | 232 | * @param id identity service to use |
@@ -244,7 +244,7 @@ GNUNET_IDENTITY_rename (struct GNUNET_IDENTITY_Handle *id, | |||
244 | void *cb_cls); | 244 | void *cb_cls); |
245 | 245 | ||
246 | 246 | ||
247 | /** | 247 | /** |
248 | * Delete an existing identity. | 248 | * Delete an existing identity. |
249 | * | 249 | * |
250 | * @param id identity service to use | 250 | * @param id identity service to use |
@@ -279,13 +279,13 @@ GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op); | |||
279 | * | 279 | * |
280 | * @param cls closure | 280 | * @param cls closure |
281 | * @param ego NULL on error / ego not found | 281 | * @param ego NULL on error / ego not found |
282 | */ | 282 | */ |
283 | typedef void (*GNUNET_IDENTITY_EgoCallback)(void *cls, | 283 | typedef void (*GNUNET_IDENTITY_EgoCallback)(void *cls, |
284 | const struct GNUNET_IDENTITY_Ego *ego); | 284 | const struct GNUNET_IDENTITY_Ego *ego); |
285 | 285 | ||
286 | /** | 286 | /** |
287 | * Handle for ego lookup. | 287 | * Handle for ego lookup. |
288 | */ | 288 | */ |
289 | struct GNUNET_IDENTITY_EgoLookup; | 289 | struct GNUNET_IDENTITY_EgoLookup; |
290 | 290 | ||
291 | 291 | ||
diff --git a/src/include/gnunet_lockmanager_service.h b/src/include/gnunet_lockmanager_service.h index 7ec262d04..ecc2a8d50 100644 --- a/src/include/gnunet_lockmanager_service.h +++ b/src/include/gnunet_lockmanager_service.h | |||
@@ -87,7 +87,7 @@ enum GNUNET_LOCKMANAGER_Status | |||
87 | * | 87 | * |
88 | * @param cls the closure from GNUNET_LOCKMANAGER_lock call | 88 | * @param cls the closure from GNUNET_LOCKMANAGER_lock call |
89 | * | 89 | * |
90 | * @param domain_name the locking domain of the lock | 90 | * @param domain_name the locking domain of the lock |
91 | * | 91 | * |
92 | * @param lock the lock for which this status is relevant | 92 | * @param lock the lock for which this status is relevant |
93 | * | 93 | * |
@@ -95,11 +95,11 @@ enum GNUNET_LOCKMANAGER_Status | |||
95 | * acquired; GNUNET_LOCKMANAGER_RELEASE when the acquired lock is | 95 | * acquired; GNUNET_LOCKMANAGER_RELEASE when the acquired lock is |
96 | * lost. | 96 | * lost. |
97 | */ | 97 | */ |
98 | typedef void | 98 | typedef void |
99 | (*GNUNET_LOCKMANAGER_StatusCallback) (void *cls, | 99 | (*GNUNET_LOCKMANAGER_StatusCallback) (void *cls, |
100 | const char *domain_name, | 100 | const char *domain_name, |
101 | uint32_t lock, | 101 | uint32_t lock, |
102 | enum GNUNET_LOCKMANAGER_Status | 102 | enum GNUNET_LOCKMANAGER_Status |
103 | status); | 103 | status); |
104 | 104 | ||
105 | 105 | ||
diff --git a/src/include/gnunet_mesh_service.h b/src/include/gnunet_mesh_service.h index 9d2562de8..08748d87b 100644 --- a/src/include/gnunet_mesh_service.h +++ b/src/include/gnunet_mesh_service.h | |||
@@ -95,7 +95,7 @@ enum MeshTunnelOption | |||
95 | /** | 95 | /** |
96 | * Functions with this signature are called whenever a message is | 96 | * Functions with this signature are called whenever a message is |
97 | * received. | 97 | * received. |
98 | * | 98 | * |
99 | * Each time the function must call #GNUNET_MESH_receive_done on the tunnel | 99 | * Each time the function must call #GNUNET_MESH_receive_done on the tunnel |
100 | * in order to receive the next message. This doesn't need to be immediate: | 100 | * in order to receive the next message. This doesn't need to be immediate: |
101 | * can be delayed if some processing is done on the message. | 101 | * can be delayed if some processing is done on the message. |
@@ -104,7 +104,7 @@ enum MeshTunnelOption | |||
104 | * @param tunnel Connection to the other end. | 104 | * @param tunnel Connection to the other end. |
105 | * @param tunnel_ctx Place to store local state associated with the tunnel. | 105 | * @param tunnel_ctx Place to store local state associated with the tunnel. |
106 | * @param message The actual message. | 106 | * @param message The actual message. |
107 | * | 107 | * |
108 | * @return #GNUNET_OK to keep the tunnel open, | 108 | * @return #GNUNET_OK to keep the tunnel open, |
109 | * #GNUNET_SYSERR to close it (signal serious error). | 109 | * #GNUNET_SYSERR to close it (signal serious error). |
110 | */ | 110 | */ |
@@ -164,8 +164,8 @@ typedef void *(GNUNET_MESH_InboundTunnelNotificationHandler) (void *cls, | |||
164 | 164 | ||
165 | /** | 165 | /** |
166 | * Function called whenever a tunnel is destroyed. Should clean up | 166 | * Function called whenever a tunnel is destroyed. Should clean up |
167 | * any associated state. | 167 | * any associated state. |
168 | * | 168 | * |
169 | * It must NOT call #GNUNET_MESH_tunnel_destroy on the tunnel. | 169 | * It must NOT call #GNUNET_MESH_tunnel_destroy on the tunnel. |
170 | * | 170 | * |
171 | * @param cls closure (set from #GNUNET_MESH_connect) | 171 | * @param cls closure (set from #GNUNET_MESH_connect) |
@@ -182,7 +182,7 @@ typedef void (GNUNET_MESH_TunnelEndHandler) (void *cls, | |||
182 | * Connect to the mesh service. | 182 | * Connect to the mesh service. |
183 | * | 183 | * |
184 | * @param cfg Configuration to use. | 184 | * @param cfg Configuration to use. |
185 | * @param cls Closure for the various callbacks that follow (including | 185 | * @param cls Closure for the various callbacks that follow (including |
186 | * handlers in the handlers array). | 186 | * handlers in the handlers array). |
187 | * @param new_tunnel Function called when an *incoming* tunnel is created. | 187 | * @param new_tunnel Function called when an *incoming* tunnel is created. |
188 | * Can be NULL if no inbound tunnels are desired. | 188 | * Can be NULL if no inbound tunnels are desired. |
@@ -193,15 +193,15 @@ typedef void (GNUNET_MESH_TunnelEndHandler) (void *cls, | |||
193 | * @param handlers Callbacks for messages we care about, NULL-terminated. Each | 193 | * @param handlers Callbacks for messages we care about, NULL-terminated. Each |
194 | * one must call #GNUNET_MESH_receive_done on the tunnel to | 194 | * one must call #GNUNET_MESH_receive_done on the tunnel to |
195 | * receive the next message. Messages of a type that is not | 195 | * receive the next message. Messages of a type that is not |
196 | * in the handlers array are ignored if received. | 196 | * in the handlers array are ignored if received. |
197 | * @param ports NULL or 0-terminated array of port numbers for incoming tunnels. | 197 | * @param ports NULL or 0-terminated array of port numbers for incoming tunnels. |
198 | * See @c new_tunnel. | 198 | * See @c new_tunnel. |
199 | * | 199 | * |
200 | * @return handle to the mesh service NULL on error | 200 | * @return handle to the mesh service NULL on error |
201 | * (in this case, init is never called) | 201 | * (in this case, init is never called) |
202 | */ | 202 | */ |
203 | struct GNUNET_MESH_Handle * | 203 | struct GNUNET_MESH_Handle * |
204 | GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | 204 | GNUNET_MESH_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, |
205 | void *cls, | 205 | void *cls, |
206 | GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel, | 206 | GNUNET_MESH_InboundTunnelNotificationHandler new_tunnel, |
207 | GNUNET_MESH_TunnelEndHandler cleaner, | 207 | GNUNET_MESH_TunnelEndHandler cleaner, |
@@ -234,7 +234,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle); | |||
234 | * @return handle to the tunnel | 234 | * @return handle to the tunnel |
235 | */ | 235 | */ |
236 | struct GNUNET_MESH_Tunnel * | 236 | struct GNUNET_MESH_Tunnel * |
237 | GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, | 237 | GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, |
238 | void *tunnel_ctx, | 238 | void *tunnel_ctx, |
239 | const struct GNUNET_PeerIdentity *peer, | 239 | const struct GNUNET_PeerIdentity *peer, |
240 | uint32_t port, | 240 | uint32_t port, |
@@ -244,7 +244,7 @@ GNUNET_MESH_tunnel_create (struct GNUNET_MESH_Handle *h, | |||
244 | 244 | ||
245 | /** | 245 | /** |
246 | * Destroy an existing tunnel. | 246 | * Destroy an existing tunnel. |
247 | * | 247 | * |
248 | * The existing end callback for the tunnel will be called immediately. | 248 | * The existing end callback for the tunnel will be called immediately. |
249 | * Any pending outgoing messages will be sent but no incoming messages will be | 249 | * Any pending outgoing messages will be sent but no incoming messages will be |
250 | * accepted and no data callbacks will be called. | 250 | * accepted and no data callbacks will be called. |
@@ -258,7 +258,7 @@ GNUNET_MESH_tunnel_destroy (struct GNUNET_MESH_Tunnel *tunnel); | |||
258 | /** | 258 | /** |
259 | * Struct to retrieve info about a tunnel. | 259 | * Struct to retrieve info about a tunnel. |
260 | */ | 260 | */ |
261 | union GNUNET_MESH_TunnelInfo | 261 | union GNUNET_MESH_TunnelInfo |
262 | { | 262 | { |
263 | 263 | ||
264 | /** | 264 | /** |
@@ -332,7 +332,7 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle | |||
332 | 332 | ||
333 | /** | 333 | /** |
334 | * Indicate readiness to receive the next message on a tunnel. | 334 | * Indicate readiness to receive the next message on a tunnel. |
335 | * | 335 | * |
336 | * Should only be called once per handler called. | 336 | * Should only be called once per handler called. |
337 | * | 337 | * |
338 | * @param tunnel Tunnel that will be allowed to call another handler. | 338 | * @param tunnel Tunnel that will be allowed to call another handler. |
diff --git a/src/include/gnunet_mesh_service_enc.h b/src/include/gnunet_mesh_service_enc.h index b495d0754..af4eeaa5d 100644 --- a/src/include/gnunet_mesh_service_enc.h +++ b/src/include/gnunet_mesh_service_enc.h | |||
@@ -91,7 +91,7 @@ enum MeshOption | |||
91 | /** | 91 | /** |
92 | * Functions with this signature are called whenever a message is | 92 | * Functions with this signature are called whenever a message is |
93 | * received. | 93 | * received. |
94 | * | 94 | * |
95 | * Each time the function must call #GNUNET_MESH_receive_done on the channel | 95 | * Each time the function must call #GNUNET_MESH_receive_done on the channel |
96 | * in order to receive the next message. This doesn't need to be immediate: | 96 | * in order to receive the next message. This doesn't need to be immediate: |
97 | * can be delayed if some processing is done on the message. | 97 | * can be delayed if some processing is done on the message. |
@@ -161,8 +161,8 @@ typedef void *(GNUNET_MESH_InboundChannelNotificationHandler) (void *cls, | |||
161 | 161 | ||
162 | /** | 162 | /** |
163 | * Function called whenever a channel is destroyed. Should clean up | 163 | * Function called whenever a channel is destroyed. Should clean up |
164 | * any associated state. | 164 | * any associated state. |
165 | * | 165 | * |
166 | * It must NOT call #GNUNET_MESH_channel_destroy on the channel. | 166 | * It must NOT call #GNUNET_MESH_channel_destroy on the channel. |
167 | * | 167 | * |
168 | * @param cls closure (set from #GNUNET_MESH_connect) | 168 | * @param cls closure (set from #GNUNET_MESH_connect) |
@@ -180,7 +180,7 @@ typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls, | |||
180 | * Connect to the mesh service. | 180 | * Connect to the mesh service. |
181 | * | 181 | * |
182 | * @param cfg Configuration to use. | 182 | * @param cfg Configuration to use. |
183 | * @param cls Closure for the various callbacks that follow (including | 183 | * @param cls Closure for the various callbacks that follow (including |
184 | * handlers in the handlers array). | 184 | * handlers in the handlers array). |
185 | * @param new_channel Function called when an *incoming* channel is created. | 185 | * @param new_channel Function called when an *incoming* channel is created. |
186 | * Can be NULL if no inbound channels are desired. | 186 | * Can be NULL if no inbound channels are desired. |
@@ -191,10 +191,10 @@ typedef void (GNUNET_MESH_ChannelEndHandler) (void *cls, | |||
191 | * @param handlers Callbacks for messages we care about, NULL-terminated. Each | 191 | * @param handlers Callbacks for messages we care about, NULL-terminated. Each |
192 | * one must call #GNUNET_MESH_receive_done on the channel to | 192 | * one must call #GNUNET_MESH_receive_done on the channel to |
193 | * receive the next message. Messages of a type that is not | 193 | * receive the next message. Messages of a type that is not |
194 | * in the handlers array are ignored if received. | 194 | * in the handlers array are ignored if received. |
195 | * @param ports NULL or 0-terminated array of port numbers for incoming channels. | 195 | * @param ports NULL or 0-terminated array of port numbers for incoming channels. |
196 | * See @a new_channel. | 196 | * See @a new_channel. |
197 | * | 197 | * |
198 | * @return handle to the mesh service NULL on error | 198 | * @return handle to the mesh service NULL on error |
199 | * (in this case, init is never called) | 199 | * (in this case, init is never called) |
200 | */ | 200 | */ |
@@ -231,7 +231,7 @@ GNUNET_MESH_disconnect (struct GNUNET_MESH_Handle *handle); | |||
231 | * @return handle to the channel | 231 | * @return handle to the channel |
232 | */ | 232 | */ |
233 | struct GNUNET_MESH_Channel * | 233 | struct GNUNET_MESH_Channel * |
234 | GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h, | 234 | GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h, |
235 | void *channel_ctx, | 235 | void *channel_ctx, |
236 | const struct GNUNET_PeerIdentity *peer, | 236 | const struct GNUNET_PeerIdentity *peer, |
237 | uint32_t port, | 237 | uint32_t port, |
@@ -241,7 +241,7 @@ GNUNET_MESH_channel_create (struct GNUNET_MESH_Handle *h, | |||
241 | 241 | ||
242 | /** | 242 | /** |
243 | * Destroy an existing channel. | 243 | * Destroy an existing channel. |
244 | * | 244 | * |
245 | * The existing end callback for the channel will be called immediately. | 245 | * The existing end callback for the channel will be called immediately. |
246 | * Any pending outgoing messages will be sent but no incoming messages will be | 246 | * Any pending outgoing messages will be sent but no incoming messages will be |
247 | * accepted and no data callbacks will be called. | 247 | * accepted and no data callbacks will be called. |
@@ -255,7 +255,7 @@ GNUNET_MESH_channel_destroy (struct GNUNET_MESH_Channel *channel); | |||
255 | /** | 255 | /** |
256 | * Struct to retrieve info about a channel. | 256 | * Struct to retrieve info about a channel. |
257 | */ | 257 | */ |
258 | union GNUNET_MESH_ChannelInfo | 258 | union GNUNET_MESH_ChannelInfo |
259 | { | 259 | { |
260 | 260 | ||
261 | /** | 261 | /** |
@@ -329,7 +329,7 @@ GNUNET_MESH_notify_transmit_ready_cancel (struct GNUNET_MESH_TransmitHandle | |||
329 | 329 | ||
330 | /** | 330 | /** |
331 | * Indicate readiness to receive the next message on a channel. | 331 | * Indicate readiness to receive the next message on a channel. |
332 | * | 332 | * |
333 | * Should only be called once per handler called. | 333 | * Should only be called once per handler called. |
334 | * | 334 | * |
335 | * @param channel Channel that will be allowed to call another handler. | 335 | * @param channel Channel that will be allowed to call another handler. |
diff --git a/src/include/gnunet_microphone_lib.h b/src/include/gnunet_microphone_lib.h index 241d58a6c..def8418b7 100644 --- a/src/include/gnunet_microphone_lib.h +++ b/src/include/gnunet_microphone_lib.h | |||
@@ -1,17 +1,17 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
7 | by the Free Software Foundation; either version 3, or (at your | 7 | by the Free Software Foundation; either version 3, or (at your |
8 | option) any later version. | 8 | option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | General Public License for more details. | 13 | General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with GNUnet; see the file COPYING. If not, write to the | 16 | along with GNUnet; see the file COPYING. If not, write to the |
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index fd28f3de6..17d8e8e56 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h | |||
@@ -143,22 +143,22 @@ struct GNUNET_MQ_Envelope; | |||
143 | 143 | ||
144 | /** | 144 | /** |
145 | * Error codes for the queue. | 145 | * Error codes for the queue. |
146 | */ | 146 | */ |
147 | enum GNUNET_MQ_Error | 147 | enum GNUNET_MQ_Error |
148 | { | 148 | { |
149 | /** | 149 | /** |
150 | * FIXME: document! | 150 | * FIXME: document! |
151 | */ | 151 | */ |
152 | GNUNET_MQ_ERROR_READ = 1, | 152 | GNUNET_MQ_ERROR_READ = 1, |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * FIXME: document! | 155 | * FIXME: document! |
156 | */ | 156 | */ |
157 | GNUNET_MQ_ERROR_WRITE = 2, | 157 | GNUNET_MQ_ERROR_WRITE = 2, |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * FIXME: document! | 160 | * FIXME: document! |
161 | */ | 161 | */ |
162 | GNUNET_MQ_ERROR_TIMEOUT = 4 | 162 | GNUNET_MQ_ERROR_TIMEOUT = 4 |
163 | }; | 163 | }; |
164 | 164 | ||
@@ -193,7 +193,7 @@ typedef void | |||
193 | * destruction of a message queue. | 193 | * destruction of a message queue. |
194 | * Implementations must not free @a mq, but should | 194 | * Implementations must not free @a mq, but should |
195 | * take care of @a impl_state. | 195 | * take care of @a impl_state. |
196 | * | 196 | * |
197 | * @param mq the message queue to destroy | 197 | * @param mq the message queue to destroy |
198 | * @param impl_state state of the implementation | 198 | * @param impl_state state of the implementation |
199 | */ | 199 | */ |
@@ -203,7 +203,7 @@ typedef void | |||
203 | 203 | ||
204 | /** | 204 | /** |
205 | * Implementation function that cancels the currently sent message. | 205 | * Implementation function that cancels the currently sent message. |
206 | * | 206 | * |
207 | * @param mq message queue | 207 | * @param mq message queue |
208 | * @param impl_state state specific to the implementation | 208 | * @param impl_state state specific to the implementation |
209 | */ | 209 | */ |
@@ -239,7 +239,7 @@ typedef void | |||
239 | struct GNUNET_MQ_MessageHandler | 239 | struct GNUNET_MQ_MessageHandler |
240 | { | 240 | { |
241 | /** | 241 | /** |
242 | * Callback, called every time a new message of | 242 | * Callback, called every time a new message of |
243 | * the specified type has been receied. | 243 | * the specified type has been receied. |
244 | */ | 244 | */ |
245 | GNUNET_MQ_MessageCallback cb; | 245 | GNUNET_MQ_MessageCallback cb; |
@@ -262,7 +262,7 @@ struct GNUNET_MQ_MessageHandler | |||
262 | 262 | ||
263 | /** | 263 | /** |
264 | * Create a new envelope. | 264 | * Create a new envelope. |
265 | * | 265 | * |
266 | * @param mhp message header to store the allocated message header in, can be NULL | 266 | * @param mhp message header to store the allocated message header in, can be NULL |
267 | * @param size size of the message to allocate | 267 | * @param size size of the message to allocate |
268 | * @param type type of the message, will be set in the allocated message | 268 | * @param type type of the message, will be set in the allocated message |
@@ -286,12 +286,12 @@ GNUNET_MQ_discard (struct GNUNET_MQ_Envelope *mqm); | |||
286 | /** | 286 | /** |
287 | * Send a message with the give message queue. | 287 | * Send a message with the give message queue. |
288 | * May only be called once per message. | 288 | * May only be called once per message. |
289 | * | 289 | * |
290 | * @param mq message queue | 290 | * @param mq message queue |
291 | * @param ev the envelope with the message to send. | 291 | * @param ev the envelope with the message to send. |
292 | */ | 292 | */ |
293 | void | 293 | void |
294 | GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, | 294 | GNUNET_MQ_send (struct GNUNET_MQ_Handle *mq, |
295 | struct GNUNET_MQ_Envelope *ev); | 295 | struct GNUNET_MQ_Envelope *ev); |
296 | 296 | ||
297 | 297 | ||
@@ -385,7 +385,7 @@ GNUNET_MQ_queue_for_callbacks (GNUNET_MQ_SendImpl send, | |||
385 | const struct GNUNET_MQ_MessageHandler *handlers, | 385 | const struct GNUNET_MQ_MessageHandler *handlers, |
386 | GNUNET_MQ_ErrorHandler error_handler, | 386 | GNUNET_MQ_ErrorHandler error_handler, |
387 | void *cls); | 387 | void *cls); |
388 | 388 | ||
389 | 389 | ||
390 | 390 | ||
391 | /** | 391 | /** |
diff --git a/src/include/gnunet_multicast_service.h b/src/include/gnunet_multicast_service.h index ec446a906..7a2421b4b 100644 --- a/src/include/gnunet_multicast_service.h +++ b/src/include/gnunet_multicast_service.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_multicast_service.h | 22 | * @file include/gnunet_multicast_service.h |
23 | * @brief multicast service; establish tunnels to distant peers | 23 | * @brief multicast service; establish tunnels to distant peers |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
@@ -39,7 +39,7 @@ extern "C" | |||
39 | #include "gnunet_util_lib.h" | 39 | #include "gnunet_util_lib.h" |
40 | #include "gnunet_transport_service.h" | 40 | #include "gnunet_transport_service.h" |
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Version number of GNUnet-multicast API. | 43 | * Version number of GNUnet-multicast API. |
44 | */ | 44 | */ |
45 | #define GNUNET_MULTICAST_VERSION 0x00000000 | 45 | #define GNUNET_MULTICAST_VERSION 0x00000000 |
@@ -49,12 +49,12 @@ extern "C" | |||
49 | */ | 49 | */ |
50 | #define GNUNET_MULTICAST_FRAGMENT_MAX_SIZE 63 * 1024 | 50 | #define GNUNET_MULTICAST_FRAGMENT_MAX_SIZE 63 * 1024 |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Opaque handle for a multicast group member. | 53 | * Opaque handle for a multicast group member. |
54 | */ | 54 | */ |
55 | struct GNUNET_MULTICAST_Member; | 55 | struct GNUNET_MULTICAST_Member; |
56 | 56 | ||
57 | /** | 57 | /** |
58 | * Handle for the origin of a multicast group. | 58 | * Handle for the origin of a multicast group. |
59 | */ | 59 | */ |
60 | struct GNUNET_MULTICAST_Origin; | 60 | struct GNUNET_MULTICAST_Origin; |
@@ -72,7 +72,7 @@ enum GNUNET_MULTICAST_MessageFlags | |||
72 | */ | 72 | */ |
73 | GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT = 1 << 1, | 73 | GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT = 1 << 1, |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * OR'ed flags if message is not fragmented. | 76 | * OR'ed flags if message is not fragmented. |
77 | */ | 77 | */ |
78 | GNUNET_MULTICAST_MESSAGE_NOT_FRAGMENTED | 78 | GNUNET_MULTICAST_MESSAGE_NOT_FRAGMENTED |
@@ -83,7 +83,7 @@ enum GNUNET_MULTICAST_MessageFlags | |||
83 | 83 | ||
84 | GNUNET_NETWORK_STRUCT_BEGIN | 84 | GNUNET_NETWORK_STRUCT_BEGIN |
85 | 85 | ||
86 | /** | 86 | /** |
87 | * Header of a multicast message fragment. | 87 | * Header of a multicast message fragment. |
88 | * | 88 | * |
89 | * This format is public as the replay mechanism must replay message fragments using the | 89 | * This format is public as the replay mechanism must replay message fragments using the |
@@ -93,12 +93,12 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
93 | struct GNUNET_MULTICAST_MessageHeader | 93 | struct GNUNET_MULTICAST_MessageHeader |
94 | { | 94 | { |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Header for all multicast message fragments from the origin. | 97 | * Header for all multicast message fragments from the origin. |
98 | */ | 98 | */ |
99 | struct GNUNET_MessageHeader header; | 99 | struct GNUNET_MessageHeader header; |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * Number of hops this message fragment has taken since the origin. | 102 | * Number of hops this message fragment has taken since the origin. |
103 | * | 103 | * |
104 | * Helpful to determine shortest paths to the origin among honest peers for | 104 | * Helpful to determine shortest paths to the origin among honest peers for |
@@ -107,36 +107,36 @@ struct GNUNET_MULTICAST_MessageHeader | |||
107 | */ | 107 | */ |
108 | uint32_t hop_counter GNUNET_PACKED; | 108 | uint32_t hop_counter GNUNET_PACKED; |
109 | 109 | ||
110 | /** | 110 | /** |
111 | * ECC signature of the message fragment. | 111 | * ECC signature of the message fragment. |
112 | * | 112 | * |
113 | * Signature must match the public key of the multicast group. | 113 | * Signature must match the public key of the multicast group. |
114 | */ | 114 | */ |
115 | struct GNUNET_CRYPTO_EccSignature signature; | 115 | struct GNUNET_CRYPTO_EccSignature signature; |
116 | 116 | ||
117 | /** | 117 | /** |
118 | * Purpose for the signature and size of the signed data. | 118 | * Purpose for the signature and size of the signed data. |
119 | */ | 119 | */ |
120 | struct GNUNET_CRYPTO_EccSignaturePurpose purpose; | 120 | struct GNUNET_CRYPTO_EccSignaturePurpose purpose; |
121 | 121 | ||
122 | /** | 122 | /** |
123 | * Number of the message fragment, monotonically increasing. | 123 | * Number of the message fragment, monotonically increasing. |
124 | */ | 124 | */ |
125 | uint64_t fragment_id GNUNET_PACKED; | 125 | uint64_t fragment_id GNUNET_PACKED; |
126 | 126 | ||
127 | /** | 127 | /** |
128 | * Byte offset of this @e fragment of the @e message. | 128 | * Byte offset of this @e fragment of the @e message. |
129 | */ | 129 | */ |
130 | uint64_t fragment_offset GNUNET_PACKED; | 130 | uint64_t fragment_offset GNUNET_PACKED; |
131 | 131 | ||
132 | /** | 132 | /** |
133 | * Number of the message this fragment belongs to. | 133 | * Number of the message this fragment belongs to. |
134 | * | 134 | * |
135 | * Set in GNUNET_MULTICAST_origin_to_all(). | 135 | * Set in GNUNET_MULTICAST_origin_to_all(). |
136 | */ | 136 | */ |
137 | uint64_t message_id GNUNET_PACKED; | 137 | uint64_t message_id GNUNET_PACKED; |
138 | 138 | ||
139 | /** | 139 | /** |
140 | * Counter that monotonically increases whenever a member parts the group. | 140 | * Counter that monotonically increases whenever a member parts the group. |
141 | * | 141 | * |
142 | * Set in GNUNET_MULTICAST_origin_to_all(). | 142 | * Set in GNUNET_MULTICAST_origin_to_all(). |
@@ -159,7 +159,7 @@ struct GNUNET_MULTICAST_MessageHeader | |||
159 | GNUNET_NETWORK_STRUCT_END | 159 | GNUNET_NETWORK_STRUCT_END |
160 | 160 | ||
161 | 161 | ||
162 | /** | 162 | /** |
163 | * Handle that identifies a join request. | 163 | * Handle that identifies a join request. |
164 | * | 164 | * |
165 | * Used to match calls to #GNUNET_MULTICAST_JoinCallback to the | 165 | * Used to match calls to #GNUNET_MULTICAST_JoinCallback to the |
@@ -168,7 +168,7 @@ GNUNET_NETWORK_STRUCT_END | |||
168 | struct GNUNET_MULTICAST_JoinHandle; | 168 | struct GNUNET_MULTICAST_JoinHandle; |
169 | 169 | ||
170 | 170 | ||
171 | /** | 171 | /** |
172 | * Function to call with the decision made for a join request. | 172 | * Function to call with the decision made for a join request. |
173 | * | 173 | * |
174 | * Must be called once and only once in response to an invocation of the | 174 | * Must be called once and only once in response to an invocation of the |
@@ -198,7 +198,7 @@ GNUNET_MULTICAST_join_decision (struct GNUNET_MULTICAST_JoinHandle *jh, | |||
198 | const struct GNUNET_MessageHeader *join_response); | 198 | const struct GNUNET_MessageHeader *join_response); |
199 | 199 | ||
200 | 200 | ||
201 | /** | 201 | /** |
202 | * Method called whenever another peer wants to join the multicast group. | 202 | * Method called whenever another peer wants to join the multicast group. |
203 | * | 203 | * |
204 | * Implementations of this function must call GNUNET_MULTICAST_join_decision() | 204 | * Implementations of this function must call GNUNET_MULTICAST_join_decision() |
@@ -219,13 +219,13 @@ typedef void | |||
219 | struct GNUNET_MULTICAST_JoinHandle *jh); | 219 | struct GNUNET_MULTICAST_JoinHandle *jh); |
220 | 220 | ||
221 | 221 | ||
222 | /** | 222 | /** |
223 | * Handle to pass back for the answer of a membership test. | 223 | * Handle to pass back for the answer of a membership test. |
224 | */ | 224 | */ |
225 | struct GNUNET_MULTICAST_MembershipTestHandle; | 225 | struct GNUNET_MULTICAST_MembershipTestHandle; |
226 | 226 | ||
227 | 227 | ||
228 | /** | 228 | /** |
229 | * Call informing multicast about the decision taken for a membership test. | 229 | * Call informing multicast about the decision taken for a membership test. |
230 | * | 230 | * |
231 | * @param mth Handle that was given for the query. | 231 | * @param mth Handle that was given for the query. |
@@ -237,7 +237,7 @@ GNUNET_MULTICAST_membership_test_result (struct GNUNET_MULTICAST_MembershipTestH | |||
237 | int result); | 237 | int result); |
238 | 238 | ||
239 | 239 | ||
240 | /** | 240 | /** |
241 | * Method called to test if a member was in the group at a particular time. | 241 | * Method called to test if a member was in the group at a particular time. |
242 | * | 242 | * |
243 | * It is called when a replay request is received to determine if the requested | 243 | * It is called when a replay request is received to determine if the requested |
@@ -259,14 +259,14 @@ typedef void | |||
259 | struct GNUNET_MULTICAST_MembershipTestHandle *mth); | 259 | struct GNUNET_MULTICAST_MembershipTestHandle *mth); |
260 | 260 | ||
261 | 261 | ||
262 | /** | 262 | /** |
263 | * Function called whenever a group member has transmitted a request | 263 | * Function called whenever a group member has transmitted a request |
264 | * to the origin (other than joining or leaving). | 264 | * to the origin (other than joining or leaving). |
265 | * | 265 | * |
266 | * FIXME: need to distinguish between origin cancelling a message (some fragments | 266 | * FIXME: need to distinguish between origin cancelling a message (some fragments |
267 | * were sent, then the rest 'discarded') and the case where we got disconnected; | 267 | * were sent, then the rest 'discarded') and the case where we got disconnected; |
268 | * right now, both would mean 'msg' is NULL, but they could be quite different... | 268 | * right now, both would mean 'msg' is NULL, but they could be quite different... |
269 | * So the semantics from the receiver side of | 269 | * So the semantics from the receiver side of |
270 | * GNUNET_MULTICAST_member_to_origin_cancel() are not clear here. Maybe we | 270 | * GNUNET_MULTICAST_member_to_origin_cancel() are not clear here. Maybe we |
271 | * should do something with the flags in this case? | 271 | * should do something with the flags in this case? |
272 | * | 272 | * |
@@ -282,7 +282,7 @@ typedef void | |||
282 | enum GNUNET_MULTICAST_MessageFlags flags); | 282 | enum GNUNET_MULTICAST_MessageFlags flags); |
283 | 283 | ||
284 | 284 | ||
285 | /** | 285 | /** |
286 | * Function called whenever a group member is receiving a message fragment from | 286 | * Function called whenever a group member is receiving a message fragment from |
287 | * the origin. | 287 | * the origin. |
288 | * | 288 | * |
@@ -293,7 +293,7 @@ typedef void | |||
293 | * FIXME: need to distinguish between origin cancelling a message (some fragments | 293 | * FIXME: need to distinguish between origin cancelling a message (some fragments |
294 | * were sent, then the rest 'discarded') and the case where we got disconnected; | 294 | * were sent, then the rest 'discarded') and the case where we got disconnected; |
295 | * right now, both would mean 'msg' is NULL, but they could be quite different... | 295 | * right now, both would mean 'msg' is NULL, but they could be quite different... |
296 | * So the semantics from the receiver side of | 296 | * So the semantics from the receiver side of |
297 | * GNUNET_MULTICAST_origin_to_all_cancel() are not clear here. | 297 | * GNUNET_MULTICAST_origin_to_all_cancel() are not clear here. |
298 | * | 298 | * |
299 | * @param cls Closure (set from GNUNET_MULTICAST_member_join()) | 299 | * @param cls Closure (set from GNUNET_MULTICAST_member_join()) |
@@ -306,11 +306,11 @@ typedef void | |||
306 | const struct GNUNET_MessageHeader *msg); | 306 | const struct GNUNET_MessageHeader *msg); |
307 | 307 | ||
308 | 308 | ||
309 | /** | 309 | /** |
310 | * Function called with the result of an asynchronous operation. | 310 | * Function called with the result of an asynchronous operation. |
311 | * | 311 | * |
312 | * @see GNUNET_MULTICAST_replay_fragment() | 312 | * @see GNUNET_MULTICAST_replay_fragment() |
313 | * | 313 | * |
314 | * @param result Result of the operation. | 314 | * @param result Result of the operation. |
315 | */ | 315 | */ |
316 | typedef void | 316 | typedef void |
@@ -318,13 +318,13 @@ typedef void | |||
318 | int result); | 318 | int result); |
319 | 319 | ||
320 | 320 | ||
321 | /** | 321 | /** |
322 | * Opaque handle to a replay request from the multicast service. | 322 | * Opaque handle to a replay request from the multicast service. |
323 | */ | 323 | */ |
324 | struct GNUNET_MULTICAST_ReplayHandle; | 324 | struct GNUNET_MULTICAST_ReplayHandle; |
325 | 325 | ||
326 | 326 | ||
327 | /** | 327 | /** |
328 | * Functions with this signature are called whenever the multicast service needs | 328 | * Functions with this signature are called whenever the multicast service needs |
329 | * a message fragment to be replayed by fragment_id. | 329 | * a message fragment to be replayed by fragment_id. |
330 | * | 330 | * |
@@ -346,7 +346,7 @@ typedef void | |||
346 | uint64_t flags, | 346 | uint64_t flags, |
347 | struct GNUNET_MULTICAST_ReplayHandle *rh); | 347 | struct GNUNET_MULTICAST_ReplayHandle *rh); |
348 | 348 | ||
349 | /** | 349 | /** |
350 | * Functions with this signature are called whenever the multicast service needs | 350 | * Functions with this signature are called whenever the multicast service needs |
351 | * a message fragment to be replayed by message_id and fragment_offset. | 351 | * a message fragment to be replayed by message_id and fragment_offset. |
352 | * | 352 | * |
@@ -371,18 +371,18 @@ typedef void | |||
371 | struct GNUNET_MULTICAST_ReplayHandle *rh); | 371 | struct GNUNET_MULTICAST_ReplayHandle *rh); |
372 | 372 | ||
373 | 373 | ||
374 | /** | 374 | /** |
375 | * Possible error codes during replay. | 375 | * Possible error codes during replay. |
376 | */ | 376 | */ |
377 | enum GNUNET_MULTICAST_ReplayErrorCode | 377 | enum GNUNET_MULTICAST_ReplayErrorCode |
378 | { | 378 | { |
379 | 379 | ||
380 | /** | 380 | /** |
381 | * Everything is fine. | 381 | * Everything is fine. |
382 | */ | 382 | */ |
383 | GNUNET_MULTICAST_REC_OK = 0, | 383 | GNUNET_MULTICAST_REC_OK = 0, |
384 | 384 | ||
385 | /** | 385 | /** |
386 | * Message fragment not found in the message store. | 386 | * Message fragment not found in the message store. |
387 | * | 387 | * |
388 | * Either discarded if it is too old, or not arrived yet if this member has | 388 | * Either discarded if it is too old, or not arrived yet if this member has |
@@ -390,7 +390,7 @@ enum GNUNET_MULTICAST_ReplayErrorCode | |||
390 | */ | 390 | */ |
391 | GNUNET_MULTICAST_REC_NOT_FOUND = 1, | 391 | GNUNET_MULTICAST_REC_NOT_FOUND = 1, |
392 | 392 | ||
393 | /** | 393 | /** |
394 | * Fragment ID counter was larger than the highest counter this | 394 | * Fragment ID counter was larger than the highest counter this |
395 | * replay function has ever encountered; thus it is likely the | 395 | * replay function has ever encountered; thus it is likely the |
396 | * origin never sent it and we're at the HEAD of the multicast | 396 | * origin never sent it and we're at the HEAD of the multicast |
@@ -400,12 +400,12 @@ enum GNUNET_MULTICAST_ReplayErrorCode | |||
400 | */ | 400 | */ |
401 | GNUNET_MULTICAST_REC_PAST_HEAD = 2, | 401 | GNUNET_MULTICAST_REC_PAST_HEAD = 2, |
402 | 402 | ||
403 | /** | 403 | /** |
404 | * Access is denied to the requested fragment, membership test did not pass. | 404 | * Access is denied to the requested fragment, membership test did not pass. |
405 | */ | 405 | */ |
406 | GNUNET_MULTICAST_REC_ACCESS_DENIED = 3, | 406 | GNUNET_MULTICAST_REC_ACCESS_DENIED = 3, |
407 | 407 | ||
408 | /** | 408 | /** |
409 | * Internal error (i.e. database error). Try some other peer. | 409 | * Internal error (i.e. database error). Try some other peer. |
410 | */ | 410 | */ |
411 | GNUNET_MULTICAST_REC_INTERNAL_ERROR = 4 | 411 | GNUNET_MULTICAST_REC_INTERNAL_ERROR = 4 |
@@ -413,7 +413,7 @@ enum GNUNET_MULTICAST_ReplayErrorCode | |||
413 | }; | 413 | }; |
414 | 414 | ||
415 | 415 | ||
416 | /** | 416 | /** |
417 | * Replay a message fragment for the multicast group. | 417 | * Replay a message fragment for the multicast group. |
418 | * | 418 | * |
419 | * @param rh Replay handle identifying which replay operation was requested. | 419 | * @param rh Replay handle identifying which replay operation was requested. |
@@ -426,7 +426,7 @@ GNUNET_MULTICAST_replay_response (struct GNUNET_MULTICAST_ReplayHandle *rh, | |||
426 | enum GNUNET_MULTICAST_ReplayErrorCode ec); | 426 | enum GNUNET_MULTICAST_ReplayErrorCode ec); |
427 | 427 | ||
428 | 428 | ||
429 | /** | 429 | /** |
430 | * Indicate the end of the replay session. | 430 | * Indicate the end of the replay session. |
431 | * | 431 | * |
432 | * Invalidates the replay handle. | 432 | * Invalidates the replay handle. |
@@ -448,7 +448,7 @@ typedef int | |||
448 | void *data); | 448 | void *data); |
449 | 449 | ||
450 | 450 | ||
451 | /** | 451 | /** |
452 | * Replay a message for the multicast group. | 452 | * Replay a message for the multicast group. |
453 | * | 453 | * |
454 | * @param rh Replay handle identifying which replay operation was requested. | 454 | * @param rh Replay handle identifying which replay operation was requested. |
@@ -461,7 +461,7 @@ GNUNET_MULTICAST_replay_response2 (struct GNUNET_MULTICAST_ReplayHandle *rh, | |||
461 | void *notify_cls); | 461 | void *notify_cls); |
462 | 462 | ||
463 | 463 | ||
464 | /** | 464 | /** |
465 | * Start a multicast group. | 465 | * Start a multicast group. |
466 | * | 466 | * |
467 | * Will advertise the origin in the P2P overlay network under the respective | 467 | * Will advertise the origin in the P2P overlay network under the respective |
@@ -501,7 +501,7 @@ GNUNET_MULTICAST_origin_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
501 | GNUNET_MULTICAST_MessageCallback message_cb, | 501 | GNUNET_MULTICAST_MessageCallback message_cb, |
502 | void *cls); | 502 | void *cls); |
503 | 503 | ||
504 | /** | 504 | /** |
505 | * Function called to provide data for a transmission from the origin to all | 505 | * Function called to provide data for a transmission from the origin to all |
506 | * members. | 506 | * members. |
507 | * | 507 | * |
@@ -526,14 +526,14 @@ typedef int | |||
526 | void *data); | 526 | void *data); |
527 | 527 | ||
528 | 528 | ||
529 | /** | 529 | /** |
530 | * Handle for a request to send a message to all multicast group members | 530 | * Handle for a request to send a message to all multicast group members |
531 | * (from the origin). | 531 | * (from the origin). |
532 | */ | 532 | */ |
533 | struct GNUNET_MULTICAST_OriginMessageHandle; | 533 | struct GNUNET_MULTICAST_OriginMessageHandle; |
534 | 534 | ||
535 | 535 | ||
536 | /** | 536 | /** |
537 | * Send a message to the multicast group. | 537 | * Send a message to the multicast group. |
538 | * | 538 | * |
539 | * @param origin Handle to the multicast group. | 539 | * @param origin Handle to the multicast group. |
@@ -553,7 +553,7 @@ GNUNET_MULTICAST_origin_to_all (struct GNUNET_MULTICAST_Origin *origin, | |||
553 | 553 | ||
554 | 554 | ||
555 | 555 | ||
556 | /** | 556 | /** |
557 | * Resume message transmission to multicast group. | 557 | * Resume message transmission to multicast group. |
558 | * | 558 | * |
559 | * @param mh Request to cancel. | 559 | * @param mh Request to cancel. |
@@ -562,7 +562,7 @@ void | |||
562 | GNUNET_MULTICAST_origin_to_all_resume (struct GNUNET_MULTICAST_OriginMessageHandle *mh); | 562 | GNUNET_MULTICAST_origin_to_all_resume (struct GNUNET_MULTICAST_OriginMessageHandle *mh); |
563 | 563 | ||
564 | 564 | ||
565 | /** | 565 | /** |
566 | * Cancel request for message transmission to multicast group. | 566 | * Cancel request for message transmission to multicast group. |
567 | * | 567 | * |
568 | * @param mh Request to cancel. | 568 | * @param mh Request to cancel. |
@@ -571,7 +571,7 @@ void | |||
571 | GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginMessageHandle *mh); | 571 | GNUNET_MULTICAST_origin_to_all_cancel (struct GNUNET_MULTICAST_OriginMessageHandle *mh); |
572 | 572 | ||
573 | 573 | ||
574 | /** | 574 | /** |
575 | * Stop a multicast group. | 575 | * Stop a multicast group. |
576 | * | 576 | * |
577 | * @param origin Multicast group to stop. | 577 | * @param origin Multicast group to stop. |
@@ -580,7 +580,7 @@ void | |||
580 | GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin); | 580 | GNUNET_MULTICAST_origin_stop (struct GNUNET_MULTICAST_Origin *origin); |
581 | 581 | ||
582 | 582 | ||
583 | /** | 583 | /** |
584 | * Join a multicast group. | 584 | * Join a multicast group. |
585 | * | 585 | * |
586 | * The entity joining is always the local peer. Further information about the | 586 | * The entity joining is always the local peer. Further information about the |
@@ -636,13 +636,13 @@ GNUNET_MULTICAST_member_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
636 | GNUNET_MULTICAST_MessageCallback message_cb, | 636 | GNUNET_MULTICAST_MessageCallback message_cb, |
637 | void *cls); | 637 | void *cls); |
638 | 638 | ||
639 | /** | 639 | /** |
640 | * Handle for a replay request. | 640 | * Handle for a replay request. |
641 | */ | 641 | */ |
642 | struct GNUNET_MULTICAST_MemberReplayHandle; | 642 | struct GNUNET_MULTICAST_MemberReplayHandle; |
643 | 643 | ||
644 | 644 | ||
645 | /** | 645 | /** |
646 | * Request a fragment to be replayed by fragment ID. | 646 | * Request a fragment to be replayed by fragment ID. |
647 | * | 647 | * |
648 | * Useful if messages below the @e max_known_fragment_id given when joining are | 648 | * Useful if messages below the @e max_known_fragment_id given when joining are |
@@ -662,7 +662,7 @@ GNUNET_MULTICAST_member_replay_fragment (struct GNUNET_MULTICAST_Member *member, | |||
662 | uint64_t flags); | 662 | uint64_t flags); |
663 | 663 | ||
664 | 664 | ||
665 | /** | 665 | /** |
666 | * Request a message fr to be replayed. | 666 | * Request a message fr to be replayed. |
667 | * | 667 | * |
668 | * Useful if messages below the @e max_known_fragment_id given when joining are | 668 | * Useful if messages below the @e max_known_fragment_id given when joining are |
@@ -686,7 +686,7 @@ GNUNET_MULTICAST_member_replay_message (struct GNUNET_MULTICAST_Member *member, | |||
686 | void *result_cb_cls); | 686 | void *result_cb_cls); |
687 | 687 | ||
688 | 688 | ||
689 | /** | 689 | /** |
690 | * Cancel a replay request. | 690 | * Cancel a replay request. |
691 | * | 691 | * |
692 | * @param rh Request to cancel. | 692 | * @param rh Request to cancel. |
@@ -695,7 +695,7 @@ void | |||
695 | GNUNET_MULTICAST_member_replay_cancel (struct GNUNET_MULTICAST_MemberReplayHandle *rh); | 695 | GNUNET_MULTICAST_member_replay_cancel (struct GNUNET_MULTICAST_MemberReplayHandle *rh); |
696 | 696 | ||
697 | 697 | ||
698 | /** | 698 | /** |
699 | * Part a multicast group. | 699 | * Part a multicast group. |
700 | * | 700 | * |
701 | * Disconnects from all group members and invalidates the @a member handle. | 701 | * Disconnects from all group members and invalidates the @a member handle. |
@@ -709,7 +709,7 @@ void | |||
709 | GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member); | 709 | GNUNET_MULTICAST_member_part (struct GNUNET_MULTICAST_Member *member); |
710 | 710 | ||
711 | 711 | ||
712 | /** | 712 | /** |
713 | * Function called to provide data for a transmission from a member to the origin. | 713 | * Function called to provide data for a transmission from a member to the origin. |
714 | * | 714 | * |
715 | * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO) | 715 | * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO) |
@@ -733,15 +733,15 @@ typedef int | |||
733 | void *data); | 733 | void *data); |
734 | 734 | ||
735 | 735 | ||
736 | /** | 736 | /** |
737 | * Handle for a message to be delivered from a member to the origin. | 737 | * Handle for a message to be delivered from a member to the origin. |
738 | */ | 738 | */ |
739 | struct GNUNET_MULTICAST_MemberRequestHandle; | 739 | struct GNUNET_MULTICAST_MemberRequestHandle; |
740 | 740 | ||
741 | 741 | ||
742 | /** | 742 | /** |
743 | * Send a message to the origin of the multicast group. | 743 | * Send a message to the origin of the multicast group. |
744 | * | 744 | * |
745 | * @param member Membership handle. | 745 | * @param member Membership handle. |
746 | * @param message_id Application layer ID for the message. Opaque to multicast. | 746 | * @param message_id Application layer ID for the message. Opaque to multicast. |
747 | * @param notify Callback to call to get the message. | 747 | * @param notify Callback to call to get the message. |
@@ -755,7 +755,7 @@ GNUNET_MULTICAST_member_to_origin (struct GNUNET_MULTICAST_Member *member, | |||
755 | void *notify_cls); | 755 | void *notify_cls); |
756 | 756 | ||
757 | 757 | ||
758 | /** | 758 | /** |
759 | * Resume message transmission to origin. | 759 | * Resume message transmission to origin. |
760 | * | 760 | * |
761 | * @param rh Request to cancel. | 761 | * @param rh Request to cancel. |
@@ -764,7 +764,7 @@ void | |||
764 | GNUNET_MULTICAST_member_to_origin_resume (struct GNUNET_MULTICAST_MemberRequestHandle *rh); | 764 | GNUNET_MULTICAST_member_to_origin_resume (struct GNUNET_MULTICAST_MemberRequestHandle *rh); |
765 | 765 | ||
766 | 766 | ||
767 | /** | 767 | /** |
768 | * Cancel request for message transmission to origin. | 768 | * Cancel request for message transmission to origin. |
769 | * | 769 | * |
770 | * @param rh Request to cancel. | 770 | * @param rh Request to cancel. |
diff --git a/src/include/gnunet_mysql_lib.h b/src/include/gnunet_mysql_lib.h index c61bdcab1..260de5982 100644 --- a/src/include/gnunet_mysql_lib.h +++ b/src/include/gnunet_mysql_lib.h | |||
@@ -76,7 +76,7 @@ GNUNET_MYSQL_context_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Destroy a mysql context. Also frees all associated prepared statements. | 78 | * Destroy a mysql context. Also frees all associated prepared statements. |
79 | * | 79 | * |
80 | * @param mc context to destroy | 80 | * @param mc context to destroy |
81 | */ | 81 | */ |
82 | void | 82 | void |
diff --git a/src/include/gnunet_namestore_plugin.h b/src/include/gnunet_namestore_plugin.h index 32d13e200..4d4821bcb 100644 --- a/src/include/gnunet_namestore_plugin.h +++ b/src/include/gnunet_namestore_plugin.h | |||
@@ -83,7 +83,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
83 | * @param block block to cache | 83 | * @param block block to cache |
84 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 84 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
85 | */ | 85 | */ |
86 | int (*cache_block) (void *cls, | 86 | int (*cache_block) (void *cls, |
87 | const struct GNUNET_NAMESTORE_Block *block); | 87 | const struct GNUNET_NAMESTORE_Block *block); |
88 | 88 | ||
89 | 89 | ||
@@ -97,7 +97,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
97 | * @param iter_cls closure for @a iter | 97 | * @param iter_cls closure for @a iter |
98 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error | 98 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error |
99 | */ | 99 | */ |
100 | int (*lookup_block) (void *cls, | 100 | int (*lookup_block) (void *cls, |
101 | const struct GNUNET_HashCode *query, | 101 | const struct GNUNET_HashCode *query, |
102 | GNUNET_NAMESTORE_BlockCallback iter, void *iter_cls); | 102 | GNUNET_NAMESTORE_BlockCallback iter, void *iter_cls); |
103 | 103 | ||
@@ -114,7 +114,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
114 | * @param rd array of records with data to store | 114 | * @param rd array of records with data to store |
115 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 115 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
116 | */ | 116 | */ |
117 | int (*store_records) (void *cls, | 117 | int (*store_records) (void *cls, |
118 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, | 118 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, |
119 | const char *label, | 119 | const char *label, |
120 | unsigned int rd_count, | 120 | unsigned int rd_count, |
@@ -132,7 +132,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
132 | * @param iter_cls closure for @a iter | 132 | * @param iter_cls closure for @a iter |
133 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error | 133 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error |
134 | */ | 134 | */ |
135 | int (*iterate_records) (void *cls, | 135 | int (*iterate_records) (void *cls, |
136 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, | 136 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, |
137 | uint64_t offset, | 137 | uint64_t offset, |
138 | GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls); | 138 | GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls); |
@@ -149,7 +149,7 @@ struct GNUNET_NAMESTORE_PluginFunctions | |||
149 | * @param iter_cls closure for @a iter | 149 | * @param iter_cls closure for @a iter |
150 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error | 150 | * @return #GNUNET_OK on success, #GNUNET_NO if there were no results, #GNUNET_SYSERR on error |
151 | */ | 151 | */ |
152 | int (*zone_to_name) (void *cls, | 152 | int (*zone_to_name) (void *cls, |
153 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, | 153 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, |
154 | const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, | 154 | const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, |
155 | GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls); | 155 | GNUNET_NAMESTORE_RecordIterator iter, void *iter_cls); |
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index adc1a7e1d..7e39adc49 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -144,7 +144,7 @@ typedef void (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls, | |||
144 | */ | 144 | */ |
145 | enum GNUNET_NAMESTORE_RecordFlags | 145 | enum GNUNET_NAMESTORE_RecordFlags |
146 | { | 146 | { |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * No special options. | 149 | * No special options. |
150 | */ | 150 | */ |
@@ -251,7 +251,7 @@ struct GNUNET_NAMESTORE_Block | |||
251 | * of encrypted data that follow. | 251 | * of encrypted data that follow. |
252 | */ | 252 | */ |
253 | struct GNUNET_CRYPTO_EccSignaturePurpose purpose; | 253 | struct GNUNET_CRYPTO_EccSignaturePurpose purpose; |
254 | 254 | ||
255 | /** | 255 | /** |
256 | * Expiration time of the block. | 256 | * Expiration time of the block. |
257 | */ | 257 | */ |
@@ -266,7 +266,7 @@ GNUNET_NETWORK_STRUCT_END | |||
266 | 266 | ||
267 | /** | 267 | /** |
268 | * Store an item in the namestore. If the item is already present, | 268 | * Store an item in the namestore. If the item is already present, |
269 | * it is replaced with the new record. | 269 | * it is replaced with the new record. |
270 | * | 270 | * |
271 | * @param h handle to the namestore | 271 | * @param h handle to the namestore |
272 | * @param block block to store | 272 | * @param block block to store |
@@ -317,7 +317,7 @@ typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls, | |||
317 | 317 | ||
318 | /** | 318 | /** |
319 | * Get a result for a particular key from the namestore. The processor | 319 | * Get a result for a particular key from the namestore. The processor |
320 | * will only be called once. | 320 | * will only be called once. |
321 | * | 321 | * |
322 | * @param h handle to the namestore | 322 | * @param h handle to the namestore |
323 | * @param derived_hash hash of zone key combined with name to lookup | 323 | * @param derived_hash hash of zone key combined with name to lookup |
@@ -328,7 +328,7 @@ typedef void (*GNUNET_NAMESTORE_BlockProcessor) (void *cls, | |||
328 | * @return a handle that can be used to cancel | 328 | * @return a handle that can be used to cancel |
329 | */ | 329 | */ |
330 | struct GNUNET_NAMESTORE_QueueEntry * | 330 | struct GNUNET_NAMESTORE_QueueEntry * |
331 | GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, | 331 | GNUNET_NAMESTORE_lookup_block (struct GNUNET_NAMESTORE_Handle *h, |
332 | const struct GNUNET_HashCode *derived_hash, | 332 | const struct GNUNET_HashCode *derived_hash, |
333 | GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls); | 333 | GNUNET_NAMESTORE_BlockProcessor proc, void *proc_cls); |
334 | 334 | ||
@@ -363,7 +363,7 @@ typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, | |||
363 | * cancel | 363 | * cancel |
364 | */ | 364 | */ |
365 | struct GNUNET_NAMESTORE_QueueEntry * | 365 | struct GNUNET_NAMESTORE_QueueEntry * |
366 | GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h, | 366 | GNUNET_NAMESTORE_zone_to_name (struct GNUNET_NAMESTORE_Handle *h, |
367 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, | 367 | const struct GNUNET_CRYPTO_EccPrivateKey *zone, |
368 | const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, | 368 | const struct GNUNET_CRYPTO_EccPublicSignKey *value_zone, |
369 | GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls); | 369 | GNUNET_NAMESTORE_RecordMonitor proc, void *proc_cls); |
@@ -444,7 +444,7 @@ struct GNUNET_NAMESTORE_ZoneMonitor; | |||
444 | 444 | ||
445 | 445 | ||
446 | /** | 446 | /** |
447 | * Function called once the monitor has caught up with the current | 447 | * Function called once the monitor has caught up with the current |
448 | * state of the database. Will be called AGAIN after each disconnect | 448 | * state of the database. Will be called AGAIN after each disconnect |
449 | * (record monitor called with 'NULL' for zone_key) once we're again | 449 | * (record monitor called with 'NULL' for zone_key) once we're again |
450 | * in sync. | 450 | * in sync. |
@@ -534,7 +534,7 @@ GNUNET_NAMESTORE_records_deserialize (size_t len, | |||
534 | 534 | ||
535 | 535 | ||
536 | /** | 536 | /** |
537 | * Convert the binary value @a data of a record of | 537 | * Convert the binary value @a data of a record of |
538 | * type @a type to a human-readable string. | 538 | * type @a type to a human-readable string. |
539 | * | 539 | * |
540 | * @param type type of the record | 540 | * @param type type of the record |
@@ -587,7 +587,7 @@ GNUNET_NAMESTORE_number_to_typename (uint32_t type); | |||
587 | 587 | ||
588 | /** | 588 | /** |
589 | * Test if a given record is expired. | 589 | * Test if a given record is expired. |
590 | * | 590 | * |
591 | * @param rd record to test | 591 | * @param rd record to test |
592 | * @return #GNUNET_YES if the record is expired, | 592 | * @return #GNUNET_YES if the record is expired, |
593 | * #GNUNET_NO if not | 593 | * #GNUNET_NO if not |
@@ -619,11 +619,11 @@ GNUNET_NAMESTORE_z2s (const struct GNUNET_CRYPTO_EccPublicSignKey *z); | |||
619 | 619 | ||
620 | /** | 620 | /** |
621 | * Convert public key to the respective absolute domain name in the | 621 | * Convert public key to the respective absolute domain name in the |
622 | * ".zkey" pTLD. | 622 | * ".zkey" pTLD. |
623 | * This is one of the very few calls in the entire API that is | 623 | * This is one of the very few calls in the entire API that is |
624 | * NOT reentrant! | 624 | * NOT reentrant! |
625 | * | 625 | * |
626 | * @param pkey a public key with a point on the eliptic curve | 626 | * @param pkey a public key with a point on the eliptic curve |
627 | * @return string "X.zkey" where X is the coordinates of the public | 627 | * @return string "X.zkey" where X is the coordinates of the public |
628 | * key in an encoding suitable for DNS labels. | 628 | * key in an encoding suitable for DNS labels. |
629 | */ | 629 | */ |
@@ -634,10 +634,10 @@ GNUNET_NAMESTORE_pkey_to_zkey (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey | |||
634 | /** | 634 | /** |
635 | * Convert an absolute domain name in the ".zkey" pTLD to the | 635 | * Convert an absolute domain name in the ".zkey" pTLD to the |
636 | * respective public key. | 636 | * respective public key. |
637 | * | 637 | * |
638 | * @param zkey string "X.zkey" where X is the public | 638 | * @param zkey string "X.zkey" where X is the public |
639 | * key in an encoding suitable for DNS labels. | 639 | * key in an encoding suitable for DNS labels. |
640 | * @param pkey set to a public key on the eliptic curve | 640 | * @param pkey set to a public key on the eliptic curve |
641 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax | 641 | * @return #GNUNET_SYSERR if @a zkey has the wrong syntax |
642 | */ | 642 | */ |
643 | int | 643 | int |
@@ -647,7 +647,7 @@ GNUNET_NAMESTORE_zkey_to_pkey (const char *zkey, | |||
647 | 647 | ||
648 | /** | 648 | /** |
649 | * Calculate the DHT query for a given @a label in a given @a zone. | 649 | * Calculate the DHT query for a given @a label in a given @a zone. |
650 | * | 650 | * |
651 | * @param zone private key of the zone | 651 | * @param zone private key of the zone |
652 | * @param label label of the record | 652 | * @param label label of the record |
653 | * @param query hash to use for the query | 653 | * @param query hash to use for the query |
@@ -660,7 +660,7 @@ GNUNET_NAMESTORE_query_from_private_key (const struct GNUNET_CRYPTO_EccPrivateKe | |||
660 | 660 | ||
661 | /** | 661 | /** |
662 | * Calculate the DHT query for a given @a label in a given @a zone. | 662 | * Calculate the DHT query for a given @a label in a given @a zone. |
663 | * | 663 | * |
664 | * @param pub public key of the zone | 664 | * @param pub public key of the zone |
665 | * @param label label of the record | 665 | * @param label label of the record |
666 | * @param query hash to use for the query | 666 | * @param query hash to use for the query |
@@ -707,7 +707,7 @@ GNUNET_NAMESTORE_block_verify (const struct GNUNET_NAMESTORE_Block *block); | |||
707 | * @param label the name for the records | 707 | * @param label the name for the records |
708 | * @param proc function to call with the result | 708 | * @param proc function to call with the result |
709 | * @param proc_cls closure for @a proc | 709 | * @param proc_cls closure for @a proc |
710 | * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was | 710 | * @return #GNUNET_OK on success, #GNUNET_SYSERR if the block was |
711 | * not well-formed | 711 | * not well-formed |
712 | */ | 712 | */ |
713 | int | 713 | int |
@@ -722,7 +722,7 @@ GNUNET_NAMESTORE_block_decrypt (const struct GNUNET_NAMESTORE_Block *block, | |||
722 | * Compares if two records are equal | 722 | * Compares if two records are equal |
723 | * | 723 | * |
724 | * @param a a record | 724 | * @param a a record |
725 | * @param b another record | 725 | * @param b another record |
726 | * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not. | 726 | * @return #GNUNET_YES if the records are equal, or #GNUNET_NO if not. |
727 | */ | 727 | */ |
728 | int | 728 | int |
@@ -736,11 +736,11 @@ GNUNET_NAMESTORE_records_cmp (const struct GNUNET_NAMESTORE_RecordData *a, | |||
736 | * expiration time. | 736 | * expiration time. |
737 | * | 737 | * |
738 | * @param rd_count number of records given in @a rd | 738 | * @param rd_count number of records given in @a rd |
739 | * @param rd array of records | 739 | * @param rd array of records |
740 | * @return absolute expiration time | 740 | * @return absolute expiration time |
741 | */ | 741 | */ |
742 | struct GNUNET_TIME_Absolute | 742 | struct GNUNET_TIME_Absolute |
743 | GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count, | 743 | GNUNET_NAMESTORE_record_get_expiration_time (unsigned int rd_count, |
744 | const struct GNUNET_NAMESTORE_RecordData *rd); | 744 | const struct GNUNET_NAMESTORE_RecordData *rd); |
745 | 745 | ||
746 | 746 | ||
diff --git a/src/include/gnunet_nat_lib.h b/src/include/gnunet_nat_lib.h index 701fc56ae..e3a4749c6 100644 --- a/src/include/gnunet_nat_lib.h +++ b/src/include/gnunet_nat_lib.h | |||
@@ -284,7 +284,7 @@ struct GNUNET_NAT_AutoHandle * | |||
284 | GNUNET_NAT_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | 284 | GNUNET_NAT_autoconfig_start (const struct GNUNET_CONFIGURATION_Handle *cfg, |
285 | GNUNET_NAT_AutoResultCallback cb, | 285 | GNUNET_NAT_AutoResultCallback cb, |
286 | void *cb_cls); | 286 | void *cb_cls); |
287 | 287 | ||
288 | 288 | ||
289 | /** | 289 | /** |
290 | * Abort autoconfiguration. | 290 | * Abort autoconfiguration. |
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 910be8c72..d24019f1a 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h | |||
@@ -126,7 +126,7 @@ GNUNET_NETWORK_socket_box_native (SOCKTYPE fd); | |||
126 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error | 126 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on error |
127 | */ | 127 | */ |
128 | int | 128 | int |
129 | GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, | 129 | GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, |
130 | int doBlock); | 130 | int doBlock); |
131 | 131 | ||
132 | 132 | ||
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index 9cf68df58..04fc1a406 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -32,7 +32,7 @@ | |||
32 | * processes using signals. Because signals are not supported on W32 | 32 | * processes using signals. Because signals are not supported on W32 |
33 | * and Java (at least not nicely), we can alternatively use a pipe | 33 | * and Java (at least not nicely), we can alternatively use a pipe |
34 | * to send signals to the child processes (if the child process is | 34 | * to send signals to the child processes (if the child process is |
35 | * a full-blown GNUnet process that supports reading signals from | 35 | * a full-blown GNUnet process that supports reading signals from |
36 | * a pipe, of course). Naturally, this also only works for 'normal' | 36 | * a pipe, of course). Naturally, this also only works for 'normal' |
37 | * termination via signals, and not as a replacement for SIGKILL. | 37 | * termination via signals, and not as a replacement for SIGKILL. |
38 | * Thus using pipes to communicate signals should only be enabled if | 38 | * Thus using pipes to communicate signals should only be enabled if |
@@ -72,7 +72,7 @@ enum GNUNET_OS_InheritStdioFlags | |||
72 | * inherit stdin of the parent. | 72 | * inherit stdin of the parent. |
73 | */ | 73 | */ |
74 | GNUNET_OS_INHERIT_STD_IN = 1, | 74 | GNUNET_OS_INHERIT_STD_IN = 1, |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * When this flag is set, the child process will | 77 | * When this flag is set, the child process will |
78 | * inherit stdout of the parent. | 78 | * inherit stdout of the parent. |
@@ -319,7 +319,7 @@ GNUNET_OS_start_process_vap (int pipe_control, | |||
319 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | 319 | enum GNUNET_OS_InheritStdioFlags std_inheritance, |
320 | struct GNUNET_DISK_PipeHandle *pipe_stdin, | 320 | struct GNUNET_DISK_PipeHandle *pipe_stdin, |
321 | struct GNUNET_DISK_PipeHandle *pipe_stdout, | 321 | struct GNUNET_DISK_PipeHandle *pipe_stdout, |
322 | const char *filename, | 322 | const char *filename, |
323 | char *const argv[]); | 323 | char *const argv[]); |
324 | 324 | ||
325 | 325 | ||
@@ -375,7 +375,7 @@ GNUNET_OS_start_process_va (int pipe_control, | |||
375 | struct GNUNET_OS_Process * | 375 | struct GNUNET_OS_Process * |
376 | GNUNET_OS_start_process_v (int pipe_control, | 376 | GNUNET_OS_start_process_v (int pipe_control, |
377 | enum GNUNET_OS_InheritStdioFlags std_inheritance, | 377 | enum GNUNET_OS_InheritStdioFlags std_inheritance, |
378 | const SOCKTYPE *lsocks, | 378 | const SOCKTYPE *lsocks, |
379 | const char *filename, | 379 | const char *filename, |
380 | char *const argv[]); | 380 | char *const argv[]); |
381 | 381 | ||
@@ -482,7 +482,7 @@ GNUNET_OS_install_parent_control_handler (void *cls, | |||
482 | * GNUNET_NO if not SUID (but binary exists), | 482 | * GNUNET_NO if not SUID (but binary exists), |
483 | * GNUNET_SYSERR on error (no such binary or not executable) | 483 | * GNUNET_SYSERR on error (no such binary or not executable) |
484 | */ | 484 | */ |
485 | int | 485 | int |
486 | GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char * params); | 486 | GNUNET_OS_check_helper_binary (const char *binary, int check_suid, const char * params); |
487 | 487 | ||
488 | 488 | ||
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h index b428f49a4..9608d3702 100644 --- a/src/include/gnunet_peerinfo_service.h +++ b/src/include/gnunet_peerinfo_service.h | |||
@@ -73,7 +73,7 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h); | |||
73 | 73 | ||
74 | /** | 74 | /** |
75 | * Continuation called with a status result. | 75 | * Continuation called with a status result. |
76 | * | 76 | * |
77 | * @param cls closure | 77 | * @param cls closure |
78 | * @param emsg error message, NULL on success | 78 | * @param emsg error message, NULL on success |
79 | */ | 79 | */ |
diff --git a/src/include/gnunet_postgres_lib.h b/src/include/gnunet_postgres_lib.h index 8f7204748..183105cd7 100644 --- a/src/include/gnunet_postgres_lib.h +++ b/src/include/gnunet_postgres_lib.h | |||
@@ -46,7 +46,7 @@ extern "C" | |||
46 | * @param ret return value from database operation to check | 46 | * @param ret return value from database operation to check |
47 | * @param expected_status desired status | 47 | * @param expected_status desired status |
48 | * @param command description of the command that was run | 48 | * @param command description of the command that was run |
49 | * @param args arguments given to the command | 49 | * @param args arguments given to the command |
50 | * @param filename name of the source file where the command was run | 50 | * @param filename name of the source file where the command was run |
51 | * @param line line number in the source file | 51 | * @param line line number in the source file |
52 | * @return GNUNET_OK if the result is acceptable | 52 | * @return GNUNET_OK if the result is acceptable |
@@ -66,7 +66,7 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status, | |||
66 | * @param ret return value from database operation to check | 66 | * @param ret return value from database operation to check |
67 | * @param expected_status desired status | 67 | * @param expected_status desired status |
68 | * @param command description of the command that was run | 68 | * @param command description of the command that was run |
69 | * @param args arguments given to the command | 69 | * @param args arguments given to the command |
70 | * @return GNUNET_OK if the result is acceptable | 70 | * @return GNUNET_OK if the result is acceptable |
71 | */ | 71 | */ |
72 | #define GNUNET_POSTGRES_check_result(dbh,ret,expected_status,command,args) GNUNET_POSTGRES_check_result_(dbh,ret,expected_status,command,args,__FILE__,__LINE__) | 72 | #define GNUNET_POSTGRES_check_result(dbh,ret,expected_status,command,args) GNUNET_POSTGRES_check_result_(dbh,ret,expected_status,command,args,__FILE__,__LINE__) |
@@ -78,7 +78,7 @@ GNUNET_POSTGRES_check_result_ (PGconn *dbh, PGresult * ret, int expected_status, | |||
78 | * @param dbh database handle | 78 | * @param dbh database handle |
79 | * @param sql statement to run | 79 | * @param sql statement to run |
80 | * @param filename filename for error reporting | 80 | * @param filename filename for error reporting |
81 | * @param line code line for error reporting | 81 | * @param line code line for error reporting |
82 | * @return GNUNET_OK on success | 82 | * @return GNUNET_OK on success |
83 | */ | 83 | */ |
84 | int | 84 | int |
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 5380e0987..068fb2f81 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -23,7 +23,7 @@ | |||
23 | * @brief constants for network protocols | 23 | * @brief constants for network protocols |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | * @defgroup protocols Types of messages used in GNUnet | 25 | * @defgroup protocols Types of messages used in GNUnet |
26 | * @{ | 26 | * @{ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | /******************************************************************************* | 29 | /******************************************************************************* |
@@ -149,7 +149,7 @@ extern "C" | |||
149 | ******************************************************************************/ | 149 | ******************************************************************************/ |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * Type of data messages from the plugin to the gnunet-wlan-helper | 152 | * Type of data messages from the plugin to the gnunet-wlan-helper |
153 | */ | 153 | */ |
154 | #define GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER 39 | 154 | #define GNUNET_MESSAGE_TYPE_WLAN_DATA_TO_HELPER 39 |
155 | 155 | ||
@@ -843,7 +843,7 @@ extern "C" | |||
843 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY 266 | 843 | #define GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY 266 |
844 | 844 | ||
845 | /** | 845 | /** |
846 | * Request the destruction of a whole tunnel | 846 | * Request the destruction of a whole tunnel |
847 | */ | 847 | */ |
848 | #define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY 267 | 848 | #define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY 267 |
849 | 849 | ||
@@ -1888,7 +1888,7 @@ extern "C" | |||
1888 | 1888 | ||
1889 | /** | 1889 | /** |
1890 | * Result in response to regex search. | 1890 | * Result in response to regex search. |
1891 | */ | 1891 | */ |
1892 | #define GNUNET_MESSAGE_TYPE_REGEX_RESULT 622 | 1892 | #define GNUNET_MESSAGE_TYPE_REGEX_RESULT 622 |
1893 | 1893 | ||
1894 | /******************************************************************************* | 1894 | /******************************************************************************* |
@@ -2187,7 +2187,7 @@ extern "C" | |||
2187 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741 | 2187 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741 |
2188 | 2188 | ||
2189 | /** | 2189 | /** |
2190 | * Mesh: audio data | 2190 | * Mesh: audio data |
2191 | */ | 2191 | */ |
2192 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742 | 2192 | #define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742 |
2193 | 2193 | ||
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h index 4addfa4d9..e9f935de7 100644 --- a/src/include/gnunet_psyc_service.h +++ b/src/include/gnunet_psyc_service.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_psyc_service.h | 22 | * @file include/gnunet_psyc_service.h |
23 | * @brief PSYC service; high-level access to the PSYC protocol | 23 | * @brief PSYC service; high-level access to the PSYC protocol |
24 | * note that clients of this API are NOT expected to | 24 | * note that clients of this API are NOT expected to |
@@ -90,13 +90,13 @@ extern "C" | |||
90 | #include "gnunet_multicast_service.h" | 90 | #include "gnunet_multicast_service.h" |
91 | 91 | ||
92 | 92 | ||
93 | /** | 93 | /** |
94 | * Version number of GNUnet-PSYC API. | 94 | * Version number of GNUnet-PSYC API. |
95 | */ | 95 | */ |
96 | #define GNUNET_PSYC_VERSION 0x00000000 | 96 | #define GNUNET_PSYC_VERSION 0x00000000 |
97 | 97 | ||
98 | 98 | ||
99 | /** | 99 | /** |
100 | * Policy flags for a channel. | 100 | * Policy flags for a channel. |
101 | */ | 101 | */ |
102 | enum GNUNET_PSYC_ChannelFlags | 102 | enum GNUNET_PSYC_ChannelFlags |
@@ -113,7 +113,7 @@ enum GNUNET_PSYC_ChannelFlags | |||
113 | GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY = 1 << 1, | 113 | GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY = 1 << 1, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | /** | 116 | /** |
117 | * PSYC channel policies. | 117 | * PSYC channel policies. |
118 | */ | 118 | */ |
119 | enum GNUNET_PSYC_Policy | 119 | enum GNUNET_PSYC_Policy |
@@ -125,7 +125,7 @@ enum GNUNET_PSYC_Policy | |||
125 | */ | 125 | */ |
126 | GNUNET_PSYC_CHANNEL_ANONYMOUS = 0, | 126 | GNUNET_PSYC_CHANNEL_ANONYMOUS = 0, |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * The master must approve membership to the channel, messages must only be | 129 | * The master must approve membership to the channel, messages must only be |
130 | * distributed to current channel slaves. This includes the channel | 130 | * distributed to current channel slaves. This includes the channel |
131 | * state as well as transient messages. | 131 | * state as well as transient messages. |
@@ -135,7 +135,7 @@ enum GNUNET_PSYC_Policy | |||
135 | | GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY, | 135 | | GNUNET_PSYC_CHANNEL_RESTRICTED_HISTORY, |
136 | 136 | ||
137 | #if IDEAS_FOR_FUTURE | 137 | #if IDEAS_FOR_FUTURE |
138 | /** | 138 | /** |
139 | * Anyone can freely join the channel (no approval required); | 139 | * Anyone can freely join the channel (no approval required); |
140 | * however, messages must only be distributed to current channel | 140 | * however, messages must only be distributed to current channel |
141 | * slaves, so the master must still acknowledge that the slave | 141 | * slaves, so the master must still acknowledge that the slave |
@@ -170,7 +170,7 @@ enum GNUNET_PSYC_MessageFlags | |||
170 | */ | 170 | */ |
171 | GNUNET_PSYC_MESSAGE_LAST_FRAGMENT = 1 << 1, | 171 | GNUNET_PSYC_MESSAGE_LAST_FRAGMENT = 1 << 1, |
172 | 172 | ||
173 | /** | 173 | /** |
174 | * OR'ed flags if message is not fragmented. | 174 | * OR'ed flags if message is not fragmented. |
175 | */ | 175 | */ |
176 | GNUNET_PSYC_MESSAGE_NOT_FRAGMENTED | 176 | GNUNET_PSYC_MESSAGE_NOT_FRAGMENTED |
@@ -274,7 +274,7 @@ struct GNUNET_PSYC_MessageData | |||
274 | uint8_t status; | 274 | uint8_t status; |
275 | }; | 275 | }; |
276 | 276 | ||
277 | /** | 277 | /** |
278 | * Handle that identifies a join request. | 278 | * Handle that identifies a join request. |
279 | * | 279 | * |
280 | * Used to match calls to #GNUNET_PSYC_JoinCallback to the | 280 | * Used to match calls to #GNUNET_PSYC_JoinCallback to the |
@@ -283,7 +283,7 @@ struct GNUNET_PSYC_MessageData | |||
283 | struct GNUNET_PSYC_JoinHandle; | 283 | struct GNUNET_PSYC_JoinHandle; |
284 | 284 | ||
285 | 285 | ||
286 | /** | 286 | /** |
287 | * Method called from PSYC upon receiving a message indicating a call to a | 287 | * Method called from PSYC upon receiving a message indicating a call to a |
288 | * @e method. | 288 | * @e method. |
289 | * | 289 | * |
@@ -316,7 +316,7 @@ typedef int | |||
316 | enum GNUNET_PSYC_MessageFlags flags); | 316 | enum GNUNET_PSYC_MessageFlags flags); |
317 | 317 | ||
318 | 318 | ||
319 | /** | 319 | /** |
320 | * Method called from PSYC upon receiving a join request. | 320 | * Method called from PSYC upon receiving a join request. |
321 | * | 321 | * |
322 | * @param cls Closure. | 322 | * @param cls Closure. |
@@ -341,7 +341,7 @@ typedef int | |||
341 | struct GNUNET_PSYC_JoinHandle *jh); | 341 | struct GNUNET_PSYC_JoinHandle *jh); |
342 | 342 | ||
343 | 343 | ||
344 | /** | 344 | /** |
345 | * Function to call with the decision made for a join request. | 345 | * Function to call with the decision made for a join request. |
346 | * | 346 | * |
347 | * Must be called once and only once in response to an invocation of the | 347 | * Must be called once and only once in response to an invocation of the |
@@ -375,13 +375,13 @@ GNUNET_PSYC_join_decision (struct GNUNET_PSYC_JoinHandle *jh, | |||
375 | size_t data_size); | 375 | size_t data_size); |
376 | 376 | ||
377 | 377 | ||
378 | /** | 378 | /** |
379 | * Handle for the master of a PSYC channel. | 379 | * Handle for the master of a PSYC channel. |
380 | */ | 380 | */ |
381 | struct GNUNET_PSYC_Master; | 381 | struct GNUNET_PSYC_Master; |
382 | 382 | ||
383 | 383 | ||
384 | /** | 384 | /** |
385 | * Function called after the channel master started. | 385 | * Function called after the channel master started. |
386 | * | 386 | * |
387 | * @param cls Closure. | 387 | * @param cls Closure. |
@@ -391,7 +391,7 @@ typedef void | |||
391 | (*GNUNET_PSYC_MasterStartCallback) (void *cls, uint64_t max_message_id); | 391 | (*GNUNET_PSYC_MasterStartCallback) (void *cls, uint64_t max_message_id); |
392 | 392 | ||
393 | 393 | ||
394 | /** | 394 | /** |
395 | * Start a PSYC master channel. | 395 | * Start a PSYC master channel. |
396 | * | 396 | * |
397 | * Will start a multicast group identified by the given ECC key. Messages | 397 | * Will start a multicast group identified by the given ECC key. Messages |
@@ -429,7 +429,7 @@ GNUNET_PSYC_master_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
429 | void *cls); | 429 | void *cls); |
430 | 430 | ||
431 | 431 | ||
432 | /** | 432 | /** |
433 | * Function called to provide data for a transmission via PSYC. | 433 | * Function called to provide data for a transmission via PSYC. |
434 | * | 434 | * |
435 | * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO) | 435 | * Note that returning #GNUNET_OK or #GNUNET_SYSERR (but not #GNUNET_NO) |
@@ -459,13 +459,13 @@ typedef int | |||
459 | enum GNUNET_PSYC_MasterTransmitFlags | 459 | enum GNUNET_PSYC_MasterTransmitFlags |
460 | { | 460 | { |
461 | GNUNET_PSYC_MASTER_TRANSMIT_NONE = 0, | 461 | GNUNET_PSYC_MASTER_TRANSMIT_NONE = 0, |
462 | /** | 462 | /** |
463 | * Whether this message should reset the channel state, | 463 | * Whether this message should reset the channel state, |
464 | * i.e. remove all previously stored state variables. | 464 | * i.e. remove all previously stored state variables. |
465 | */ | 465 | */ |
466 | GNUNET_PSYC_MASTER_TRANSMIT_RESET_STATE = 1 << 0, | 466 | GNUNET_PSYC_MASTER_TRANSMIT_RESET_STATE = 1 << 0, |
467 | 467 | ||
468 | /** | 468 | /** |
469 | * Whether we need to increment the group generation counter after | 469 | * Whether we need to increment the group generation counter after |
470 | * transmitting this message. | 470 | * transmitting this message. |
471 | */ | 471 | */ |
@@ -478,13 +478,13 @@ enum GNUNET_PSYC_MasterTransmitFlags | |||
478 | }; | 478 | }; |
479 | 479 | ||
480 | 480 | ||
481 | /** | 481 | /** |
482 | * Handle for a pending PSYC transmission operation. | 482 | * Handle for a pending PSYC transmission operation. |
483 | */ | 483 | */ |
484 | struct GNUNET_PSYC_MasterTransmitHandle; | 484 | struct GNUNET_PSYC_MasterTransmitHandle; |
485 | 485 | ||
486 | 486 | ||
487 | /** | 487 | /** |
488 | * Send a message to call a method to all members in the PSYC channel. | 488 | * Send a message to call a method to all members in the PSYC channel. |
489 | * | 489 | * |
490 | * @param master Handle to the PSYC channel. | 490 | * @param master Handle to the PSYC channel. |
@@ -505,7 +505,7 @@ GNUNET_PSYC_master_transmit (struct GNUNET_PSYC_Master *master, | |||
505 | enum GNUNET_PSYC_MasterTransmitFlags flags); | 505 | enum GNUNET_PSYC_MasterTransmitFlags flags); |
506 | 506 | ||
507 | 507 | ||
508 | /** | 508 | /** |
509 | * Resume transmission to the channel. | 509 | * Resume transmission to the channel. |
510 | * | 510 | * |
511 | * @param th Handle of the request that is being resumed. | 511 | * @param th Handle of the request that is being resumed. |
@@ -514,7 +514,7 @@ void | |||
514 | GNUNET_PSYC_master_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th); | 514 | GNUNET_PSYC_master_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th); |
515 | 515 | ||
516 | 516 | ||
517 | /** | 517 | /** |
518 | * Abort transmission request to channel. | 518 | * Abort transmission request to channel. |
519 | * | 519 | * |
520 | * @param th Handle of the request that is being aborted. | 520 | * @param th Handle of the request that is being aborted. |
@@ -523,7 +523,7 @@ void | |||
523 | GNUNET_PSYC_master_transmit_cancel (struct GNUNET_PSYC_MasterTransmitHandle *th); | 523 | GNUNET_PSYC_master_transmit_cancel (struct GNUNET_PSYC_MasterTransmitHandle *th); |
524 | 524 | ||
525 | 525 | ||
526 | /** | 526 | /** |
527 | * Stop a PSYC master channel. | 527 | * Stop a PSYC master channel. |
528 | * | 528 | * |
529 | * @param master PSYC channel master to stop. | 529 | * @param master PSYC channel master to stop. |
@@ -532,13 +532,13 @@ void | |||
532 | GNUNET_PSYC_master_stop (struct GNUNET_PSYC_Master *master); | 532 | GNUNET_PSYC_master_stop (struct GNUNET_PSYC_Master *master); |
533 | 533 | ||
534 | 534 | ||
535 | /** | 535 | /** |
536 | * Handle for a PSYC channel slave. | 536 | * Handle for a PSYC channel slave. |
537 | */ | 537 | */ |
538 | struct GNUNET_PSYC_Slave; | 538 | struct GNUNET_PSYC_Slave; |
539 | 539 | ||
540 | 540 | ||
541 | /** | 541 | /** |
542 | * Function called after the slave joined. | 542 | * Function called after the slave joined. |
543 | * | 543 | * |
544 | * @param cls Closure. | 544 | * @param cls Closure. |
@@ -548,7 +548,7 @@ typedef void | |||
548 | (*GNUNET_PSYC_SlaveJoinCallback) (void *cls, uint64_t max_message_id); | 548 | (*GNUNET_PSYC_SlaveJoinCallback) (void *cls, uint64_t max_message_id); |
549 | 549 | ||
550 | 550 | ||
551 | /** | 551 | /** |
552 | * Join a PSYC channel. | 552 | * Join a PSYC channel. |
553 | * | 553 | * |
554 | * The entity joining is always the local peer. The user must immediately use | 554 | * The entity joining is always the local peer. The user must immediately use |
@@ -594,7 +594,7 @@ GNUNET_PSYC_slave_join (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
594 | size_t data_size); | 594 | size_t data_size); |
595 | 595 | ||
596 | 596 | ||
597 | /** | 597 | /** |
598 | * Part a PSYC channel. | 598 | * Part a PSYC channel. |
599 | * | 599 | * |
600 | * Will terminate the connection to the PSYC service. Polite clients should | 600 | * Will terminate the connection to the PSYC service. Polite clients should |
@@ -606,7 +606,7 @@ void | |||
606 | GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave); | 606 | GNUNET_PSYC_slave_part (struct GNUNET_PSYC_Slave *slave); |
607 | 607 | ||
608 | 608 | ||
609 | /** | 609 | /** |
610 | * Function called to provide data for a transmission to the channel master | 610 | * Function called to provide data for a transmission to the channel master |
611 | * (a.k.a. the @e host of the channel). | 611 | * (a.k.a. the @e host of the channel). |
612 | * | 612 | * |
@@ -638,13 +638,13 @@ enum GNUNET_PSYC_SlaveTransmitFlags | |||
638 | }; | 638 | }; |
639 | 639 | ||
640 | 640 | ||
641 | /** | 641 | /** |
642 | * Handle for a pending PSYC transmission operation. | 642 | * Handle for a pending PSYC transmission operation. |
643 | */ | 643 | */ |
644 | struct GNUNET_PSYC_SlaveTransmitHandle; | 644 | struct GNUNET_PSYC_SlaveTransmitHandle; |
645 | 645 | ||
646 | 646 | ||
647 | /** | 647 | /** |
648 | * Request a message to be sent to the channel master. | 648 | * Request a message to be sent to the channel master. |
649 | * | 649 | * |
650 | * @param slave Slave handle. | 650 | * @param slave Slave handle. |
@@ -664,7 +664,7 @@ GNUNET_PSYC_slave_transmit (struct GNUNET_PSYC_Slave *slave, | |||
664 | enum GNUNET_PSYC_SlaveTransmitFlags flags); | 664 | enum GNUNET_PSYC_SlaveTransmitFlags flags); |
665 | 665 | ||
666 | 666 | ||
667 | /** | 667 | /** |
668 | * Resume transmission to the master. | 668 | * Resume transmission to the master. |
669 | * | 669 | * |
670 | * @param th Handle of the request that is being resumed. | 670 | * @param th Handle of the request that is being resumed. |
@@ -673,7 +673,7 @@ void | |||
673 | GNUNET_PSYC_slave_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th); | 673 | GNUNET_PSYC_slave_transmit_resume (struct GNUNET_PSYC_MasterTransmitHandle *th); |
674 | 674 | ||
675 | 675 | ||
676 | /** | 676 | /** |
677 | * Abort transmission request to master. | 677 | * Abort transmission request to master. |
678 | * | 678 | * |
679 | * @param th Handle of the request that is being aborted. | 679 | * @param th Handle of the request that is being aborted. |
@@ -682,13 +682,13 @@ void | |||
682 | GNUNET_PSYC_slave_transmit_cancel (struct GNUNET_PSYC_SlaveTransmitHandle *th); | 682 | GNUNET_PSYC_slave_transmit_cancel (struct GNUNET_PSYC_SlaveTransmitHandle *th); |
683 | 683 | ||
684 | 684 | ||
685 | /** | 685 | /** |
686 | * Handle to access PSYC channel operations for both the master and slaves. | 686 | * Handle to access PSYC channel operations for both the master and slaves. |
687 | */ | 687 | */ |
688 | struct GNUNET_PSYC_Channel; | 688 | struct GNUNET_PSYC_Channel; |
689 | 689 | ||
690 | 690 | ||
691 | /** | 691 | /** |
692 | * Convert a channel @a master to a @e channel handle to access the @e channel | 692 | * Convert a channel @a master to a @e channel handle to access the @e channel |
693 | * APIs. | 693 | * APIs. |
694 | * | 694 | * |
@@ -699,7 +699,7 @@ struct GNUNET_PSYC_Channel * | |||
699 | GNUNET_PSYC_master_get_channel (struct GNUNET_PSYC_Master *master); | 699 | GNUNET_PSYC_master_get_channel (struct GNUNET_PSYC_Master *master); |
700 | 700 | ||
701 | 701 | ||
702 | /** | 702 | /** |
703 | * Convert @a slave to a @e channel handle to access the @e channel APIs. | 703 | * Convert @a slave to a @e channel handle to access the @e channel APIs. |
704 | * | 704 | * |
705 | * @param slave Slave handle. | 705 | * @param slave Slave handle. |
@@ -709,7 +709,7 @@ struct GNUNET_PSYC_Channel * | |||
709 | GNUNET_PSYC_slave_get_channel (struct GNUNET_PSYC_Slave *slave); | 709 | GNUNET_PSYC_slave_get_channel (struct GNUNET_PSYC_Slave *slave); |
710 | 710 | ||
711 | 711 | ||
712 | /** | 712 | /** |
713 | * Add a slave to the channel's membership list. | 713 | * Add a slave to the channel's membership list. |
714 | * | 714 | * |
715 | * Note that this will NOT generate any PSYC traffic, it will merely update the | 715 | * Note that this will NOT generate any PSYC traffic, it will merely update the |
@@ -738,7 +738,7 @@ GNUNET_PSYC_channel_slave_add (struct GNUNET_PSYC_Channel *channel, | |||
738 | uint64_t effective_since); | 738 | uint64_t effective_since); |
739 | 739 | ||
740 | 740 | ||
741 | /** | 741 | /** |
742 | * Remove a slave from the channel's membership list. | 742 | * Remove a slave from the channel's membership list. |
743 | * | 743 | * |
744 | * Note that this will NOT generate any PSYC traffic, it will merely update the | 744 | * Note that this will NOT generate any PSYC traffic, it will merely update the |
@@ -766,7 +766,7 @@ GNUNET_PSYC_channel_slave_remove (struct GNUNET_PSYC_Channel *channel, | |||
766 | uint64_t announced_at); | 766 | uint64_t announced_at); |
767 | 767 | ||
768 | 768 | ||
769 | /** | 769 | /** |
770 | * Function called to inform a member about stored state values for a channel. | 770 | * Function called to inform a member about stored state values for a channel. |
771 | * | 771 | * |
772 | * @param cls Closure. | 772 | * @param cls Closure. |
@@ -791,13 +791,13 @@ typedef void | |||
791 | (*GNUNET_PSYC_FinishCallback) (void *cls); | 791 | (*GNUNET_PSYC_FinishCallback) (void *cls); |
792 | 792 | ||
793 | 793 | ||
794 | /** | 794 | /** |
795 | * Handle to a story telling operation. | 795 | * Handle to a story telling operation. |
796 | */ | 796 | */ |
797 | struct GNUNET_PSYC_Story; | 797 | struct GNUNET_PSYC_Story; |
798 | 798 | ||
799 | 799 | ||
800 | /** | 800 | /** |
801 | * Request to be told the message history of the channel. | 801 | * Request to be told the message history of the channel. |
802 | * | 802 | * |
803 | * Historic messages (but NOT the state at the time) will be replayed (given to | 803 | * Historic messages (but NOT the state at the time) will be replayed (given to |
@@ -827,7 +827,7 @@ GNUNET_PSYC_channel_story_tell (struct GNUNET_PSYC_Channel *channel, | |||
827 | void *cls); | 827 | void *cls); |
828 | 828 | ||
829 | 829 | ||
830 | /** | 830 | /** |
831 | * Abort story telling. | 831 | * Abort story telling. |
832 | * | 832 | * |
833 | * This function must not be called from within method handlers (as given to | 833 | * This function must not be called from within method handlers (as given to |
@@ -845,7 +845,7 @@ GNUNET_PSYC_channel_story_tell_cancel (struct GNUNET_PSYC_Story *story); | |||
845 | struct GNUNET_PSYC_StateQuery; | 845 | struct GNUNET_PSYC_StateQuery; |
846 | 846 | ||
847 | 847 | ||
848 | /** | 848 | /** |
849 | * Retrieve the best matching channel state variable. | 849 | * Retrieve the best matching channel state variable. |
850 | * | 850 | * |
851 | * If the requested variable name is not present in the state, the nearest | 851 | * If the requested variable name is not present in the state, the nearest |
@@ -867,7 +867,7 @@ GNUNET_PSYC_channel_state_get (struct GNUNET_PSYC_Channel *channel, | |||
867 | void *cb_cls); | 867 | void *cb_cls); |
868 | 868 | ||
869 | 869 | ||
870 | /** | 870 | /** |
871 | * Return all channel state variables whose name matches a given prefix. | 871 | * Return all channel state variables whose name matches a given prefix. |
872 | * | 872 | * |
873 | * A name matches if it starts with the given @a name_prefix, thus requesting | 873 | * A name matches if it starts with the given @a name_prefix, thus requesting |
@@ -890,7 +890,7 @@ GNUNET_PSYC_channel_state_get_prefix (struct GNUNET_PSYC_Channel *channel, | |||
890 | void *cb_cls); | 890 | void *cb_cls); |
891 | 891 | ||
892 | 892 | ||
893 | /** | 893 | /** |
894 | * Cancel a state query operation. | 894 | * Cancel a state query operation. |
895 | * | 895 | * |
896 | * @param query Handle for the operation to cancel. | 896 | * @param query Handle for the operation to cancel. |
diff --git a/src/include/gnunet_psycstore_plugin.h b/src/include/gnunet_psycstore_plugin.h index 5d5014fb3..8f8668043 100644 --- a/src/include/gnunet_psycstore_plugin.h +++ b/src/include/gnunet_psycstore_plugin.h | |||
@@ -49,7 +49,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
49 | */ | 49 | */ |
50 | void *cls; | 50 | void *cls; |
51 | 51 | ||
52 | /** | 52 | /** |
53 | * Store join/leave events for a PSYC channel in order to be able to answer | 53 | * Store join/leave events for a PSYC channel in order to be able to answer |
54 | * membership test queries later. | 54 | * membership test queries later. |
55 | * | 55 | * |
@@ -66,7 +66,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
66 | uint64_t effective_since, | 66 | uint64_t effective_since, |
67 | uint64_t group_generation); | 67 | uint64_t group_generation); |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * Test if a member was admitted to the channel at the given message ID. | 70 | * Test if a member was admitted to the channel at the given message ID. |
71 | * | 71 | * |
72 | * @see GNUNET_PSYCSTORE_membership_test() | 72 | * @see GNUNET_PSYCSTORE_membership_test() |
@@ -80,7 +80,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
80 | const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | 80 | const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, |
81 | uint64_t message_id); | 81 | uint64_t message_id); |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * Store a message fragment sent to a channel. | 84 | * Store a message fragment sent to a channel. |
85 | * | 85 | * |
86 | * @see GNUNET_PSYCSTORE_fragment_store() | 86 | * @see GNUNET_PSYCSTORE_fragment_store() |
@@ -93,7 +93,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
93 | const struct GNUNET_MULTICAST_MessageHeader *message, | 93 | const struct GNUNET_MULTICAST_MessageHeader *message, |
94 | uint32_t psycstore_flags); | 94 | uint32_t psycstore_flags); |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Set additional flags for a given message. | 97 | * Set additional flags for a given message. |
98 | * | 98 | * |
99 | * They are OR'd with any existing flags set. | 99 | * They are OR'd with any existing flags set. |
@@ -111,7 +111,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
111 | uint64_t message_id, | 111 | uint64_t message_id, |
112 | uint64_t psycstore_flags); | 112 | uint64_t psycstore_flags); |
113 | 113 | ||
114 | /** | 114 | /** |
115 | * Retrieve a message fragment by fragment ID. | 115 | * Retrieve a message fragment by fragment ID. |
116 | * | 116 | * |
117 | * @see GNUNET_PSYCSTORE_fragment_get() | 117 | * @see GNUNET_PSYCSTORE_fragment_get() |
@@ -125,7 +125,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
125 | GNUNET_PSYCSTORE_FragmentCallback cb, | 125 | GNUNET_PSYCSTORE_FragmentCallback cb, |
126 | void *cb_cls); | 126 | void *cb_cls); |
127 | 127 | ||
128 | /** | 128 | /** |
129 | * Retrieve all fragments of a message. | 129 | * Retrieve all fragments of a message. |
130 | * | 130 | * |
131 | * @see GNUNET_PSYCSTORE_message_get() | 131 | * @see GNUNET_PSYCSTORE_message_get() |
@@ -140,7 +140,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
140 | GNUNET_PSYCSTORE_FragmentCallback cb, | 140 | GNUNET_PSYCSTORE_FragmentCallback cb, |
141 | void *cb_cls); | 141 | void *cb_cls); |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * Retrieve a fragment of message specified by its message ID and fragment | 144 | * Retrieve a fragment of message specified by its message ID and fragment |
145 | * offset. | 145 | * offset. |
146 | * | 146 | * |
@@ -156,7 +156,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
156 | GNUNET_PSYCSTORE_FragmentCallback cb, | 156 | GNUNET_PSYCSTORE_FragmentCallback cb, |
157 | void *cb_cls); | 157 | void *cb_cls); |
158 | 158 | ||
159 | /** | 159 | /** |
160 | * Retrieve the max. values of message counters for a channel. | 160 | * Retrieve the max. values of message counters for a channel. |
161 | * | 161 | * |
162 | * @see GNUNET_PSYCSTORE_counters_get() | 162 | * @see GNUNET_PSYCSTORE_counters_get() |
@@ -170,7 +170,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
170 | uint64_t *max_message_id, | 170 | uint64_t *max_message_id, |
171 | uint64_t *max_group_generation); | 171 | uint64_t *max_group_generation); |
172 | 172 | ||
173 | /** | 173 | /** |
174 | * Retrieve the max. values of state counters for a channel. | 174 | * Retrieve the max. values of state counters for a channel. |
175 | * | 175 | * |
176 | * @see GNUNET_PSYCSTORE_counters_get() | 176 | * @see GNUNET_PSYCSTORE_counters_get() |
@@ -183,7 +183,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
183 | uint64_t *max_state_message_id); | 183 | uint64_t *max_state_message_id); |
184 | 184 | ||
185 | 185 | ||
186 | /** | 186 | /** |
187 | * Begin modifying current state. | 187 | * Begin modifying current state. |
188 | * | 188 | * |
189 | * @see GNUNET_PSYCSTORE_state_modify() | 189 | * @see GNUNET_PSYCSTORE_state_modify() |
@@ -195,7 +195,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
195 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 195 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, |
196 | uint64_t message_id, uint64_t state_delta); | 196 | uint64_t message_id, uint64_t state_delta); |
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Set the current value of a state variable. | 199 | * Set the current value of a state variable. |
200 | * | 200 | * |
201 | * The state modification process is started with state_modify_begin(), | 201 | * The state modification process is started with state_modify_begin(), |
@@ -212,7 +212,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
212 | const char *name, const void *value, size_t value_size); | 212 | const char *name, const void *value, size_t value_size); |
213 | 213 | ||
214 | 214 | ||
215 | /** | 215 | /** |
216 | * End modifying current state. | 216 | * End modifying current state. |
217 | * | 217 | * |
218 | * @see GNUNET_PSYCSTORE_state_modify() | 218 | * @see GNUNET_PSYCSTORE_state_modify() |
@@ -225,7 +225,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
225 | uint64_t message_id); | 225 | uint64_t message_id); |
226 | 226 | ||
227 | 227 | ||
228 | /** | 228 | /** |
229 | * Begin synchronizing state. | 229 | * Begin synchronizing state. |
230 | * | 230 | * |
231 | * @see GNUNET_PSYCSTORE_state_sync() | 231 | * @see GNUNET_PSYCSTORE_state_sync() |
@@ -236,7 +236,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
236 | (*state_sync_begin) (void *cls, | 236 | (*state_sync_begin) (void *cls, |
237 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key); | 237 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key); |
238 | 238 | ||
239 | /** | 239 | /** |
240 | * Set the value of a state variable while synchronizing state. | 240 | * Set the value of a state variable while synchronizing state. |
241 | * | 241 | * |
242 | * The state synchronization process is started with state_sync_begin(), | 242 | * The state synchronization process is started with state_sync_begin(), |
@@ -253,7 +253,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
253 | const char *name, const void *value, size_t value_size); | 253 | const char *name, const void *value, size_t value_size); |
254 | 254 | ||
255 | 255 | ||
256 | /** | 256 | /** |
257 | * End synchronizing state. | 257 | * End synchronizing state. |
258 | * | 258 | * |
259 | * @see GNUNET_PSYCSTORE_state_sync() | 259 | * @see GNUNET_PSYCSTORE_state_sync() |
@@ -266,7 +266,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
266 | uint64_t message_id); | 266 | uint64_t message_id); |
267 | 267 | ||
268 | 268 | ||
269 | /** | 269 | /** |
270 | * Reset the state of a channel. | 270 | * Reset the state of a channel. |
271 | * | 271 | * |
272 | * Delete all state variables stored for the given channel. | 272 | * Delete all state variables stored for the given channel. |
@@ -289,7 +289,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
289 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key); | 289 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key); |
290 | 290 | ||
291 | 291 | ||
292 | /** | 292 | /** |
293 | * Retrieve a state variable by name (exact match). | 293 | * Retrieve a state variable by name (exact match). |
294 | * | 294 | * |
295 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 295 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
@@ -301,7 +301,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
301 | GNUNET_PSYCSTORE_StateCallback cb, | 301 | GNUNET_PSYCSTORE_StateCallback cb, |
302 | void *cb_cls); | 302 | void *cb_cls); |
303 | 303 | ||
304 | /** | 304 | /** |
305 | * Retrieve all state variables for a channel with the given prefix. | 305 | * Retrieve all state variables for a channel with the given prefix. |
306 | * | 306 | * |
307 | * @see GNUNET_PSYCSTORE_state_get_prefix() | 307 | * @see GNUNET_PSYCSTORE_state_get_prefix() |
@@ -316,7 +316,7 @@ struct GNUNET_PSYCSTORE_PluginFunctions | |||
316 | void *cb_cls); | 316 | void *cb_cls); |
317 | 317 | ||
318 | 318 | ||
319 | /** | 319 | /** |
320 | * Retrieve all signed state variables for a channel. | 320 | * Retrieve all signed state variables for a channel. |
321 | * | 321 | * |
322 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 322 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
diff --git a/src/include/gnunet_psycstore_service.h b/src/include/gnunet_psycstore_service.h index 8032223c8..25d4339a3 100644 --- a/src/include/gnunet_psycstore_service.h +++ b/src/include/gnunet_psycstore_service.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_psycstore_service.h | 22 | * @file include/gnunet_psycstore_service.h |
23 | * @brief PSYCstore service; implements persistent storage for the PSYC service | 23 | * @brief PSYCstore service; implements persistent storage for the PSYC service |
24 | * @author Gabor X Toth | 24 | * @author Gabor X Toth |
@@ -40,7 +40,7 @@ extern "C" | |||
40 | #include "gnunet_multicast_service.h" | 40 | #include "gnunet_multicast_service.h" |
41 | #include "gnunet_psyc_service.h" | 41 | #include "gnunet_psyc_service.h" |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * Version number of GNUnet PSYCstore API. | 44 | * Version number of GNUnet PSYCstore API. |
45 | */ | 45 | */ |
46 | #define GNUNET_PSYCSTORE_VERSION 0x00000000 | 46 | #define GNUNET_PSYCSTORE_VERSION 0x00000000 |
@@ -67,13 +67,13 @@ enum GNUNET_PSYCSTORE_MessageFlags | |||
67 | }; | 67 | }; |
68 | 68 | ||
69 | 69 | ||
70 | /** | 70 | /** |
71 | * Handle for a PSYCstore | 71 | * Handle for a PSYCstore |
72 | */ | 72 | */ |
73 | struct GNUNET_PSYCSTORE_Handle; | 73 | struct GNUNET_PSYCSTORE_Handle; |
74 | 74 | ||
75 | 75 | ||
76 | /** | 76 | /** |
77 | * Connect to the PSYCstore service. | 77 | * Connect to the PSYCstore service. |
78 | * | 78 | * |
79 | * @param cfg Configuration to use. | 79 | * @param cfg Configuration to use. |
@@ -84,7 +84,7 @@ struct GNUNET_PSYCSTORE_Handle * | |||
84 | GNUNET_PSYCSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | 84 | GNUNET_PSYCSTORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); |
85 | 85 | ||
86 | 86 | ||
87 | /** | 87 | /** |
88 | * Disconnect from the PSYCstore service. | 88 | * Disconnect from the PSYCstore service. |
89 | * | 89 | * |
90 | * @param h Handle for the connection. | 90 | * @param h Handle for the connection. |
@@ -93,15 +93,15 @@ void | |||
93 | GNUNET_PSYCSTORE_disconnect (struct GNUNET_PSYCSTORE_Handle *h); | 93 | GNUNET_PSYCSTORE_disconnect (struct GNUNET_PSYCSTORE_Handle *h); |
94 | 94 | ||
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Handle for an operation on the PSYCSTORE (useful to cancel the operation). | 97 | * Handle for an operation on the PSYCSTORE (useful to cancel the operation). |
98 | */ | 98 | */ |
99 | struct GNUNET_PSYCSTORE_OperationHandle; | 99 | struct GNUNET_PSYCSTORE_OperationHandle; |
100 | 100 | ||
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Function called with the result of an asynchronous operation. | 103 | * Function called with the result of an asynchronous operation. |
104 | * | 104 | * |
105 | * @param result #GNUNET_SYSERR on error, | 105 | * @param result #GNUNET_SYSERR on error, |
106 | * #GNUNET_YES on success or if the peer was a member, | 106 | * #GNUNET_YES on success or if the peer was a member, |
107 | * #GNUNET_NO if the peer was not a member | 107 | * #GNUNET_NO if the peer was not a member |
@@ -112,7 +112,7 @@ typedef void | |||
112 | const char *err_msg); | 112 | const char *err_msg); |
113 | 113 | ||
114 | 114 | ||
115 | /** | 115 | /** |
116 | * Store join/leave events for a PSYC channel in order to be able to answer | 116 | * Store join/leave events for a PSYC channel in order to be able to answer |
117 | * membership test queries later. | 117 | * membership test queries later. |
118 | * | 118 | * |
@@ -143,7 +143,7 @@ GNUNET_PSYCSTORE_membership_store (struct GNUNET_PSYCSTORE_Handle *h, | |||
143 | void *rcb_cls); | 143 | void *rcb_cls); |
144 | 144 | ||
145 | 145 | ||
146 | /** | 146 | /** |
147 | * Test if a member was admitted to the channel at the given message ID. | 147 | * Test if a member was admitted to the channel at the given message ID. |
148 | * | 148 | * |
149 | * This is useful when relaying and replaying messages to check if a particular | 149 | * This is useful when relaying and replaying messages to check if a particular |
@@ -173,7 +173,7 @@ GNUNET_PSYCSTORE_membership_test (struct GNUNET_PSYCSTORE_Handle *h, | |||
173 | void *rcb_cls); | 173 | void *rcb_cls); |
174 | 174 | ||
175 | 175 | ||
176 | /** | 176 | /** |
177 | * Store a message fragment sent to a channel. | 177 | * Store a message fragment sent to a channel. |
178 | * | 178 | * |
179 | * @param h Handle for the PSYCstore. | 179 | * @param h Handle for the PSYCstore. |
@@ -183,7 +183,7 @@ GNUNET_PSYCSTORE_membership_test (struct GNUNET_PSYCSTORE_Handle *h, | |||
183 | * state modifiers. | 183 | * state modifiers. |
184 | * @param rcb Callback to call with the result of the operation. | 184 | * @param rcb Callback to call with the result of the operation. |
185 | * @param rcb_cls Closure for the callback. | 185 | * @param rcb_cls Closure for the callback. |
186 | * | 186 | * |
187 | * @return Handle that can be used to cancel the operation. | 187 | * @return Handle that can be used to cancel the operation. |
188 | */ | 188 | */ |
189 | struct GNUNET_PSYCSTORE_OperationHandle * | 189 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -195,7 +195,7 @@ GNUNET_PSYCSTORE_fragment_store (struct GNUNET_PSYCSTORE_Handle *h, | |||
195 | void *rcb_cls); | 195 | void *rcb_cls); |
196 | 196 | ||
197 | 197 | ||
198 | /** | 198 | /** |
199 | * Function called with one message fragment, as the result of a | 199 | * Function called with one message fragment, as the result of a |
200 | * GNUNET_PSYCSTORE_fragment_get() or GNUNET_PSYCSTORE_message_get() call. | 200 | * GNUNET_PSYCSTORE_fragment_get() or GNUNET_PSYCSTORE_message_get() call. |
201 | * | 201 | * |
@@ -213,7 +213,7 @@ typedef int | |||
213 | enum GNUNET_PSYCSTORE_MessageFlags psycstore_flags); | 213 | enum GNUNET_PSYCSTORE_MessageFlags psycstore_flags); |
214 | 214 | ||
215 | 215 | ||
216 | /** | 216 | /** |
217 | * Retrieve a message fragment by fragment ID. | 217 | * Retrieve a message fragment by fragment ID. |
218 | * | 218 | * |
219 | * @param h Handle for the PSYCstore. | 219 | * @param h Handle for the PSYCstore. |
@@ -222,7 +222,7 @@ typedef int | |||
222 | * @param fcb Callback to call with the retrieved fragment. | 222 | * @param fcb Callback to call with the retrieved fragment. |
223 | * @param rcb Callback to call with the result of the operation. | 223 | * @param rcb Callback to call with the result of the operation. |
224 | * @param cls Closure for the callbacks. | 224 | * @param cls Closure for the callbacks. |
225 | * | 225 | * |
226 | * @return Handle that can be used to cancel the operation. | 226 | * @return Handle that can be used to cancel the operation. |
227 | */ | 227 | */ |
228 | struct GNUNET_PSYCSTORE_OperationHandle * | 228 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -234,7 +234,7 @@ GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
234 | void *cls); | 234 | void *cls); |
235 | 235 | ||
236 | 236 | ||
237 | /** | 237 | /** |
238 | * Retrieve all fragments of a message. | 238 | * Retrieve all fragments of a message. |
239 | * | 239 | * |
240 | * @param h Handle for the PSYCstore. | 240 | * @param h Handle for the PSYCstore. |
@@ -243,7 +243,7 @@ GNUNET_PSYCSTORE_fragment_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
243 | * @param fcb Callback to call with the retrieved fragments. | 243 | * @param fcb Callback to call with the retrieved fragments. |
244 | * @param rcb Callback to call with the result of the operation. | 244 | * @param rcb Callback to call with the result of the operation. |
245 | * @param cls Closure for the callbacks. | 245 | * @param cls Closure for the callbacks. |
246 | * | 246 | * |
247 | * @return Handle that can be used to cancel the operation. | 247 | * @return Handle that can be used to cancel the operation. |
248 | */ | 248 | */ |
249 | struct GNUNET_PSYCSTORE_OperationHandle * | 249 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -255,7 +255,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
255 | void *cls); | 255 | void *cls); |
256 | 256 | ||
257 | 257 | ||
258 | /** | 258 | /** |
259 | * Retrieve a fragment of message specified by its message ID and fragment | 259 | * Retrieve a fragment of message specified by its message ID and fragment |
260 | * offset. | 260 | * offset. |
261 | * | 261 | * |
@@ -266,7 +266,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
266 | * @param fcb Callback to call with the retrieved fragments. | 266 | * @param fcb Callback to call with the retrieved fragments. |
267 | * @param rcb Callback to call with the result of the operation. | 267 | * @param rcb Callback to call with the result of the operation. |
268 | * @param cls Closure for the callbacks. | 268 | * @param cls Closure for the callbacks. |
269 | * | 269 | * |
270 | * @return Handle that can be used to cancel the operation. | 270 | * @return Handle that can be used to cancel the operation. |
271 | */ | 271 | */ |
272 | struct GNUNET_PSYCSTORE_OperationHandle * | 272 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -279,7 +279,7 @@ GNUNET_PSYCSTORE_message_get_fragment (struct GNUNET_PSYCSTORE_Handle *h, | |||
279 | void *cls); | 279 | void *cls); |
280 | 280 | ||
281 | 281 | ||
282 | /** | 282 | /** |
283 | * Callback used to return the latest value of counters for the channel master. | 283 | * Callback used to return the latest value of counters for the channel master. |
284 | * | 284 | * |
285 | * @see GNUNET_PSYCSTORE_counters_get() | 285 | * @see GNUNET_PSYCSTORE_counters_get() |
@@ -299,7 +299,7 @@ typedef void | |||
299 | uint64_t max_state_message_id); | 299 | uint64_t max_state_message_id); |
300 | 300 | ||
301 | 301 | ||
302 | /** | 302 | /** |
303 | * Retrieve latest values of counters for a channel. | 303 | * Retrieve latest values of counters for a channel. |
304 | * | 304 | * |
305 | * The current value of counters are needed | 305 | * The current value of counters are needed |
@@ -311,7 +311,7 @@ typedef void | |||
311 | * @param channel_key Public key that identifies the channel. | 311 | * @param channel_key Public key that identifies the channel. |
312 | * @param ccb Callback to call with the result. | 312 | * @param ccb Callback to call with the result. |
313 | * @param ccb_cls Closure for the callback. | 313 | * @param ccb_cls Closure for the callback. |
314 | * | 314 | * |
315 | * @return Handle that can be used to cancel the operation. | 315 | * @return Handle that can be used to cancel the operation. |
316 | */ | 316 | */ |
317 | struct GNUNET_PSYCSTORE_OperationHandle * | 317 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -321,7 +321,7 @@ GNUNET_PSYCSTORE_counters_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
321 | void *ccb_cls); | 321 | void *ccb_cls); |
322 | 322 | ||
323 | 323 | ||
324 | /** | 324 | /** |
325 | * Apply modifiers of a message to the current channel state. | 325 | * Apply modifiers of a message to the current channel state. |
326 | * | 326 | * |
327 | * An error is returned if there are missing messages containing state | 327 | * An error is returned if there are missing messages containing state |
@@ -335,7 +335,7 @@ GNUNET_PSYCSTORE_counters_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
335 | * @param modifiers List of modifiers to apply. | 335 | * @param modifiers List of modifiers to apply. |
336 | * @param rcb Callback to call with the result of the operation. | 336 | * @param rcb Callback to call with the result of the operation. |
337 | * @param rcb_cls Closure for the callback. | 337 | * @param rcb_cls Closure for the callback. |
338 | * | 338 | * |
339 | * @return Handle that can be used to cancel the operation. | 339 | * @return Handle that can be used to cancel the operation. |
340 | */ | 340 | */ |
341 | struct GNUNET_PSYCSTORE_OperationHandle * | 341 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -349,7 +349,7 @@ GNUNET_PSYCSTORE_state_modify (struct GNUNET_PSYCSTORE_Handle *h, | |||
349 | void *rcb_cls); | 349 | void *rcb_cls); |
350 | 350 | ||
351 | 351 | ||
352 | /** | 352 | /** |
353 | * Store synchronized state. | 353 | * Store synchronized state. |
354 | * | 354 | * |
355 | * @param h Handle for the PSYCstore. | 355 | * @param h Handle for the PSYCstore. |
@@ -359,7 +359,7 @@ GNUNET_PSYCSTORE_state_modify (struct GNUNET_PSYCSTORE_Handle *h, | |||
359 | * @param modifiers Full state to store. | 359 | * @param modifiers Full state to store. |
360 | * @param rcb Callback to call with the result of the operation. | 360 | * @param rcb Callback to call with the result of the operation. |
361 | * @param rcb_cls Closure for the callback. | 361 | * @param rcb_cls Closure for the callback. |
362 | * | 362 | * |
363 | * @return Handle that can be used to cancel the operation. | 363 | * @return Handle that can be used to cancel the operation. |
364 | */ | 364 | */ |
365 | struct GNUNET_PSYCSTORE_OperationHandle * | 365 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -373,7 +373,7 @@ GNUNET_PSYCSTORE_state_sync (struct GNUNET_PSYCSTORE_Handle *h, | |||
373 | 373 | ||
374 | 374 | ||
375 | 375 | ||
376 | /** | 376 | /** |
377 | * Reset the state of a channel. | 377 | * Reset the state of a channel. |
378 | * | 378 | * |
379 | * Delete all state variables stored for the given channel. | 379 | * Delete all state variables stored for the given channel. |
@@ -382,7 +382,7 @@ GNUNET_PSYCSTORE_state_sync (struct GNUNET_PSYCSTORE_Handle *h, | |||
382 | * @param channel_key The channel we are interested in. | 382 | * @param channel_key The channel we are interested in. |
383 | * @param rcb Callback to call with the result of the operation. | 383 | * @param rcb Callback to call with the result of the operation. |
384 | * @param rcb_cls Closure for the callback. | 384 | * @param rcb_cls Closure for the callback. |
385 | * | 385 | * |
386 | * @return Handle that can be used to cancel the operation. | 386 | * @return Handle that can be used to cancel the operation. |
387 | */ | 387 | */ |
388 | struct GNUNET_PSYCSTORE_OperationHandle * | 388 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -393,7 +393,7 @@ GNUNET_PSYCSTORE_state_reset (struct GNUNET_PSYCSTORE_Handle *h, | |||
393 | void *rcb_cls); | 393 | void *rcb_cls); |
394 | 394 | ||
395 | 395 | ||
396 | /** | 396 | /** |
397 | * Update signed values of state variables in the state store. | 397 | * Update signed values of state variables in the state store. |
398 | * | 398 | * |
399 | * @param h Handle for the PSYCstore. | 399 | * @param h Handle for the PSYCstore. |
@@ -413,7 +413,7 @@ GNUNET_PSYCSTORE_state_hash_update (struct GNUNET_PSYCSTORE_Handle *h, | |||
413 | void *rcb_cls); | 413 | void *rcb_cls); |
414 | 414 | ||
415 | 415 | ||
416 | /** | 416 | /** |
417 | * Function called with the value of a state variable. | 417 | * Function called with the value of a state variable. |
418 | * | 418 | * |
419 | * @param cls Closure. | 419 | * @param cls Closure. |
@@ -430,7 +430,7 @@ typedef int | |||
430 | const void *value, size_t value_size); | 430 | const void *value, size_t value_size); |
431 | 431 | ||
432 | 432 | ||
433 | /** | 433 | /** |
434 | * Retrieve the best matching state variable. | 434 | * Retrieve the best matching state variable. |
435 | * | 435 | * |
436 | * @param h Handle for the PSYCstore. | 436 | * @param h Handle for the PSYCstore. |
@@ -439,7 +439,7 @@ typedef int | |||
439 | * @param scb Callback to return the matching state variable. | 439 | * @param scb Callback to return the matching state variable. |
440 | * @param rcb Callback to call with the result of the operation. | 440 | * @param rcb Callback to call with the result of the operation. |
441 | * @param cls Closure for the callbacks. | 441 | * @param cls Closure for the callbacks. |
442 | * | 442 | * |
443 | * @return Handle that can be used to cancel the operation. | 443 | * @return Handle that can be used to cancel the operation. |
444 | */ | 444 | */ |
445 | struct GNUNET_PSYCSTORE_OperationHandle * | 445 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -451,7 +451,7 @@ GNUNET_PSYCSTORE_state_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
451 | void *cls); | 451 | void *cls); |
452 | 452 | ||
453 | 453 | ||
454 | /** | 454 | /** |
455 | * Retrieve all state variables for a channel with the given prefix. | 455 | * Retrieve all state variables for a channel with the given prefix. |
456 | * | 456 | * |
457 | * @param h Handle for the PSYCstore. | 457 | * @param h Handle for the PSYCstore. |
@@ -460,7 +460,7 @@ GNUNET_PSYCSTORE_state_get (struct GNUNET_PSYCSTORE_Handle *h, | |||
460 | * @param scb Callback to return matching state variables. | 460 | * @param scb Callback to return matching state variables. |
461 | * @param rcb Callback to call with the result of the operation. | 461 | * @param rcb Callback to call with the result of the operation. |
462 | * @param cls Closure for the callbacks. | 462 | * @param cls Closure for the callbacks. |
463 | * | 463 | * |
464 | * @return Handle that can be used to cancel the operation. | 464 | * @return Handle that can be used to cancel the operation. |
465 | */ | 465 | */ |
466 | struct GNUNET_PSYCSTORE_OperationHandle * | 466 | struct GNUNET_PSYCSTORE_OperationHandle * |
@@ -472,7 +472,7 @@ GNUNET_PSYCSTORE_state_get_prefix (struct GNUNET_PSYCSTORE_Handle *h, | |||
472 | void *cls); | 472 | void *cls); |
473 | 473 | ||
474 | 474 | ||
475 | /** | 475 | /** |
476 | * Cancel an operation. | 476 | * Cancel an operation. |
477 | * | 477 | * |
478 | * @param op Handle for the operation to cancel. | 478 | * @param op Handle for the operation to cancel. |
diff --git a/src/include/gnunet_regex_service.h b/src/include/gnunet_regex_service.h index a3652be50..cd46979cb 100644 --- a/src/include/gnunet_regex_service.h +++ b/src/include/gnunet_regex_service.h | |||
@@ -59,7 +59,7 @@ struct GNUNET_REGEX_Search; | |||
59 | * Announce this peer under the given regular expression. Does | 59 | * Announce this peer under the given regular expression. Does |
60 | * not free resources, must call #GNUNET_REGEX_announce_cancel for | 60 | * not free resources, must call #GNUNET_REGEX_announce_cancel for |
61 | * that. | 61 | * that. |
62 | * | 62 | * |
63 | * @param cfg configuration to use | 63 | * @param cfg configuration to use |
64 | * @param regex Regular expression to announce. | 64 | * @param regex Regular expression to announce. |
65 | * @param refresh_delay after what delay should the announcement be repeated? | 65 | * @param refresh_delay after what delay should the announcement be repeated? |
@@ -76,7 +76,7 @@ GNUNET_REGEX_announce (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
76 | 76 | ||
77 | /** | 77 | /** |
78 | * Stop announcing the regex specified by the given handle. | 78 | * Stop announcing the regex specified by the given handle. |
79 | * | 79 | * |
80 | * @param a handle returned by a previous #GNUNET_REGEX_announce call. | 80 | * @param a handle returned by a previous #GNUNET_REGEX_announce call. |
81 | */ | 81 | */ |
82 | void | 82 | void |
@@ -122,7 +122,7 @@ GNUNET_REGEX_search (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
122 | 122 | ||
123 | /** | 123 | /** |
124 | * Stop search and free all data used by a #GNUNET_REGEX_search call. | 124 | * Stop search and free all data used by a #GNUNET_REGEX_search call. |
125 | * | 125 | * |
126 | * @param s Handle returned by a previous #GNUNET_REGEX_search call. | 126 | * @param s Handle returned by a previous #GNUNET_REGEX_search call. |
127 | */ | 127 | */ |
128 | void | 128 | void |
diff --git a/src/include/gnunet_resolver_service.h b/src/include/gnunet_resolver_service.h index 31fd178ca..0a51e41ca 100644 --- a/src/include/gnunet_resolver_service.h +++ b/src/include/gnunet_resolver_service.h | |||
@@ -132,7 +132,7 @@ GNUNET_RESOLVER_local_fqdn_get (void); | |||
132 | * Perform a reverse DNS lookup. | 132 | * Perform a reverse DNS lookup. |
133 | * | 133 | * |
134 | * @param sa host address | 134 | * @param sa host address |
135 | * @param salen length of @a sa | 135 | * @param salen length of @a sa |
136 | * @param do_resolve use #GNUNET_NO to return numeric hostname | 136 | * @param do_resolve use #GNUNET_NO to return numeric hostname |
137 | * @param timeout how long to try resolving | 137 | * @param timeout how long to try resolving |
138 | * @param callback function to call with hostnames | 138 | * @param callback function to call with hostnames |
diff --git a/src/include/gnunet_revocation_service.h b/src/include/gnunet_revocation_service.h index 7758ec97e..8809f9ece 100644 --- a/src/include/gnunet_revocation_service.h +++ b/src/include/gnunet_revocation_service.h | |||
@@ -53,7 +53,7 @@ struct GNUNET_REVOCATION_Query; | |||
53 | * Callback to call with the result of a key revocation query. | 53 | * Callback to call with the result of a key revocation query. |
54 | * | 54 | * |
55 | * @param cls closure | 55 | * @param cls closure |
56 | * @param is_valid #GNUNET_NO of the key is/was revoked, | 56 | * @param is_valid #GNUNET_NO of the key is/was revoked, |
57 | * #GNUNET_YES if the key is still valid, | 57 | * #GNUNET_YES if the key is still valid, |
58 | * #GNUNET_SYSERR if we had trouble querying the service | 58 | * #GNUNET_SYSERR if we had trouble querying the service |
59 | * | 59 | * |
diff --git a/src/include/gnunet_scalarproduct_service.h b/src/include/gnunet_scalarproduct_service.h index a398a3198..5f09f6a8a 100644 --- a/src/include/gnunet_scalarproduct_service.h +++ b/src/include/gnunet_scalarproduct_service.h | |||
@@ -66,7 +66,7 @@ typedef void (*GNUNET_SCALARPRODUCT_ContinuationWithStatus) (void *cls, | |||
66 | enum GNUNET_SCALARPRODUCT_ResponseStatus status); | 66 | enum GNUNET_SCALARPRODUCT_ResponseStatus status); |
67 | /** | 67 | /** |
68 | * Process a datum that was stored in the scalarproduct. | 68 | * Process a datum that was stored in the scalarproduct. |
69 | * | 69 | * |
70 | * @param cls closure | 70 | * @param cls closure |
71 | * @param status Status of the request | 71 | * @param status Status of the request |
72 | * @param type result of the computation | 72 | * @param type result of the computation |
@@ -77,7 +77,7 @@ typedef void (*GNUNET_SCALARPRODUCT_DatumProcessor) (void *cls, | |||
77 | 77 | ||
78 | /** | 78 | /** |
79 | * Request by Alice's client for computing a scalar product | 79 | * Request by Alice's client for computing a scalar product |
80 | * | 80 | * |
81 | * @param h handle to the master context | 81 | * @param h handle to the master context |
82 | * @param key Session key - unique to the requesting client | 82 | * @param key Session key - unique to the requesting client |
83 | * @param peer PeerID of the other peer | 83 | * @param peer PeerID of the other peer |
@@ -100,8 +100,8 @@ GNUNET_SCALARPRODUCT_request (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
100 | void *cont_cls); | 100 | void *cont_cls); |
101 | 101 | ||
102 | /** | 102 | /** |
103 | * Used by Bob's client to cooperate with Alice, | 103 | * Used by Bob's client to cooperate with Alice, |
104 | * | 104 | * |
105 | * @param h handle to our configuration | 105 | * @param h handle to our configuration |
106 | * @param key Session key - unique to the requesting client | 106 | * @param key Session key - unique to the requesting client |
107 | * @param elements Array of elements of the vector | 107 | * @param elements Array of elements of the vector |
@@ -119,7 +119,7 @@ GNUNET_SCALARPRODUCT_response (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
119 | /** | 119 | /** |
120 | * Cancel an ongoing computation or revoke our collaboration offer. | 120 | * Cancel an ongoing computation or revoke our collaboration offer. |
121 | * Closes the connection to the service | 121 | * Closes the connection to the service |
122 | * | 122 | * |
123 | * @param h handel to terminate | 123 | * @param h handel to terminate |
124 | */ | 124 | */ |
125 | void | 125 | void |
@@ -128,7 +128,7 @@ GNUNET_SCALARPRODUCT_cancel (struct GNUNET_SCALARPRODUCT_ComputationHandle * h); | |||
128 | /** | 128 | /** |
129 | * Cancel ALL ongoing computation or revoke our collaboration offer. | 129 | * Cancel ALL ongoing computation or revoke our collaboration offer. |
130 | * Closes ALL connections to the service | 130 | * Closes ALL connections to the service |
131 | * | 131 | * |
132 | */ | 132 | */ |
133 | void | 133 | void |
134 | GNUNET_SCALARPRODUCT_disconnect (); | 134 | GNUNET_SCALARPRODUCT_disconnect (); |
diff --git a/src/include/gnunet_scheduler_lib.h b/src/include/gnunet_scheduler_lib.h index dee6eab27..83d9d261a 100644 --- a/src/include/gnunet_scheduler_lib.h +++ b/src/include/gnunet_scheduler_lib.h | |||
@@ -536,7 +536,7 @@ GNUNET_SCHEDULER_add_write_file (struct GNUNET_TIME_Relative delay, | |||
536 | * only valid until "task" is started! | 536 | * only valid until "task" is started! |
537 | */ | 537 | */ |
538 | GNUNET_SCHEDULER_TaskIdentifier | 538 | GNUNET_SCHEDULER_TaskIdentifier |
539 | GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, | 539 | GNUNET_SCHEDULER_add_select (enum GNUNET_SCHEDULER_Priority prio, |
540 | struct GNUNET_TIME_Relative delay, | 540 | struct GNUNET_TIME_Relative delay, |
541 | const struct GNUNET_NETWORK_FDSet *rs, | 541 | const struct GNUNET_NETWORK_FDSet *rs, |
542 | const struct GNUNET_NETWORK_FDSet *ws, | 542 | const struct GNUNET_NETWORK_FDSet *ws, |
diff --git a/src/include/gnunet_server_lib.h b/src/include/gnunet_server_lib.h index 0195a2898..d1097450f 100644 --- a/src/include/gnunet_server_lib.h +++ b/src/include/gnunet_server_lib.h | |||
@@ -288,7 +288,7 @@ GNUNET_SERVER_client_persist_ (struct GNUNET_SERVER_Client *client); | |||
288 | * serious error) | 288 | * serious error) |
289 | */ | 289 | */ |
290 | void | 290 | void |
291 | GNUNET_SERVER_receive_done (struct GNUNET_SERVER_Client *client, | 291 | GNUNET_SERVER_receive_done (struct GNUNET_SERVER_Client *client, |
292 | int success); | 292 | int success); |
293 | 293 | ||
294 | 294 | ||
@@ -326,7 +326,7 @@ GNUNET_SERVER_client_get_user_context_ (struct GNUNET_SERVER_Client *client, | |||
326 | * @param ptr pointer to user context | 326 | * @param ptr pointer to user context |
327 | * @param size number of bytes in user context struct (for verification only) | 327 | * @param size number of bytes in user context struct (for verification only) |
328 | */ | 328 | */ |
329 | void | 329 | void |
330 | GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client, | 330 | GNUNET_SERVER_client_set_user_context_ (struct GNUNET_SERVER_Client *client, |
331 | void *ptr, | 331 | void *ptr, |
332 | size_t size); | 332 | size_t size); |
@@ -500,7 +500,7 @@ GNUNET_SERVER_connect_notify (struct GNUNET_SERVER_Handle *server, | |||
500 | 500 | ||
501 | /** | 501 | /** |
502 | * Ask the server to stop notifying us whenever a client disconnects. | 502 | * Ask the server to stop notifying us whenever a client disconnects. |
503 | * Arguments must match exactly those given to | 503 | * Arguments must match exactly those given to |
504 | * #GNUNET_SERVER_disconnect_notify. It is not necessary to call this | 504 | * #GNUNET_SERVER_disconnect_notify. It is not necessary to call this |
505 | * function during shutdown of the server; in fact, most applications | 505 | * function during shutdown of the server; in fact, most applications |
506 | * will never use this function. | 506 | * will never use this function. |
@@ -517,7 +517,7 @@ GNUNET_SERVER_disconnect_notify_cancel (struct GNUNET_SERVER_Handle *server, | |||
517 | 517 | ||
518 | /** | 518 | /** |
519 | * Ask the server to stop notifying us whenever a client connects. | 519 | * Ask the server to stop notifying us whenever a client connects. |
520 | * Arguments must match exactly those given to | 520 | * Arguments must match exactly those given to |
521 | * #GNUNET_SERVER_connect_notify. It is not necessary to call this | 521 | * #GNUNET_SERVER_connect_notify. It is not necessary to call this |
522 | * function during shutdown of the server; in fact, most applications | 522 | * function during shutdown of the server; in fact, most applications |
523 | * will never use this function. | 523 | * will never use this function. |
@@ -693,7 +693,7 @@ GNUNET_SERVER_notification_context_add (struct GNUNET_SERVER_NotificationContext | |||
693 | void | 693 | void |
694 | GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationContext *nc, | 694 | GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationContext *nc, |
695 | struct GNUNET_SERVER_Client *client, | 695 | struct GNUNET_SERVER_Client *client, |
696 | const struct GNUNET_MessageHeader *msg, | 696 | const struct GNUNET_MessageHeader *msg, |
697 | int can_drop); | 697 | int can_drop); |
698 | 698 | ||
699 | 699 | ||
@@ -706,7 +706,7 @@ GNUNET_SERVER_notification_context_unicast (struct GNUNET_SERVER_NotificationCon | |||
706 | */ | 706 | */ |
707 | void | 707 | void |
708 | GNUNET_SERVER_notification_context_broadcast (struct GNUNET_SERVER_NotificationContext *nc, | 708 | GNUNET_SERVER_notification_context_broadcast (struct GNUNET_SERVER_NotificationContext *nc, |
709 | const struct GNUNET_MessageHeader *msg, | 709 | const struct GNUNET_MessageHeader *msg, |
710 | int can_drop); | 710 | int can_drop); |
711 | 711 | ||
712 | 712 | ||
@@ -811,7 +811,7 @@ typedef void (*GNUNET_SERVER_MstDestroyCallback) (void *cls, void *mst); | |||
811 | * @param one_shot only call callback once, keep rest of message in buffer | 811 | * @param one_shot only call callback once, keep rest of message in buffer |
812 | * @return #GNUNET_OK if we are done processing (need more data) | 812 | * @return #GNUNET_OK if we are done processing (need more data) |
813 | * #GNUNET_NO if one_shot was set and we have another message ready | 813 | * #GNUNET_NO if one_shot was set and we have another message ready |
814 | * #GNUNET_SYSERR if the data stream is corrupt | 814 | * #GNUNET_SYSERR if the data stream is corrupt |
815 | */ | 815 | */ |
816 | typedef int (*GNUNET_SERVER_MstReceiveCallback) (void *cls, void *mst, | 816 | typedef int (*GNUNET_SERVER_MstReceiveCallback) (void *cls, void *mst, |
817 | struct GNUNET_SERVER_Client *client, | 817 | struct GNUNET_SERVER_Client *client, |
diff --git a/src/include/gnunet_service_lib.h b/src/include/gnunet_service_lib.h index 2d7b3064f..11dcff35e 100644 --- a/src/include/gnunet_service_lib.h +++ b/src/include/gnunet_service_lib.h | |||
@@ -119,10 +119,10 @@ enum GNUNET_SERVICE_Options | |||
119 | * if we shutdown nicely | 119 | * if we shutdown nicely |
120 | */ | 120 | */ |
121 | int | 121 | int |
122 | GNUNET_SERVICE_run (int argc, char *const *argv, | 122 | GNUNET_SERVICE_run (int argc, char *const *argv, |
123 | const char *service_name, | 123 | const char *service_name, |
124 | enum GNUNET_SERVICE_Options options, | 124 | enum GNUNET_SERVICE_Options options, |
125 | GNUNET_SERVICE_Main task, | 125 | GNUNET_SERVICE_Main task, |
126 | void *task_cls); | 126 | void *task_cls); |
127 | 127 | ||
128 | 128 | ||
diff --git a/src/include/gnunet_set_service.h b/src/include/gnunet_set_service.h index dbec108c2..920424b80 100644 --- a/src/include/gnunet_set_service.h +++ b/src/include/gnunet_set_service.h | |||
@@ -317,7 +317,7 @@ GNUNET_SET_prepare (const struct GNUNET_PeerIdentity *other_peer, | |||
317 | * Wait for set operation requests for the given application ID. | 317 | * Wait for set operation requests for the given application ID. |
318 | * If the connection to the set service is lost, the listener is | 318 | * If the connection to the set service is lost, the listener is |
319 | * re-created transparently with exponential backoff. | 319 | * re-created transparently with exponential backoff. |
320 | * | 320 | * |
321 | * @param cfg configuration to use for connecting to | 321 | * @param cfg configuration to use for connecting to |
322 | * the set service | 322 | * the set service |
323 | * @param operation operation we want to listen for | 323 | * @param operation operation we want to listen for |
@@ -351,7 +351,7 @@ GNUNET_SET_listen_cancel (struct GNUNET_SET_ListenHandle *lh); | |||
351 | * GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid | 351 | * GNUNET_SET_listen, as the 'struct GNUNET_SET_Request' becomes invalid |
352 | * afterwards. | 352 | * afterwards. |
353 | * Call GNUNET_SET_commit to provide the local set to use for the operation, | 353 | * Call GNUNET_SET_commit to provide the local set to use for the operation, |
354 | * and to begin the exchange with the remote peer. | 354 | * and to begin the exchange with the remote peer. |
355 | * | 355 | * |
356 | * @param request request to accept | 356 | * @param request request to accept |
357 | * @param result_mode specified how results will be returned, | 357 | * @param result_mode specified how results will be returned, |
@@ -375,7 +375,7 @@ GNUNET_SET_accept (struct GNUNET_SET_Request *request, | |||
375 | * set information and call the result callback with the | 375 | * set information and call the result callback with the |
376 | * result information. | 376 | * result information. |
377 | * | 377 | * |
378 | * @param oh handle to the set operation | 378 | * @param oh handle to the set operation |
379 | * @param set the set to use for the operation | 379 | * @param set the set to use for the operation |
380 | * @return GNUNET_OK on success, GNUNET_SYSERR if the | 380 | * @return GNUNET_OK on success, GNUNET_SYSERR if the |
381 | * set is invalid (e.g. the set service crashed) | 381 | * set is invalid (e.g. the set service crashed) |
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index f53a2c28b..88a52b709 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h | |||
@@ -18,7 +18,7 @@ | |||
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_social_service.h | 22 | * @file include/gnunet_social_service.h |
23 | * @brief Social service; implements social functionality using the PSYC service. | 23 | * @brief Social service; implements social functionality using the PSYC service. |
24 | * @author Gabor X Toth | 24 | * @author Gabor X Toth |
@@ -41,34 +41,34 @@ extern "C" | |||
41 | #include "gnunet_multicast_service.h" | 41 | #include "gnunet_multicast_service.h" |
42 | 42 | ||
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Version number of GNUnet Social API. | 45 | * Version number of GNUnet Social API. |
46 | */ | 46 | */ |
47 | #define GNUNET_SOCIAL_VERSION 0x00000000 | 47 | #define GNUNET_SOCIAL_VERSION 0x00000000 |
48 | 48 | ||
49 | 49 | ||
50 | /** | 50 | /** |
51 | * Handle for another user (who is likely pseudonymous) in the network. | 51 | * Handle for another user (who is likely pseudonymous) in the network. |
52 | */ | 52 | */ |
53 | struct GNUNET_SOCIAL_Nym; | 53 | struct GNUNET_SOCIAL_Nym; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * Handle for a place where social interactions happen. | 56 | * Handle for a place where social interactions happen. |
57 | */ | 57 | */ |
58 | struct GNUNET_SOCIAL_Place; | 58 | struct GNUNET_SOCIAL_Place; |
59 | 59 | ||
60 | /** | 60 | /** |
61 | * Handle for a place that one of our egos hosts. | 61 | * Handle for a place that one of our egos hosts. |
62 | */ | 62 | */ |
63 | struct GNUNET_SOCIAL_Home; | 63 | struct GNUNET_SOCIAL_Home; |
64 | 64 | ||
65 | /** | 65 | /** |
66 | * Handle to an implementation of try-and-slice. | 66 | * Handle to an implementation of try-and-slice. |
67 | */ | 67 | */ |
68 | struct GNUNET_SOCIAL_Slicer; | 68 | struct GNUNET_SOCIAL_Slicer; |
69 | 69 | ||
70 | 70 | ||
71 | /** | 71 | /** |
72 | * Method called from SOCIAL upon receiving a message indicating a call | 72 | * Method called from SOCIAL upon receiving a message indicating a call |
73 | * to a @e method. | 73 | * to a @e method. |
74 | * | 74 | * |
@@ -101,7 +101,7 @@ typedef int | |||
101 | enum GNUNET_PSYC_MessageFlags flags); | 101 | enum GNUNET_PSYC_MessageFlags flags); |
102 | 102 | ||
103 | 103 | ||
104 | /** | 104 | /** |
105 | * Create a try-and-slice instance. | 105 | * Create a try-and-slice instance. |
106 | * | 106 | * |
107 | * @return A new try-and-slice construct. | 107 | * @return A new try-and-slice construct. |
@@ -110,7 +110,7 @@ struct GNUNET_SOCIAL_Slicer * | |||
110 | GNUNET_SOCIAL_slicer_create (void); | 110 | GNUNET_SOCIAL_slicer_create (void); |
111 | 111 | ||
112 | 112 | ||
113 | /** | 113 | /** |
114 | * Add a method to the try-and-slice instance. | 114 | * Add a method to the try-and-slice instance. |
115 | * | 115 | * |
116 | * A slicer processes messages and calls methods that match a message. A match | 116 | * A slicer processes messages and calls methods that match a message. A match |
@@ -129,7 +129,7 @@ GNUNET_SOCIAL_slicer_add (struct GNUNET_SOCIAL_Slicer *slicer, | |||
129 | void *method_cls); | 129 | void *method_cls); |
130 | 130 | ||
131 | 131 | ||
132 | /** | 132 | /** |
133 | * Remove a registered method from the try-and-slice instance. | 133 | * Remove a registered method from the try-and-slice instance. |
134 | * | 134 | * |
135 | * @param slicer The try-and-slice instance. | 135 | * @param slicer The try-and-slice instance. |
@@ -141,7 +141,7 @@ GNUNET_SOCIAL_slicer_remove (struct GNUNET_SOCIAL_Slicer *slicer, | |||
141 | const char *method_name, | 141 | const char *method_name, |
142 | GNUNET_SOCIAL_Method method); | 142 | GNUNET_SOCIAL_Method method); |
143 | 143 | ||
144 | /** | 144 | /** |
145 | * Destroy a given try-and-slice instance. | 145 | * Destroy a given try-and-slice instance. |
146 | * | 146 | * |
147 | * @param slicer slicer to destroy | 147 | * @param slicer slicer to destroy |
@@ -150,7 +150,7 @@ void | |||
150 | GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer); | 150 | GNUNET_SOCIAL_slicer_destroy (struct GNUNET_SOCIAL_Slicer *slicer); |
151 | 151 | ||
152 | 152 | ||
153 | /** | 153 | /** |
154 | * Function called asking for nym to be admitted to the place. | 154 | * Function called asking for nym to be admitted to the place. |
155 | * | 155 | * |
156 | * Should call either GNUNET_SOCIAL_home_admit() or | 156 | * Should call either GNUNET_SOCIAL_home_admit() or |
@@ -178,9 +178,9 @@ typedef void | |||
178 | size_t data_size); | 178 | size_t data_size); |
179 | 179 | ||
180 | 180 | ||
181 | /** | 181 | /** |
182 | * Function called when a @a nym leaves the place. | 182 | * Function called when a @a nym leaves the place. |
183 | * | 183 | * |
184 | * This is also called if the @a nym was never given permission to enter | 184 | * This is also called if the @a nym was never given permission to enter |
185 | * (i.e. the @a nym stopped asking to get in). | 185 | * (i.e. the @a nym stopped asking to get in). |
186 | * | 186 | * |
@@ -196,7 +196,7 @@ typedef void | |||
196 | GNUNET_PSYC_Modifier *variables); | 196 | GNUNET_PSYC_Modifier *variables); |
197 | 197 | ||
198 | 198 | ||
199 | /** | 199 | /** |
200 | * Enter a home where guests (nyms) can be hosted. | 200 | * Enter a home where guests (nyms) can be hosted. |
201 | * | 201 | * |
202 | * A home is created upon first entering, and exists until | 202 | * A home is created upon first entering, and exists until |
@@ -225,7 +225,7 @@ GNUNET_SOCIAL_home_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
225 | void *cls); | 225 | void *cls); |
226 | 226 | ||
227 | 227 | ||
228 | /** | 228 | /** |
229 | * Admit @a nym to the @a home. | 229 | * Admit @a nym to the @a home. |
230 | * | 230 | * |
231 | * The @a nym reference will remain valid until either the home is destroyed or | 231 | * The @a nym reference will remain valid until either the home is destroyed or |
@@ -239,7 +239,7 @@ GNUNET_SOCIAL_home_admit (struct GNUNET_SOCIAL_Home *home, | |||
239 | struct GNUNET_SOCIAL_Nym *nym); | 239 | struct GNUNET_SOCIAL_Nym *nym); |
240 | 240 | ||
241 | 241 | ||
242 | /** | 242 | /** |
243 | * Throw @a nym out of the @a home. | 243 | * Throw @a nym out of the @a home. |
244 | * | 244 | * |
245 | * The @a nym reference will remain valid until the | 245 | * The @a nym reference will remain valid until the |
@@ -254,7 +254,7 @@ GNUNET_SOCIAL_home_eject (struct GNUNET_SOCIAL_Home *home, | |||
254 | struct GNUNET_SOCIAL_Nym *nym); | 254 | struct GNUNET_SOCIAL_Nym *nym); |
255 | 255 | ||
256 | 256 | ||
257 | /** | 257 | /** |
258 | * Refuse @a nym entry into the @a home. | 258 | * Refuse @a nym entry into the @a home. |
259 | * | 259 | * |
260 | * @param home Home to disallow @a nym to enter. | 260 | * @param home Home to disallow @a nym to enter. |
@@ -273,7 +273,7 @@ GNUNET_SOCIAL_home_reject_entry (struct GNUNET_SOCIAL_Home *home, | |||
273 | size_t data_size); | 273 | size_t data_size); |
274 | 274 | ||
275 | 275 | ||
276 | /** | 276 | /** |
277 | * Get the public key of a nym. | 277 | * Get the public key of a nym. |
278 | * | 278 | * |
279 | * Suitable, for example, to be used with GNUNET_NAMESTORE_zone_to_name(). | 279 | * Suitable, for example, to be used with GNUNET_NAMESTORE_zone_to_name(). |
@@ -286,9 +286,9 @@ GNUNET_SOCIAL_nym_get_key (struct GNUNET_SOCIAL_Nym *nym, | |||
286 | struct GNUNET_CRYPTO_EccPublicSignKey *nym_key); | 286 | struct GNUNET_CRYPTO_EccPublicSignKey *nym_key); |
287 | 287 | ||
288 | 288 | ||
289 | /** | 289 | /** |
290 | * Obtain the private-public key pair of the home. | 290 | * Obtain the private-public key pair of the home. |
291 | * | 291 | * |
292 | * @param home Home to get the key of. | 292 | * @param home Home to get the key of. |
293 | * @param[out] home_key Set to the private-public key pair of the home. The public part is suitable for storing in GNS within a "PLACE" record, along with peer IDs to join at. | 293 | * @param[out] home_key Set to the private-public key pair of the home. The public part is suitable for storing in GNS within a "PLACE" record, along with peer IDs to join at. |
294 | */ | 294 | */ |
@@ -297,7 +297,7 @@ GNUNET_SOCIAL_home_get_key (struct GNUNET_SOCIAL_Home *home, | |||
297 | struct GNUNET_CRYPTO_EccPrivateKey *home_key); | 297 | struct GNUNET_CRYPTO_EccPrivateKey *home_key); |
298 | 298 | ||
299 | 299 | ||
300 | /** | 300 | /** |
301 | * Advertise @a home under @a name in the GNS zone of the @e ego. | 301 | * Advertise @a home under @a name in the GNS zone of the @e ego. |
302 | * | 302 | * |
303 | * @param home The home to advertise. | 303 | * @param home The home to advertise. |
@@ -322,9 +322,9 @@ GNUNET_SOCIAL_home_advertise (struct GNUNET_SOCIAL_Home *home, | |||
322 | */ | 322 | */ |
323 | enum GNUNET_PSYC_AnnouncementFlags | 323 | enum GNUNET_PSYC_AnnouncementFlags |
324 | { | 324 | { |
325 | /** | 325 | /** |
326 | * Whether this announcement removes all objects from the home. | 326 | * Whether this announcement removes all objects from the home. |
327 | * | 327 | * |
328 | * New objects can be still added to the now empty home using the @e env | 328 | * New objects can be still added to the now empty home using the @e env |
329 | * parameter of the same announcement. | 329 | * parameter of the same announcement. |
330 | */ | 330 | */ |
@@ -332,13 +332,13 @@ enum GNUNET_PSYC_AnnouncementFlags | |||
332 | }; | 332 | }; |
333 | 333 | ||
334 | 334 | ||
335 | /** | 335 | /** |
336 | * Handle for an announcement request. | 336 | * Handle for an announcement request. |
337 | */ | 337 | */ |
338 | struct GNUNET_SOCIAL_Announcement; | 338 | struct GNUNET_SOCIAL_Announcement; |
339 | 339 | ||
340 | 340 | ||
341 | /** | 341 | /** |
342 | * Send a message to all nyms that are present in the home. | 342 | * Send a message to all nyms that are present in the home. |
343 | * | 343 | * |
344 | * This function is restricted to the home owner. Nyms can only send requests | 344 | * This function is restricted to the home owner. Nyms can only send requests |
@@ -362,7 +362,7 @@ GNUNET_SOCIAL_home_announce (struct GNUNET_SOCIAL_Home *home, | |||
362 | GNUNET_SOCIAL_AnnouncementFlags flags); | 362 | GNUNET_SOCIAL_AnnouncementFlags flags); |
363 | 363 | ||
364 | 364 | ||
365 | /** | 365 | /** |
366 | * Cancel announcement. | 366 | * Cancel announcement. |
367 | * | 367 | * |
368 | * @param a The announcement to cancel. | 368 | * @param a The announcement to cancel. |
@@ -371,7 +371,7 @@ void | |||
371 | GNUNET_SOCIAL_home_announce_cancel (struct GNUNET_SOCIAL_Announcement *a); | 371 | GNUNET_SOCIAL_home_announce_cancel (struct GNUNET_SOCIAL_Announcement *a); |
372 | 372 | ||
373 | 373 | ||
374 | /** | 374 | /** |
375 | * Convert our home to a place so we can access it via the place API. | 375 | * Convert our home to a place so we can access it via the place API. |
376 | * | 376 | * |
377 | * @param home Handle for the home. | 377 | * @param home Handle for the home. |
@@ -383,7 +383,7 @@ struct GNUNET_SOCIAL_Place * | |||
383 | GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active); | 383 | GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active); |
384 | 384 | ||
385 | 385 | ||
386 | /** | 386 | /** |
387 | * Leave a home. | 387 | * Leave a home. |
388 | 388 | ||
389 | * Invalidates home handle. | 389 | * Invalidates home handle. |
@@ -394,7 +394,7 @@ GNUNET_SOCIAL_home_get_place (struct GNUNET_SOCIAL_Home *home, int keep_active); | |||
394 | void | 394 | void |
395 | GNUNET_SOCIAL_home_leave (struct GNUNET_SOCIAL_Home *home); | 395 | GNUNET_SOCIAL_home_leave (struct GNUNET_SOCIAL_Home *home); |
396 | 396 | ||
397 | /** | 397 | /** |
398 | * Request entry to a place (home hosted by someone else). | 398 | * Request entry to a place (home hosted by someone else). |
399 | * | 399 | * |
400 | * @param cfg Configuration to contact the social service. | 400 | * @param cfg Configuration to contact the social service. |
@@ -421,7 +421,7 @@ GNUNET_SOCIAL_place_enter (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
421 | size_t data_size, | 421 | size_t data_size, |
422 | struct GNUNET_SOCIAL_Slicer *slicer); | 422 | struct GNUNET_SOCIAL_Slicer *slicer); |
423 | 423 | ||
424 | /** | 424 | /** |
425 | * Request entry to a place (home hosted by someone else). | 425 | * Request entry to a place (home hosted by someone else). |
426 | * | 426 | * |
427 | * @param cfg Configuration to contact the social service. | 427 | * @param cfg Configuration to contact the social service. |
@@ -453,14 +453,14 @@ GNUNET_SOCIAL_place_enter2 (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
453 | 453 | ||
454 | struct GNUNET_SOCIAL_WatchHandle; | 454 | struct GNUNET_SOCIAL_WatchHandle; |
455 | 455 | ||
456 | /** | 456 | /** |
457 | * Watch a place for changed objects. | 457 | * Watch a place for changed objects. |
458 | * | 458 | * |
459 | * @param place Place to watch. | 459 | * @param place Place to watch. |
460 | * @param object_filter Object prefix to match. | 460 | * @param object_filter Object prefix to match. |
461 | * @param state_cb Function to call when an object/state changes. | 461 | * @param state_cb Function to call when an object/state changes. |
462 | * @param state_cb_cls Closure for callback. | 462 | * @param state_cb_cls Closure for callback. |
463 | * | 463 | * |
464 | * @return Handle that can be used to cancel watching. | 464 | * @return Handle that can be used to cancel watching. |
465 | */ | 465 | */ |
466 | struct GNUNET_SOCIAL_WatchHandle * | 466 | struct GNUNET_SOCIAL_WatchHandle * |
@@ -470,7 +470,7 @@ GNUNET_SOCIAL_place_watch (struct GNUNET_SOCIAL_Place *place, | |||
470 | void *state_cb_cls); | 470 | void *state_cb_cls); |
471 | 471 | ||
472 | 472 | ||
473 | /** | 473 | /** |
474 | * Cancel watching a place for changed objects. | 474 | * Cancel watching a place for changed objects. |
475 | * | 475 | * |
476 | * @param wh Watch handle to cancel. | 476 | * @param wh Watch handle to cancel. |
@@ -482,14 +482,14 @@ GNUNET_SOCIAL_place_watch_cancel (struct GNUNET_SOCIAL_WatchHandle *wh); | |||
482 | struct GNUNET_SOCIAL_LookHandle; | 482 | struct GNUNET_SOCIAL_LookHandle; |
483 | 483 | ||
484 | 484 | ||
485 | /** | 485 | /** |
486 | * Look at objects in the place with a matching name prefix. | 486 | * Look at objects in the place with a matching name prefix. |
487 | * | 487 | * |
488 | * @param place The place to look its objects at. | 488 | * @param place The place to look its objects at. |
489 | * @param name_prefix Look at objects with names beginning with this value. | 489 | * @param name_prefix Look at objects with names beginning with this value. |
490 | * @param state_cb Function to call for each object found. | 490 | * @param state_cb Function to call for each object found. |
491 | * @param state_cb_cls Closure for callback function. | 491 | * @param state_cb_cls Closure for callback function. |
492 | * | 492 | * |
493 | * @return Handle that can be used to stop looking at objects. | 493 | * @return Handle that can be used to stop looking at objects. |
494 | */ | 494 | */ |
495 | struct GNUNET_SOCIAL_LookHandle * | 495 | struct GNUNET_SOCIAL_LookHandle * |
@@ -499,7 +499,7 @@ GNUNET_SOCIAL_place_look (struct GNUNET_SOCIAL_Place *place, | |||
499 | void *state_cb_cls); | 499 | void *state_cb_cls); |
500 | 500 | ||
501 | 501 | ||
502 | /** | 502 | /** |
503 | * Stop looking at objects. | 503 | * Stop looking at objects. |
504 | * | 504 | * |
505 | * @param lh Look handle to stop. | 505 | * @param lh Look handle to stop. |
@@ -509,7 +509,7 @@ GNUNET_SOCIAL_place_look_cancel (struct GNUNET_SOCIAL_LookHandle *lh); | |||
509 | 509 | ||
510 | 510 | ||
511 | 511 | ||
512 | /** | 512 | /** |
513 | * Look at a particular object in the place. | 513 | * Look at a particular object in the place. |
514 | * | 514 | * |
515 | * The best matching object is returned (its name might be less specific than | 515 | * The best matching object is returned (its name might be less specific than |
@@ -532,12 +532,12 @@ GNUNET_SOCIAL_place_look_at (struct GNUNET_SOCIAL_Place *place, | |||
532 | enum GNUNET_SOCIAL_TalkFlags; | 532 | enum GNUNET_SOCIAL_TalkFlags; |
533 | 533 | ||
534 | 534 | ||
535 | /** | 535 | /** |
536 | * A talk request. | 536 | * A talk request. |
537 | */ | 537 | */ |
538 | struct GNUNET_SOCIAL_TalkRequest; | 538 | struct GNUNET_SOCIAL_TalkRequest; |
539 | 539 | ||
540 | /** | 540 | /** |
541 | * Talk to the host of the place. | 541 | * Talk to the host of the place. |
542 | * | 542 | * |
543 | * @param place Place where we want to talk to the host. | 543 | * @param place Place where we want to talk to the host. |
@@ -558,7 +558,7 @@ GNUNET_SOCIAL_place_talk (struct GNUNET_SOCIAL_Place *place, | |||
558 | GNUNET_SOCIAL_TalkFlags flags); | 558 | GNUNET_SOCIAL_TalkFlags flags); |
559 | 559 | ||
560 | 560 | ||
561 | /** | 561 | /** |
562 | * Cancel talking to the host of the place. | 562 | * Cancel talking to the host of the place. |
563 | * | 563 | * |
564 | * @param tr Talk request to cancel. | 564 | * @param tr Talk request to cancel. |
@@ -567,12 +567,12 @@ void | |||
567 | GNUNET_SOCIAL_place_talk_cancel (struct GNUNET_SOCIAL_TalkRequest *tr); | 567 | GNUNET_SOCIAL_place_talk_cancel (struct GNUNET_SOCIAL_TalkRequest *tr); |
568 | 568 | ||
569 | 569 | ||
570 | /** | 570 | /** |
571 | * A history lesson. | 571 | * A history lesson. |
572 | */ | 572 | */ |
573 | struct GNUNET_SOCIAL_HistoryLesson; | 573 | struct GNUNET_SOCIAL_HistoryLesson; |
574 | 574 | ||
575 | /** | 575 | /** |
576 | * Learn about the history of a place. | 576 | * Learn about the history of a place. |
577 | * | 577 | * |
578 | * Sends messages through the slicer function of the place where | 578 | * Sends messages through the slicer function of the place where |
@@ -580,7 +580,7 @@ struct GNUNET_SOCIAL_HistoryLesson; | |||
580 | * The messages will have the #GNUNET_PSYC_MESSAGE_HISTORIC flag set. | 580 | * The messages will have the #GNUNET_PSYC_MESSAGE_HISTORIC flag set. |
581 | * | 581 | * |
582 | * To get the latest message, use 0 for both the start and end message ID. | 582 | * To get the latest message, use 0 for both the start and end message ID. |
583 | * | 583 | * |
584 | * @param place Place we want to learn more about. | 584 | * @param place Place we want to learn more about. |
585 | * @param start_message_id First historic message we are interested in. | 585 | * @param start_message_id First historic message we are interested in. |
586 | * @param end_message_id Last historic message we are interested in (inclusive). | 586 | * @param end_message_id Last historic message we are interested in (inclusive). |
@@ -602,7 +602,7 @@ GNUNET_SOCIAL_place_get_history (struct GNUNET_SOCIAL_Place *place, | |||
602 | void *finish_cb_cls); | 602 | void *finish_cb_cls); |
603 | 603 | ||
604 | 604 | ||
605 | /** | 605 | /** |
606 | * Stop processing messages from the history lesson. | 606 | * Stop processing messages from the history lesson. |
607 | * | 607 | * |
608 | * Must not be called after the finish callback of the history lesson is called. | 608 | * Must not be called after the finish callback of the history lesson is called. |
@@ -613,11 +613,11 @@ void | |||
613 | GNUNET_SOCIAL_place_get_history_cancel (struct GNUNET_SOCIAL_HistoryLesson *hist); | 613 | GNUNET_SOCIAL_place_get_history_cancel (struct GNUNET_SOCIAL_HistoryLesson *hist); |
614 | 614 | ||
615 | 615 | ||
616 | /** | 616 | /** |
617 | * Leave a place permanently. | 617 | * Leave a place permanently. |
618 | * | 618 | * |
619 | * Notifies the owner of the place about leaving, and destroys the place handle. | 619 | * Notifies the owner of the place about leaving, and destroys the place handle. |
620 | * | 620 | * |
621 | * @param place Place to leave permanently. | 621 | * @param place Place to leave permanently. |
622 | * @param keep_active Keep place active after last application disconnected. | 622 | * @param keep_active Keep place active after last application disconnected. |
623 | */ | 623 | */ |
diff --git a/src/include/gnunet_speaker_lib.h b/src/include/gnunet_speaker_lib.h index bdb91d6a1..136b11e55 100644 --- a/src/include/gnunet_speaker_lib.h +++ b/src/include/gnunet_speaker_lib.h | |||
@@ -1,17 +1,17 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet | 2 | This file is part of GNUnet |
3 | (C) 2013 Christian Grothoff (and other contributing authors) | 3 | (C) 2013 Christian Grothoff (and other contributing authors) |
4 | 4 | ||
5 | GNUnet is free software; you can redistribute it and/or modify | 5 | GNUnet is free software; you can redistribute it and/or modify |
6 | it under the terms of the GNU General Public License as published | 6 | it under the terms of the GNU General Public License as published |
7 | by the Free Software Foundation; either version 3, or (at your | 7 | by the Free Software Foundation; either version 3, or (at your |
8 | option) any later version. | 8 | option) any later version. |
9 | 9 | ||
10 | GNUnet is distributed in the hope that it will be useful, but | 10 | GNUnet is distributed in the hope that it will be useful, but |
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
13 | General Public License for more details. | 13 | General Public License for more details. |
14 | 14 | ||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License |
16 | along with GNUnet; see the file COPYING. If not, write to the | 16 | along with GNUnet; see the file COPYING. If not, write to the |
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
diff --git a/src/include/gnunet_strings_lib.h b/src/include/gnunet_strings_lib.h index 1fe04da6b..cf56b2cce 100644 --- a/src/include/gnunet_strings_lib.h +++ b/src/include/gnunet_strings_lib.h | |||
@@ -123,8 +123,8 @@ GNUNET_STRINGS_conv (const char *input, size_t len, | |||
123 | * @return the converted string (0-terminated) | 123 | * @return the converted string (0-terminated) |
124 | */ | 124 | */ |
125 | char * | 125 | char * |
126 | GNUNET_STRINGS_to_utf8 (const char *input, | 126 | GNUNET_STRINGS_to_utf8 (const char *input, |
127 | size_t len, | 127 | size_t len, |
128 | const char *charset); | 128 | const char *charset); |
129 | 129 | ||
130 | 130 | ||
@@ -137,8 +137,8 @@ GNUNET_STRINGS_to_utf8 (const char *input, | |||
137 | * string is returned. | 137 | * string is returned. |
138 | */ | 138 | */ |
139 | char * | 139 | char * |
140 | GNUNET_STRINGS_from_utf8 (const char *input, | 140 | GNUNET_STRINGS_from_utf8 (const char *input, |
141 | size_t len, | 141 | size_t len, |
142 | const char *charset); | 142 | const char *charset); |
143 | 143 | ||
144 | 144 | ||
@@ -150,7 +150,7 @@ GNUNET_STRINGS_from_utf8 (const char *input, | |||
150 | * @param output output buffer | 150 | * @param output output buffer |
151 | */ | 151 | */ |
152 | void | 152 | void |
153 | GNUNET_STRINGS_utf8_tolower (const char* input, | 153 | GNUNET_STRINGS_utf8_tolower (const char* input, |
154 | char** output); | 154 | char** output); |
155 | 155 | ||
156 | 156 | ||
@@ -198,9 +198,9 @@ GNUNET_STRINGS_filename_expand (const char *fil); | |||
198 | * (or number of bytes that would have been written) | 198 | * (or number of bytes that would have been written) |
199 | */ | 199 | */ |
200 | size_t | 200 | size_t |
201 | GNUNET_STRINGS_buffer_fill (char *buffer, | 201 | GNUNET_STRINGS_buffer_fill (char *buffer, |
202 | size_t size, | 202 | size_t size, |
203 | unsigned int count, | 203 | unsigned int count, |
204 | ...); | 204 | ...); |
205 | 205 | ||
206 | 206 | ||
@@ -237,7 +237,7 @@ GNUNET_STRINGS_absolute_time_to_string (struct GNUNET_TIME_Absolute t); | |||
237 | /** | 237 | /** |
238 | * Give relative time in human-readable fancy format. | 238 | * Give relative time in human-readable fancy format. |
239 | * This is one of the very few calls in the entire API that is | 239 | * This is one of the very few calls in the entire API that is |
240 | * NOT reentrant! | 240 | * NOT reentrant! |
241 | * | 241 | * |
242 | * @param delta time in milli seconds | 242 | * @param delta time in milli seconds |
243 | * @param do_round are we allowed to round a bit? | 243 | * @param do_round are we allowed to round a bit? |
@@ -279,9 +279,9 @@ GNUNET_STRINGS_get_short_name (const char *filename); | |||
279 | * @return pointer to the next byte in 'out' or NULL on error. | 279 | * @return pointer to the next byte in 'out' or NULL on error. |
280 | */ | 280 | */ |
281 | char * | 281 | char * |
282 | GNUNET_STRINGS_data_to_string (const void *data, | 282 | GNUNET_STRINGS_data_to_string (const void *data, |
283 | size_t size, | 283 | size_t size, |
284 | char *out, | 284 | char *out, |
285 | size_t out_size); | 285 | size_t out_size); |
286 | 286 | ||
287 | 287 | ||
@@ -296,9 +296,9 @@ GNUNET_STRINGS_data_to_string (const void *data, | |||
296 | * @return GNUNET_OK on success, GNUNET_SYSERR if result has the wrong encoding | 296 | * @return GNUNET_OK on success, GNUNET_SYSERR if result has the wrong encoding |
297 | */ | 297 | */ |
298 | int | 298 | int |
299 | GNUNET_STRINGS_string_to_data (const char *enc, | 299 | GNUNET_STRINGS_string_to_data (const char *enc, |
300 | size_t enclen, | 300 | size_t enclen, |
301 | void *out, | 301 | void *out, |
302 | size_t out_size); | 302 | size_t out_size); |
303 | 303 | ||
304 | 304 | ||
@@ -319,7 +319,7 @@ GNUNET_STRINGS_string_to_data (const char *enc, | |||
319 | * (if they weren't NULL). | 319 | * (if they weren't NULL). |
320 | */ | 320 | */ |
321 | int | 321 | int |
322 | GNUNET_STRINGS_parse_uri (const char *path, | 322 | GNUNET_STRINGS_parse_uri (const char *path, |
323 | char **scheme_part, | 323 | char **scheme_part, |
324 | const char **path_part); | 324 | const char **path_part); |
325 | 325 | ||
@@ -339,9 +339,9 @@ GNUNET_STRINGS_parse_uri (const char *path, | |||
339 | * @return GNUNET_YES if 'filename' is absolute, GNUNET_NO otherwise. | 339 | * @return GNUNET_YES if 'filename' is absolute, GNUNET_NO otherwise. |
340 | */ | 340 | */ |
341 | int | 341 | int |
342 | GNUNET_STRINGS_path_is_absolute (const char *filename, | 342 | GNUNET_STRINGS_path_is_absolute (const char *filename, |
343 | int can_be_uri, | 343 | int can_be_uri, |
344 | int *r_is_uri, | 344 | int *r_is_uri, |
345 | char **r_uri_scheme); | 345 | char **r_uri_scheme); |
346 | 346 | ||
347 | 347 | ||
@@ -367,7 +367,7 @@ enum GNUNET_STRINGS_FilenameCheck | |||
367 | 367 | ||
368 | /** | 368 | /** |
369 | * Check that the path is an absolute path. | 369 | * Check that the path is an absolute path. |
370 | */ | 370 | */ |
371 | GNUNET_STRINGS_CHECK_IS_ABSOLUTE = 0x00000008 | 371 | GNUNET_STRINGS_CHECK_IS_ABSOLUTE = 0x00000008 |
372 | }; | 372 | }; |
373 | 373 | ||
@@ -375,7 +375,7 @@ enum GNUNET_STRINGS_FilenameCheck | |||
375 | /** | 375 | /** |
376 | * Perform checks on 'filename'. FIXME: some duplication with | 376 | * Perform checks on 'filename'. FIXME: some duplication with |
377 | * "GNUNET_DISK_"-APIs. We should unify those. | 377 | * "GNUNET_DISK_"-APIs. We should unify those. |
378 | * | 378 | * |
379 | * @param filename file to check | 379 | * @param filename file to check |
380 | * @param checks checks to perform | 380 | * @param checks checks to perform |
381 | * @return GNUNET_YES if all checks pass, GNUNET_NO if at least one of them | 381 | * @return GNUNET_YES if all checks pass, GNUNET_NO if at least one of them |
@@ -389,7 +389,7 @@ GNUNET_STRINGS_check_filename (const char *filename, | |||
389 | /** | 389 | /** |
390 | * Tries to convert 'zt_addr' string to an IPv6 address. | 390 | * Tries to convert 'zt_addr' string to an IPv6 address. |
391 | * The string is expected to have the format "[ABCD::01]:80". | 391 | * The string is expected to have the format "[ABCD::01]:80". |
392 | * | 392 | * |
393 | * @param zt_addr 0-terminated string. May be mangled by the function. | 393 | * @param zt_addr 0-terminated string. May be mangled by the function. |
394 | * @param addrlen length of zt_addr (not counting 0-terminator). | 394 | * @param addrlen length of zt_addr (not counting 0-terminator). |
395 | * @param r_buf a buffer to fill. Initially gets filled with zeroes, | 395 | * @param r_buf a buffer to fill. Initially gets filled with zeroes, |
@@ -398,7 +398,7 @@ GNUNET_STRINGS_check_filename (const char *filename, | |||
398 | * case the contents of r_buf are undefined. | 398 | * case the contents of r_buf are undefined. |
399 | */ | 399 | */ |
400 | int | 400 | int |
401 | GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, | 401 | GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, |
402 | uint16_t addrlen, | 402 | uint16_t addrlen, |
403 | struct sockaddr_in6 *r_buf); | 403 | struct sockaddr_in6 *r_buf); |
404 | 404 | ||
@@ -406,7 +406,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, | |||
406 | /** | 406 | /** |
407 | * Tries to convert 'zt_addr' string to an IPv4 address. | 407 | * Tries to convert 'zt_addr' string to an IPv4 address. |
408 | * The string is expected to have the format "1.2.3.4:80". | 408 | * The string is expected to have the format "1.2.3.4:80". |
409 | * | 409 | * |
410 | * @param zt_addr 0-terminated string. May be mangled by the function. | 410 | * @param zt_addr 0-terminated string. May be mangled by the function. |
411 | * @param addrlen length of zt_addr (not counting 0-terminator). | 411 | * @param addrlen length of zt_addr (not counting 0-terminator). |
412 | * @param r_buf a buffer to fill. | 412 | * @param r_buf a buffer to fill. |
@@ -414,7 +414,7 @@ GNUNET_STRINGS_to_address_ipv6 (const char *zt_addr, | |||
414 | * the contents of r_buf are undefined. | 414 | * the contents of r_buf are undefined. |
415 | */ | 415 | */ |
416 | int | 416 | int |
417 | GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, | 417 | GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, |
418 | uint16_t addrlen, | 418 | uint16_t addrlen, |
419 | struct sockaddr_in *r_buf); | 419 | struct sockaddr_in *r_buf); |
420 | 420 | ||
@@ -422,7 +422,7 @@ GNUNET_STRINGS_to_address_ipv4 (const char *zt_addr, | |||
422 | /** | 422 | /** |
423 | * Tries to convert 'addr' string to an IP (v4 or v6) address. | 423 | * Tries to convert 'addr' string to an IP (v4 or v6) address. |
424 | * Will automatically decide whether to treat 'addr' as v4 or v6 address. | 424 | * Will automatically decide whether to treat 'addr' as v4 or v6 address. |
425 | * | 425 | * |
426 | * @param addr a string, may not be 0-terminated. | 426 | * @param addr a string, may not be 0-terminated. |
427 | * @param addrlen number of bytes in addr (if addr is 0-terminated, | 427 | * @param addrlen number of bytes in addr (if addr is 0-terminated, |
428 | * 0-terminator should not be counted towards addrlen). | 428 | * 0-terminator should not be counted towards addrlen). |
@@ -451,8 +451,8 @@ GNUNET_STRINGS_to_address_ip (const char *addr, | |||
451 | * @return GNUNET_OK on success, GNUNET_SYSERR on failure | 451 | * @return GNUNET_OK on success, GNUNET_SYSERR on failure |
452 | */ | 452 | */ |
453 | int | 453 | int |
454 | GNUNET_STRINGS_get_utf8_args (int argc, | 454 | GNUNET_STRINGS_get_utf8_args (int argc, |
455 | char *const *argv, | 455 | char *const *argv, |
456 | int *u8argc, | 456 | int *u8argc, |
457 | char *const **u8argv); | 457 | char *const **u8argv); |
458 | 458 | ||
diff --git a/src/include/gnunet_testbed_logger_service.h b/src/include/gnunet_testbed_logger_service.h index 95783ea37..7e668ca1a 100644 --- a/src/include/gnunet_testbed_logger_service.h +++ b/src/include/gnunet_testbed_logger_service.h | |||
@@ -21,7 +21,7 @@ | |||
21 | /** | 21 | /** |
22 | * @file include/gnunet_testbed_logger_service.h | 22 | * @file include/gnunet_testbed_logger_service.h |
23 | * @brief API for submitting data to the testbed logger service | 23 | * @brief API for submitting data to the testbed logger service |
24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> | 24 | * @author Sree Harsha Totakura <sreeharsha@totakura.in> |
25 | */ | 25 | */ |
26 | 26 | ||
27 | #ifndef GNUNET_TESTBED_LOGGER_SERVICE_H | 27 | #ifndef GNUNET_TESTBED_LOGGER_SERVICE_H |
diff --git a/src/include/gnunet_testbed_service.h b/src/include/gnunet_testbed_service.h index fa07cc63e..73dc88498 100644 --- a/src/include/gnunet_testbed_service.h +++ b/src/include/gnunet_testbed_service.h | |||
@@ -1108,7 +1108,7 @@ GNUNET_TESTBED_overlay_connect (void *op_cls, | |||
1108 | * @param nsuccess the number of successful overlay connects | 1108 | * @param nsuccess the number of successful overlay connects |
1109 | * @param nfailures the number of overlay connects which failed | 1109 | * @param nfailures the number of overlay connects which failed |
1110 | */ | 1110 | */ |
1111 | typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls, | 1111 | typedef void (*GNUNET_TESTBED_TopologyCompletionCallback) (void *cls, |
1112 | unsigned int nsuccess, | 1112 | unsigned int nsuccess, |
1113 | unsigned int nfailures); | 1113 | unsigned int nfailures); |
1114 | 1114 | ||
@@ -1277,7 +1277,7 @@ GNUNET_TESTBED_service_connect (void *op_cls, | |||
1277 | * cancels the operation, frees its resources and ensures the no event is | 1277 | * cancels the operation, frees its resources and ensures the no event is |
1278 | * generated with respect to this operation. Note that however cancelling an | 1278 | * generated with respect to this operation. Note that however cancelling an |
1279 | * operation does NOT guarantee that the operation will be fully undone (or that | 1279 | * operation does NOT guarantee that the operation will be fully undone (or that |
1280 | * nothing ever happened). | 1280 | * nothing ever happened). |
1281 | * | 1281 | * |
1282 | * This function MUST be called for every operation to fully remove the | 1282 | * This function MUST be called for every operation to fully remove the |
1283 | * operation from the operation queue. After calling this function, if | 1283 | * operation from the operation queue. After calling this function, if |
@@ -1491,7 +1491,7 @@ enum GNUNET_TESTBED_BarrierStatus | |||
1491 | * Error status | 1491 | * Error status |
1492 | */ | 1492 | */ |
1493 | GNUNET_TESTBED_BARRIERSTATUS_ERROR, | 1493 | GNUNET_TESTBED_BARRIERSTATUS_ERROR, |
1494 | 1494 | ||
1495 | }; | 1495 | }; |
1496 | 1496 | ||
1497 | 1497 | ||
@@ -1518,7 +1518,7 @@ typedef void (*GNUNET_TESTBED_barrier_status_cb) (void *cls, | |||
1518 | 1518 | ||
1519 | /** | 1519 | /** |
1520 | * Initialise a barrier and call the given callback when the required percentage | 1520 | * Initialise a barrier and call the given callback when the required percentage |
1521 | * of peers (quorum) reach the barrier. | 1521 | * of peers (quorum) reach the barrier. |
1522 | * | 1522 | * |
1523 | * @param controller the handle to the controller | 1523 | * @param controller the handle to the controller |
1524 | * @param name identification name of the barrier | 1524 | * @param name identification name of the barrier |
diff --git a/src/include/gnunet_testing_lib.h b/src/include/gnunet_testing_lib.h index f182d8df5..3f5b260eb 100644 --- a/src/include/gnunet_testing_lib.h +++ b/src/include/gnunet_testing_lib.h | |||
@@ -46,7 +46,7 @@ extern "C" | |||
46 | #endif | 46 | #endif |
47 | 47 | ||
48 | /** | 48 | /** |
49 | * Size of each hostkey in the hostkey file (in BYTES). | 49 | * Size of each hostkey in the hostkey file (in BYTES). |
50 | */ | 50 | */ |
51 | #define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EccPrivateKey) | 51 | #define GNUNET_TESTING_HOSTKEYFILESIZE sizeof (struct GNUNET_CRYPTO_EccPrivateKey) |
52 | 52 | ||
@@ -138,7 +138,7 @@ struct GNUNET_TESTING_System * | |||
138 | GNUNET_TESTING_system_create_with_portrange (const char *testdir, | 138 | GNUNET_TESTING_system_create_with_portrange (const char *testdir, |
139 | const char *trusted_ip, | 139 | const char *trusted_ip, |
140 | const char *hostname, | 140 | const char *hostname, |
141 | const struct | 141 | const struct |
142 | GNUNET_TESTING_SharedService * | 142 | GNUNET_TESTING_SharedService * |
143 | shared_services, | 143 | shared_services, |
144 | uint16_t lowport, | 144 | uint16_t lowport, |
@@ -162,7 +162,7 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system, | |||
162 | * faster peer startup. This function can be used to | 162 | * faster peer startup. This function can be used to |
163 | * access the n-th key of those pre-created hostkeys; note | 163 | * access the n-th key of those pre-created hostkeys; note |
164 | * that these keys are ONLY useful for testing and not | 164 | * that these keys are ONLY useful for testing and not |
165 | * secure as the private keys are part of the public | 165 | * secure as the private keys are part of the public |
166 | * GNUnet source code. | 166 | * GNUnet source code. |
167 | * | 167 | * |
168 | * This is primarily a helper function used internally | 168 | * This is primarily a helper function used internally |
@@ -186,7 +186,7 @@ GNUNET_TESTING_hostkey_get (const struct GNUNET_TESTING_System *system, | |||
186 | * @param system system to use for reservation tracking | 186 | * @param system system to use for reservation tracking |
187 | * @return 0 if no free port was available | 187 | * @return 0 if no free port was available |
188 | */ | 188 | */ |
189 | uint16_t | 189 | uint16_t |
190 | GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system); | 190 | GNUNET_TESTING_reserve_port (struct GNUNET_TESTING_System *system); |
191 | 191 | ||
192 | 192 | ||
@@ -226,14 +226,14 @@ GNUNET_TESTING_configuration_create (struct GNUNET_TESTING_System *system, | |||
226 | 226 | ||
227 | /** | 227 | /** |
228 | * Configure a GNUnet peer. GNUnet must be installed on the local | 228 | * Configure a GNUnet peer. GNUnet must be installed on the local |
229 | * system and available in the PATH. | 229 | * system and available in the PATH. |
230 | * | 230 | * |
231 | * @param system system to use to coordinate resource usage | 231 | * @param system system to use to coordinate resource usage |
232 | * @param cfg configuration to use; will be UPDATED (to reflect needed | 232 | * @param cfg configuration to use; will be UPDATED (to reflect needed |
233 | * changes in port numbers and paths) | 233 | * changes in port numbers and paths) |
234 | * @param key_number number of the hostkey to use for the peer | 234 | * @param key_number number of the hostkey to use for the peer |
235 | * @param id identifier for the daemon, will be set, can be NULL | 235 | * @param id identifier for the daemon, will be set, can be NULL |
236 | * @param emsg set to freshly allocated error message (set to NULL on success), | 236 | * @param emsg set to freshly allocated error message (set to NULL on success), |
237 | * can be NULL | 237 | * can be NULL |
238 | * @return handle to the peer, NULL on error | 238 | * @return handle to the peer, NULL on error |
239 | */ | 239 | */ |
@@ -257,7 +257,7 @@ GNUNET_TESTING_peer_get_identity (struct GNUNET_TESTING_Peer *peer, | |||
257 | 257 | ||
258 | 258 | ||
259 | /** | 259 | /** |
260 | * Start the peer. | 260 | * Start the peer. |
261 | * | 261 | * |
262 | * @param peer peer to start | 262 | * @param peer peer to start |
263 | * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running) | 263 | * @return GNUNET_OK on success, GNUNET_SYSERR on error (i.e. peer already running) |
@@ -319,7 +319,7 @@ GNUNET_TESTING_peer_wait (struct GNUNET_TESTING_Peer *peer); | |||
319 | * @param success GNUNET_YES if the peer is stopped; GNUNET_SYSERR upon any | 319 | * @param success GNUNET_YES if the peer is stopped; GNUNET_SYSERR upon any |
320 | * error | 320 | * error |
321 | */ | 321 | */ |
322 | typedef void (*GNUNET_TESTING_PeerStopCallback) (void *cls, | 322 | typedef void (*GNUNET_TESTING_PeerStopCallback) (void *cls, |
323 | struct GNUNET_TESTING_Peer * | 323 | struct GNUNET_TESTING_Peer * |
324 | peer, | 324 | peer, |
325 | int success); | 325 | int success); |
@@ -358,7 +358,7 @@ GNUNET_TESTING_peer_stop_async_cancel (struct GNUNET_TESTING_Peer *peer); | |||
358 | /** | 358 | /** |
359 | * Signature of the 'main' function for a (single-peer) testcase that | 359 | * Signature of the 'main' function for a (single-peer) testcase that |
360 | * is run using 'GNUNET_TESTING_peer_run'. | 360 | * is run using 'GNUNET_TESTING_peer_run'. |
361 | * | 361 | * |
362 | * @param cls closure | 362 | * @param cls closure |
363 | * @param cfg configuration of the peer that was started | 363 | * @param cfg configuration of the peer that was started |
364 | * @param peer identity of the peer that was created | 364 | * @param peer identity of the peer that was created |
@@ -424,14 +424,14 @@ GNUNET_TESTING_service_run (const char *testdir, | |||
424 | * Sometimes we use the binary name to determine which specific | 424 | * Sometimes we use the binary name to determine which specific |
425 | * test to run. In those cases, the string after the last "_" | 425 | * test to run. In those cases, the string after the last "_" |
426 | * in 'argv[0]' specifies a string that determines the configuration | 426 | * in 'argv[0]' specifies a string that determines the configuration |
427 | * file or plugin to use. | 427 | * file or plugin to use. |
428 | * | 428 | * |
429 | * This function returns the respective substring, taking care | 429 | * This function returns the respective substring, taking care |
430 | * of issues such as binaries ending in '.exe' on W32. | 430 | * of issues such as binaries ending in '.exe' on W32. |
431 | * | 431 | * |
432 | * @param argv0 the name of the binary | 432 | * @param argv0 the name of the binary |
433 | * @return string between the last '_' and the '.exe' (or the end of the string), | 433 | * @return string between the last '_' and the '.exe' (or the end of the string), |
434 | * NULL if argv0 has no '_' | 434 | * NULL if argv0 has no '_' |
435 | */ | 435 | */ |
436 | char * | 436 | char * |
437 | GNUNET_TESTING_get_testname_from_underscore (const char *argv0); | 437 | GNUNET_TESTING_get_testname_from_underscore (const char *argv0); |
diff --git a/src/include/gnunet_time_lib.h b/src/include/gnunet_time_lib.h index 3e87309c6..4db73966c 100644 --- a/src/include/gnunet_time_lib.h +++ b/src/include/gnunet_time_lib.h | |||
@@ -483,7 +483,7 @@ GNUNET_TIME_set_offset (long long offset); | |||
483 | * | 483 | * |
484 | * @return the offset we currently skew the locale time by | 484 | * @return the offset we currently skew the locale time by |
485 | */ | 485 | */ |
486 | long long | 486 | long long |
487 | GNUNET_TIME_get_offset (void); | 487 | GNUNET_TIME_get_offset (void); |
488 | 488 | ||
489 | 489 | ||
@@ -507,10 +507,10 @@ GNUNET_TIME_year_to_time (unsigned int year); | |||
507 | /** | 507 | /** |
508 | * Convert an expiration time to the respective year (rounds) | 508 | * Convert an expiration time to the respective year (rounds) |
509 | * | 509 | * |
510 | * @param at absolute time | 510 | * @param at absolute time |
511 | * @return year a year (after 1970), 0 on error | 511 | * @return year a year (after 1970), 0 on error |
512 | */ | 512 | */ |
513 | unsigned int | 513 | unsigned int |
514 | GNUNET_TIME_time_to_year (struct GNUNET_TIME_Absolute at); | 514 | GNUNET_TIME_time_to_year (struct GNUNET_TIME_Absolute at); |
515 | 515 | ||
516 | 516 | ||
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h index c42c360d9..f835bdcd8 100644 --- a/src/include/gnunet_transport_plugin.h +++ b/src/include/gnunet_transport_plugin.h | |||
@@ -247,7 +247,7 @@ struct GNUNET_TRANSPORT_PluginEnvironment | |||
247 | * Function that should be called by the transport plugin | 247 | * Function that should be called by the transport plugin |
248 | * whenever a message is received. If this field is "NULL", | 248 | * whenever a message is received. If this field is "NULL", |
249 | * the plugin should load in 'stub' mode and NOT fully | 249 | * the plugin should load in 'stub' mode and NOT fully |
250 | * initialize and instead only return an API with the | 250 | * initialize and instead only return an API with the |
251 | * 'address_pretty_printer', 'address_to_string' and | 251 | * 'address_pretty_printer', 'address_to_string' and |
252 | * 'string_to_address' functions. | 252 | * 'string_to_address' functions. |
253 | */ | 253 | */ |
diff --git a/src/include/gnunet_tun_lib.h b/src/include/gnunet_tun_lib.h index ff24cb542..17cec8d12 100644 --- a/src/include/gnunet_tun_lib.h +++ b/src/include/gnunet_tun_lib.h | |||
@@ -62,12 +62,12 @@ GNUNET_NETWORK_STRUCT_BEGIN | |||
62 | 62 | ||
63 | /** | 63 | /** |
64 | * Header from Linux TUN interface. | 64 | * Header from Linux TUN interface. |
65 | */ | 65 | */ |
66 | struct GNUNET_TUN_Layer2PacketHeader | 66 | struct GNUNET_TUN_Layer2PacketHeader |
67 | { | 67 | { |
68 | /** | 68 | /** |
69 | * Some flags (unused). | 69 | * Some flags (unused). |
70 | */ | 70 | */ |
71 | uint16_t flags GNUNET_PACKED; | 71 | uint16_t flags GNUNET_PACKED; |
72 | 72 | ||
73 | /** | 73 | /** |
@@ -97,7 +97,7 @@ struct GNUNET_TUN_IPv4Header | |||
97 | * Length of the packet, including this header. | 97 | * Length of the packet, including this header. |
98 | */ | 98 | */ |
99 | uint16_t total_length GNUNET_PACKED; | 99 | uint16_t total_length GNUNET_PACKED; |
100 | 100 | ||
101 | /** | 101 | /** |
102 | * Unique random ID for matching up fragments. | 102 | * Unique random ID for matching up fragments. |
103 | */ | 103 | */ |
@@ -124,12 +124,12 @@ struct GNUNET_TUN_IPv4Header | |||
124 | 124 | ||
125 | /** | 125 | /** |
126 | * Origin of the packet. | 126 | * Origin of the packet. |
127 | */ | 127 | */ |
128 | struct in_addr source_address GNUNET_PACKED; | 128 | struct in_addr source_address GNUNET_PACKED; |
129 | 129 | ||
130 | /** | 130 | /** |
131 | * Destination of the packet. | 131 | * Destination of the packet. |
132 | */ | 132 | */ |
133 | struct in_addr destination_address GNUNET_PACKED; | 133 | struct in_addr destination_address GNUNET_PACKED; |
134 | } GNUNET_GCC_STRUCT_LAYOUT; | 134 | } GNUNET_GCC_STRUCT_LAYOUT; |
135 | 135 | ||
@@ -168,12 +168,12 @@ struct GNUNET_TUN_IPv6Header | |||
168 | 168 | ||
169 | /** | 169 | /** |
170 | * Origin of the packet. | 170 | * Origin of the packet. |
171 | */ | 171 | */ |
172 | struct in6_addr source_address GNUNET_PACKED; | 172 | struct in6_addr source_address GNUNET_PACKED; |
173 | 173 | ||
174 | /** | 174 | /** |
175 | * Destination of the packet. | 175 | * Destination of the packet. |
176 | */ | 176 | */ |
177 | struct in6_addr destination_address GNUNET_PACKED; | 177 | struct in6_addr destination_address GNUNET_PACKED; |
178 | } GNUNET_GCC_STRUCT_LAYOUT; | 178 | } GNUNET_GCC_STRUCT_LAYOUT; |
179 | 179 | ||
@@ -222,7 +222,7 @@ struct GNUNET_TUN_TcpHeader | |||
222 | unsigned int reserved : 4 GNUNET_PACKED; | 222 | unsigned int reserved : 4 GNUNET_PACKED; |
223 | #else | 223 | #else |
224 | #error byteorder undefined | 224 | #error byteorder undefined |
225 | #endif | 225 | #endif |
226 | 226 | ||
227 | /** | 227 | /** |
228 | * Flags (SYN, FIN, ACK, etc.) | 228 | * Flags (SYN, FIN, ACK, etc.) |
@@ -316,108 +316,108 @@ struct GNUNET_TUN_DnsFlags | |||
316 | /** | 316 | /** |
317 | * Set to 1 if recursion is desired (client -> server) | 317 | * Set to 1 if recursion is desired (client -> server) |
318 | */ | 318 | */ |
319 | unsigned int recursion_desired : 1 GNUNET_PACKED; | 319 | unsigned int recursion_desired : 1 GNUNET_PACKED; |
320 | 320 | ||
321 | /** | 321 | /** |
322 | * Set to 1 if message is truncated | 322 | * Set to 1 if message is truncated |
323 | */ | 323 | */ |
324 | unsigned int message_truncated : 1 GNUNET_PACKED; | 324 | unsigned int message_truncated : 1 GNUNET_PACKED; |
325 | 325 | ||
326 | /** | 326 | /** |
327 | * Set to 1 if this is an authoritative answer | 327 | * Set to 1 if this is an authoritative answer |
328 | */ | 328 | */ |
329 | unsigned int authoritative_answer : 1 GNUNET_PACKED; | 329 | unsigned int authoritative_answer : 1 GNUNET_PACKED; |
330 | 330 | ||
331 | /** | 331 | /** |
332 | * See GNUNET_TUN_DNS_OPCODE_ defines. | 332 | * See GNUNET_TUN_DNS_OPCODE_ defines. |
333 | */ | 333 | */ |
334 | unsigned int opcode : 4 GNUNET_PACKED; | 334 | unsigned int opcode : 4 GNUNET_PACKED; |
335 | 335 | ||
336 | /** | 336 | /** |
337 | * query:0, response:1 | 337 | * query:0, response:1 |
338 | */ | 338 | */ |
339 | unsigned int query_or_response : 1 GNUNET_PACKED; | 339 | unsigned int query_or_response : 1 GNUNET_PACKED; |
340 | 340 | ||
341 | /** | 341 | /** |
342 | * See GNUNET_TUN_DNS_RETURN_CODE_ defines. | 342 | * See GNUNET_TUN_DNS_RETURN_CODE_ defines. |
343 | */ | 343 | */ |
344 | unsigned int return_code : 4 GNUNET_PACKED; | 344 | unsigned int return_code : 4 GNUNET_PACKED; |
345 | 345 | ||
346 | /** | 346 | /** |
347 | * See RFC 4035. | 347 | * See RFC 4035. |
348 | */ | 348 | */ |
349 | unsigned int checking_disabled : 1 GNUNET_PACKED; | 349 | unsigned int checking_disabled : 1 GNUNET_PACKED; |
350 | 350 | ||
351 | /** | 351 | /** |
352 | * Response has been cryptographically verified, RFC 4035. | 352 | * Response has been cryptographically verified, RFC 4035. |
353 | */ | 353 | */ |
354 | unsigned int authenticated_data : 1 GNUNET_PACKED; | 354 | unsigned int authenticated_data : 1 GNUNET_PACKED; |
355 | 355 | ||
356 | /** | 356 | /** |
357 | * Always zero. | 357 | * Always zero. |
358 | */ | 358 | */ |
359 | unsigned int zero : 1 GNUNET_PACKED; | 359 | unsigned int zero : 1 GNUNET_PACKED; |
360 | 360 | ||
361 | /** | 361 | /** |
362 | * Set to 1 if recursion is available (server -> client) | 362 | * Set to 1 if recursion is available (server -> client) |
363 | */ | 363 | */ |
364 | unsigned int recursion_available : 1 GNUNET_PACKED; | 364 | unsigned int recursion_available : 1 GNUNET_PACKED; |
365 | #elif __BYTE_ORDER == __BIG_ENDIAN | 365 | #elif __BYTE_ORDER == __BIG_ENDIAN |
366 | 366 | ||
367 | /** | 367 | /** |
368 | * query:0, response:1 | 368 | * query:0, response:1 |
369 | */ | 369 | */ |
370 | unsigned int query_or_response : 1 GNUNET_PACKED; | 370 | unsigned int query_or_response : 1 GNUNET_PACKED; |
371 | 371 | ||
372 | /** | 372 | /** |
373 | * See GNUNET_TUN_DNS_OPCODE_ defines. | 373 | * See GNUNET_TUN_DNS_OPCODE_ defines. |
374 | */ | 374 | */ |
375 | unsigned int opcode : 4 GNUNET_PACKED; | 375 | unsigned int opcode : 4 GNUNET_PACKED; |
376 | 376 | ||
377 | /** | 377 | /** |
378 | * Set to 1 if this is an authoritative answer | 378 | * Set to 1 if this is an authoritative answer |
379 | */ | 379 | */ |
380 | unsigned int authoritative_answer : 1 GNUNET_PACKED; | 380 | unsigned int authoritative_answer : 1 GNUNET_PACKED; |
381 | 381 | ||
382 | /** | 382 | /** |
383 | * Set to 1 if message is truncated | 383 | * Set to 1 if message is truncated |
384 | */ | 384 | */ |
385 | unsigned int message_truncated : 1 GNUNET_PACKED; | 385 | unsigned int message_truncated : 1 GNUNET_PACKED; |
386 | 386 | ||
387 | /** | 387 | /** |
388 | * Set to 1 if recursion is desired (client -> server) | 388 | * Set to 1 if recursion is desired (client -> server) |
389 | */ | 389 | */ |
390 | unsigned int recursion_desired : 1 GNUNET_PACKED; | 390 | unsigned int recursion_desired : 1 GNUNET_PACKED; |
391 | |||
391 | 392 | ||
392 | |||
393 | /** | 393 | /** |
394 | * Set to 1 if recursion is available (server -> client) | 394 | * Set to 1 if recursion is available (server -> client) |
395 | */ | 395 | */ |
396 | unsigned int recursion_available : 1 GNUNET_PACKED; | 396 | unsigned int recursion_available : 1 GNUNET_PACKED; |
397 | 397 | ||
398 | /** | 398 | /** |
399 | * Always zero. | 399 | * Always zero. |
400 | */ | 400 | */ |
401 | unsigned int zero : 1 GNUNET_PACKED; | 401 | unsigned int zero : 1 GNUNET_PACKED; |
402 | 402 | ||
403 | /** | 403 | /** |
404 | * Response has been cryptographically verified, RFC 4035. | 404 | * Response has been cryptographically verified, RFC 4035. |
405 | */ | 405 | */ |
406 | unsigned int authenticated_data : 1 GNUNET_PACKED; | 406 | unsigned int authenticated_data : 1 GNUNET_PACKED; |
407 | 407 | ||
408 | /** | 408 | /** |
409 | * See RFC 4035. | 409 | * See RFC 4035. |
410 | */ | 410 | */ |
411 | unsigned int checking_disabled : 1 GNUNET_PACKED; | 411 | unsigned int checking_disabled : 1 GNUNET_PACKED; |
412 | 412 | ||
413 | /** | 413 | /** |
414 | * See GNUNET_TUN_DNS_RETURN_CODE_ defines. | 414 | * See GNUNET_TUN_DNS_RETURN_CODE_ defines. |
415 | */ | 415 | */ |
416 | unsigned int return_code : 4 GNUNET_PACKED; | 416 | unsigned int return_code : 4 GNUNET_PACKED; |
417 | #else | 417 | #else |
418 | #error byteorder undefined | 418 | #error byteorder undefined |
419 | #endif | 419 | #endif |
420 | 420 | ||
421 | } GNUNET_GCC_STRUCT_LAYOUT; | 421 | } GNUNET_GCC_STRUCT_LAYOUT; |
422 | 422 | ||
423 | 423 | ||
@@ -468,18 +468,18 @@ struct GNUNET_TUN_DnsSoaRecord | |||
468 | * The version number of the original copy of the zone. (NBO) | 468 | * The version number of the original copy of the zone. (NBO) |
469 | */ | 469 | */ |
470 | uint32_t serial GNUNET_PACKED; | 470 | uint32_t serial GNUNET_PACKED; |
471 | 471 | ||
472 | /** | 472 | /** |
473 | * Time interval before the zone should be refreshed. (NBO) | 473 | * Time interval before the zone should be refreshed. (NBO) |
474 | */ | 474 | */ |
475 | uint32_t refresh GNUNET_PACKED; | 475 | uint32_t refresh GNUNET_PACKED; |
476 | 476 | ||
477 | /** | 477 | /** |
478 | * Time interval that should elapse before a failed refresh should | 478 | * Time interval that should elapse before a failed refresh should |
479 | * be retried. (NBO) | 479 | * be retried. (NBO) |
480 | */ | 480 | */ |
481 | uint32_t retry GNUNET_PACKED; | 481 | uint32_t retry GNUNET_PACKED; |
482 | 482 | ||
483 | /** | 483 | /** |
484 | * Time value that specifies the upper limit on the time interval | 484 | * Time value that specifies the upper limit on the time interval |
485 | * that can elapse before the zone is no longer authoritative. (NBO) | 485 | * that can elapse before the zone is no longer authoritative. (NBO) |
@@ -654,12 +654,12 @@ struct GNUNET_TUN_DnsRecordLine | |||
654 | */ | 654 | */ |
655 | struct GNUNET_TUN_IcmpHeader { | 655 | struct GNUNET_TUN_IcmpHeader { |
656 | uint8_t type; | 656 | uint8_t type; |
657 | uint8_t code; | 657 | uint8_t code; |
658 | uint16_t crc GNUNET_PACKED; | 658 | uint16_t crc GNUNET_PACKED; |
659 | 659 | ||
660 | union { | 660 | union { |
661 | /** | 661 | /** |
662 | * ICMP Echo (request/reply) | 662 | * ICMP Echo (request/reply) |
663 | */ | 663 | */ |
664 | struct { | 664 | struct { |
665 | uint16_t identifier GNUNET_PACKED; | 665 | uint16_t identifier GNUNET_PACKED; |
@@ -667,7 +667,7 @@ struct GNUNET_TUN_IcmpHeader { | |||
667 | } echo; | 667 | } echo; |
668 | 668 | ||
669 | /** | 669 | /** |
670 | * ICMP Destination Unreachable (RFC 1191) | 670 | * ICMP Destination Unreachable (RFC 1191) |
671 | */ | 671 | */ |
672 | struct ih_pmtu { | 672 | struct ih_pmtu { |
673 | uint16_t empty GNUNET_PACKED; | 673 | uint16_t empty GNUNET_PACKED; |
@@ -676,7 +676,7 @@ struct GNUNET_TUN_IcmpHeader { | |||
676 | } destination_unreachable; | 676 | } destination_unreachable; |
677 | 677 | ||
678 | /** | 678 | /** |
679 | * ICMP Redirect | 679 | * ICMP Redirect |
680 | */ | 680 | */ |
681 | struct in_addr redirect_gateway_address GNUNET_PACKED; | 681 | struct in_addr redirect_gateway_address GNUNET_PACKED; |
682 | 682 | ||
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h index fe21cff9b..c3f27fdce 100644 --- a/src/include/gnunet_vpn_service.h +++ b/src/include/gnunet_vpn_service.h | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file include/gnunet_vpn_service.h | 22 | * @file include/gnunet_vpn_service.h |
23 | * @brief API to access the VPN service. | 23 | * @brief API to access the VPN service. |
24 | * @author Christian Grothoff | 24 | * @author Christian Grothoff |
25 | */ | 25 | */ |
26 | #ifndef GNUNET_VPN_SERVICE_H | 26 | #ifndef GNUNET_VPN_SERVICE_H |
@@ -50,7 +50,7 @@ struct GNUNET_VPN_RedirectionRequest; | |||
50 | * will match 'result_af' from the request | 50 | * will match 'result_af' from the request |
51 | * @param address IP address (struct in_addr or struct in_addr6, depending on 'af') | 51 | * @param address IP address (struct in_addr or struct in_addr6, depending on 'af') |
52 | * that the VPN allocated for the redirection; | 52 | * that the VPN allocated for the redirection; |
53 | * traffic to this IP will now be redirected to the | 53 | * traffic to this IP will now be redirected to the |
54 | * specified target peer; NULL on error | 54 | * specified target peer; NULL on error |
55 | */ | 55 | */ |
56 | typedef void (*GNUNET_VPN_AllocationCallback)(void *cls, | 56 | typedef void (*GNUNET_VPN_AllocationCallback)(void *cls, |
@@ -124,7 +124,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh, | |||
124 | * anyway) | 124 | * anyway) |
125 | */ | 125 | */ |
126 | struct GNUNET_VPN_RedirectionRequest * | 126 | struct GNUNET_VPN_RedirectionRequest * |
127 | GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh, | 127 | GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh, |
128 | int result_af, | 128 | int result_af, |
129 | int addr_af, | 129 | int addr_af, |
130 | const void *addr, | 130 | const void *addr, |
@@ -137,7 +137,7 @@ GNUNET_VPN_redirect_to_ip (struct GNUNET_VPN_Handle *vh, | |||
137 | * Connect to the VPN service | 137 | * Connect to the VPN service |
138 | * | 138 | * |
139 | * @param cfg configuration to use | 139 | * @param cfg configuration to use |
140 | * @return VPN handle | 140 | * @return VPN handle |
141 | */ | 141 | */ |
142 | struct GNUNET_VPN_Handle * | 142 | struct GNUNET_VPN_Handle * |
143 | GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | 143 | GNUNET_VPN_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); |
diff --git a/src/include/tap-windows.h b/src/include/tap-windows.h index b97e22e26..4df4034a3 100644 --- a/src/include/tap-windows.h +++ b/src/include/tap-windows.h | |||
@@ -1,80 +1,80 @@ | |||
1 | /* | 1 | /* |
2 | * TAP-Windows -- A kernel driver to provide virtual tap | 2 | * TAP-Windows -- A kernel driver to provide virtual tap |
3 | * device functionality on Windows. | 3 | * device functionality on Windows. |
4 | * | 4 | * |
5 | * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. | 5 | * This code was inspired by the CIPE-Win32 driver by Damion K. Wilson. |
6 | * | 6 | * |
7 | * This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc., | 7 | * This source code is Copyright (C) 2002-2010 OpenVPN Technologies, Inc., |
8 | * and is released under the GPL version 2 (see below). | 8 | * and is released under the GPL version 2 (see below). |
9 | * | 9 | * |
10 | * This program is free software; you can redistribute it and/or modify | 10 | * This program is free software; you can redistribute it and/or modify |
11 | * it under the terms of the GNU General Public License version 2 | 11 | * it under the terms of the GNU General Public License version 2 |
12 | * as published by the Free Software Foundation. | 12 | * as published by the Free Software Foundation. |
13 | * | 13 | * |
14 | * This program is distributed in the hope that it will be useful, | 14 | * This program is distributed in the hope that it will be useful, |
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
17 | * GNU General Public License for more details. | 17 | * GNU General Public License for more details. |
18 | * | 18 | * |
19 | * You should have received a copy of the GNU General Public License | 19 | * You should have received a copy of the GNU General Public License |
20 | * along with this program (see the file COPYING included with this | 20 | * along with this program (see the file COPYING included with this |
21 | * distribution); if not, write to the Free Software Foundation, Inc., | 21 | * distribution); if not, write to the Free Software Foundation, Inc., |
22 | * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 22 | * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
23 | */ | 23 | */ |
24 | /** | 24 | /** |
25 | * @file include/tap-windows.h | 25 | * @file include/tap-windows.h |
26 | * @brief TAP32 virtual network driver defines | 26 | * @brief TAP32 virtual network driver defines |
27 | * @attention This file is part of openvpn and for kept | 27 | * @attention This file is part of openvpn and for kept |
28 | * as a separate file to allow easier upgrading. | 28 | * as a separate file to allow easier upgrading. |
29 | */ | 29 | */ |
30 | #ifndef __TAP_WIN_H | 30 | #ifndef __TAP_WIN_H |
31 | #define __TAP_WIN_H | 31 | #define __TAP_WIN_H |
32 | 32 | ||
33 | /* | 33 | /* |
34 | * ============= | 34 | * ============= |
35 | * TAP IOCTLs | 35 | * TAP IOCTLs |
36 | * ============= | 36 | * ============= |
37 | */ | 37 | */ |
38 | 38 | ||
39 | #define TAP_WIN_CONTROL_CODE(request,method) \ | 39 | #define TAP_WIN_CONTROL_CODE(request,method) \ |
40 | CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS) | 40 | CTL_CODE (FILE_DEVICE_UNKNOWN, request, method, FILE_ANY_ACCESS) |
41 | 41 | ||
42 | /* Present in 8.1 */ | 42 | /* Present in 8.1 */ |
43 | 43 | ||
44 | #define TAP_WIN_IOCTL_GET_MAC TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED) | 44 | #define TAP_WIN_IOCTL_GET_MAC TAP_WIN_CONTROL_CODE (1, METHOD_BUFFERED) |
45 | #define TAP_WIN_IOCTL_GET_VERSION TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED) | 45 | #define TAP_WIN_IOCTL_GET_VERSION TAP_WIN_CONTROL_CODE (2, METHOD_BUFFERED) |
46 | #define TAP_WIN_IOCTL_GET_MTU TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED) | 46 | #define TAP_WIN_IOCTL_GET_MTU TAP_WIN_CONTROL_CODE (3, METHOD_BUFFERED) |
47 | #define TAP_WIN_IOCTL_GET_INFO TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED) | 47 | #define TAP_WIN_IOCTL_GET_INFO TAP_WIN_CONTROL_CODE (4, METHOD_BUFFERED) |
48 | #define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED) | 48 | #define TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT TAP_WIN_CONTROL_CODE (5, METHOD_BUFFERED) |
49 | #define TAP_WIN_IOCTL_SET_MEDIA_STATUS TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED) | 49 | #define TAP_WIN_IOCTL_SET_MEDIA_STATUS TAP_WIN_CONTROL_CODE (6, METHOD_BUFFERED) |
50 | #define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED) | 50 | #define TAP_WIN_IOCTL_CONFIG_DHCP_MASQ TAP_WIN_CONTROL_CODE (7, METHOD_BUFFERED) |
51 | #define TAP_WIN_IOCTL_GET_LOG_LINE TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED) | 51 | #define TAP_WIN_IOCTL_GET_LOG_LINE TAP_WIN_CONTROL_CODE (8, METHOD_BUFFERED) |
52 | #define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED) | 52 | #define TAP_WIN_IOCTL_CONFIG_DHCP_SET_OPT TAP_WIN_CONTROL_CODE (9, METHOD_BUFFERED) |
53 | 53 | ||
54 | /* Added in 8.2 */ | 54 | /* Added in 8.2 */ |
55 | 55 | ||
56 | /* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */ | 56 | /* obsoletes TAP_WIN_IOCTL_CONFIG_POINT_TO_POINT */ |
57 | #define TAP_WIN_IOCTL_CONFIG_TUN TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED) | 57 | #define TAP_WIN_IOCTL_CONFIG_TUN TAP_WIN_CONTROL_CODE (10, METHOD_BUFFERED) |
58 | 58 | ||
59 | /* | 59 | /* |
60 | * ================= | 60 | * ================= |
61 | * Registry keys | 61 | * Registry keys |
62 | * ================= | 62 | * ================= |
63 | */ | 63 | */ |
64 | 64 | ||
65 | #define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}" | 65 | #define ADAPTER_KEY "SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}" |
66 | 66 | ||
67 | #define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}" | 67 | #define NETWORK_CONNECTIONS_KEY "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}" |
68 | 68 | ||
69 | /* | 69 | /* |
70 | * ====================== | 70 | * ====================== |
71 | * Filesystem prefixes | 71 | * Filesystem prefixes |
72 | * ====================== | 72 | * ====================== |
73 | */ | 73 | */ |
74 | 74 | ||
75 | #define USERMODEDEVICEDIR "\\\\.\\Global\\" | 75 | #define USERMODEDEVICEDIR "\\\\.\\Global\\" |
76 | #define SYSDEVICEDIR "\\Device\\" | 76 | #define SYSDEVICEDIR "\\Device\\" |
77 | #define USERDEVICEDIR "\\DosDevices\\Global\\" | 77 | #define USERDEVICEDIR "\\DosDevices\\Global\\" |
78 | #define TAP_WIN_SUFFIX ".tap" | 78 | #define TAP_WIN_SUFFIX ".tap" |
79 | 79 | ||
80 | #endif | 80 | #endif |