diff options
-rw-r--r-- | src/consensus/consensus_api.c | 2 | ||||
-rw-r--r-- | src/conversation/conversation_api_call.c | 4 | ||||
-rw-r--r-- | src/include/gnunet_mq_lib.h | 24 | ||||
-rw-r--r-- | src/include/gnunet_peerstore_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_secretsharing_service.h | 16 | ||||
-rw-r--r-- | src/namestore/test_plugin_namestore_flat.conf | 2 |
6 files changed, 26 insertions, 24 deletions
diff --git a/src/consensus/consensus_api.c b/src/consensus/consensus_api.c index 2a634bdd2..16096c28c 100644 --- a/src/consensus/consensus_api.c +++ b/src/consensus/consensus_api.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of GNUnet. | 2 | This file is part of GNUnet. |
3 | Copyright (C) 2012 GNUnet e.V. | 3 | Copyright (C) 2012, 2016 GNUnet e.V. |
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 |
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 51b07b7c8..4813faffd 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c | |||
@@ -547,8 +547,6 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
547 | GNUNET_CONVERSATION_CallEventHandler event_handler, | 547 | GNUNET_CONVERSATION_CallEventHandler event_handler, |
548 | void *event_handler_cls) | 548 | void *event_handler_cls) |
549 | { | 549 | { |
550 | struct GNUNET_CONVERSATION_Call *call | ||
551 | = GNUNET_new (struct GNUNET_CONVERSATION_Call); | ||
552 | GNUNET_MQ_hd_fixed_size (call_suspend, | 550 | GNUNET_MQ_hd_fixed_size (call_suspend, |
553 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, | 551 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND, |
554 | struct ClientPhoneSuspendMessage); | 552 | struct ClientPhoneSuspendMessage); |
@@ -564,6 +562,8 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
564 | GNUNET_MQ_hd_var_size (call_audio, | 562 | GNUNET_MQ_hd_var_size (call_audio, |
565 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, | 563 | GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO, |
566 | struct ClientAudioMessage); | 564 | struct ClientAudioMessage); |
565 | struct GNUNET_CONVERSATION_Call *call | ||
566 | = GNUNET_new (struct GNUNET_CONVERSATION_Call); | ||
567 | struct GNUNET_MQ_MessageHandler handlers[] = { | 567 | struct GNUNET_MQ_MessageHandler handlers[] = { |
568 | make_call_suspend_handler (call), | 568 | make_call_suspend_handler (call), |
569 | make_call_resume_handler (call), | 569 | make_call_resume_handler (call), |
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h index 38ebf6b17..4630fa35a 100644 --- a/src/include/gnunet_mq_lib.h +++ b/src/include/gnunet_mq_lib.h | |||
@@ -268,12 +268,12 @@ struct GNUNET_MQ_MessageHandler | |||
268 | /** | 268 | /** |
269 | * Callback to validate a message of the specified @e type. | 269 | * Callback to validate a message of the specified @e type. |
270 | * The closure given to @e mv will be this struct (not @e ctx). | 270 | * The closure given to @e mv will be this struct (not @e ctx). |
271 | * Using NULL means only size-validation using | 271 | * Using NULL means only size-validation using |
272 | * @e expected_size. In this case, @e expected_size must | 272 | * @e expected_size. In this case, @e expected_size must |
273 | * be non-zero. | 273 | * be non-zero. |
274 | */ | 274 | */ |
275 | GNUNET_MQ_MessageValidationCallback mv; | 275 | GNUNET_MQ_MessageValidationCallback mv; |
276 | 276 | ||
277 | /** | 277 | /** |
278 | * Callback, called every time a new message of | 278 | * Callback, called every time a new message of |
279 | * the specified @e type has been receied. | 279 | * the specified @e type has been receied. |
@@ -285,7 +285,7 @@ struct GNUNET_MQ_MessageHandler | |||
285 | * Closure for @e mv and @e cb. | 285 | * Closure for @e mv and @e cb. |
286 | */ | 286 | */ |
287 | void *cls; | 287 | void *cls; |
288 | 288 | ||
289 | /** | 289 | /** |
290 | * Type of the message this handler covers, in host byte order. | 290 | * Type of the message this handler covers, in host byte order. |
291 | */ | 291 | */ |
@@ -317,14 +317,14 @@ struct GNUNET_MQ_MessageHandler | |||
317 | * The macro is to be used as follows: | 317 | * The macro is to be used as follows: |
318 | * <code> | 318 | * <code> |
319 | * struct GNUNET_MessageTest { ... }; // must be fixed size | 319 | * struct GNUNET_MessageTest { ... }; // must be fixed size |
320 | * GNUNET_MQ_hd_fixed_size(test_message, | ||
321 | * GNUNET_MESSAGE_TYPE_TEST, | ||
322 | * struct GNUNET_MessageTest); | ||
323 | * static void | 320 | * static void |
324 | * handle_test_message (void *cls, // the struct GNUNET_MQ_MessageHandler | 321 | * handle_test_message (void *cls, |
325 | * const struct GNUNET_MessageTest *msg) | 322 | * const struct GNUNET_MessageTest *msg) |
326 | * { ... } | 323 | * { ... } |
327 | * | 324 | * |
325 | * GNUNET_MQ_hd_fixed_size(test_message, | ||
326 | * GNUNET_MESSAGE_TYPE_TEST, | ||
327 | * struct GNUNET_MessageTest); | ||
328 | * struct GNUNET_MQ_MessageHandler handlers[] = { | 328 | * struct GNUNET_MQ_MessageHandler handlers[] = { |
329 | * make_test_message_handler (), | 329 | * make_test_message_handler (), |
330 | * GNUNET_MQ_handler_end() | 330 | * GNUNET_MQ_handler_end() |
@@ -355,8 +355,8 @@ struct GNUNET_MQ_MessageHandler | |||
355 | * The macro is to be used as follows: | 355 | * The macro is to be used as follows: |
356 | * <code> | 356 | * <code> |
357 | * struct GNUNET_MessageTest { ... }; // can be variable size | 357 | * struct GNUNET_MessageTest { ... }; // can be variable size |
358 | * GNUNET_MQ_hd_var_size(test_message, | 358 | * GNUNET_MQ_hd_var_size(test_message, |
359 | * GNUNET_MESSAGE_TYPE_TEST, | 359 | * GNUNET_MESSAGE_TYPE_TEST, |
360 | * struct GNUNET_MessageTest); | 360 | * struct GNUNET_MessageTest); |
361 | * static int | 361 | * static int |
362 | * check_test (void *cls, | 362 | * check_test (void *cls, |
@@ -373,8 +373,8 @@ struct GNUNET_MQ_MessageHandler | |||
373 | * const char *ctx = cls; | 373 | * const char *ctx = cls; |
374 | * GNUNET_assert (0 == strcmp ("context", ctx)); | 374 | * GNUNET_assert (0 == strcmp ("context", ctx)); |
375 | * // ... | 375 | * // ... |
376 | * } | 376 | * } |
377 | * | 377 | * |
378 | * struct GNUNET_MQ_MessageHandler handlers[] = { | 378 | * struct GNUNET_MQ_MessageHandler handlers[] = { |
379 | * make_test_message_handler ("context"), | 379 | * make_test_message_handler ("context"), |
380 | * GNUNET_MQ_handler_end() | 380 | * GNUNET_MQ_handler_end() |
diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h index 97d3a3828..202e0fd1a 100644 --- a/src/include/gnunet_peerstore_service.h +++ b/src/include/gnunet_peerstore_service.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #define GNUNET_PEERSTORE_SERVICE_H | 34 | #define GNUNET_PEERSTORE_SERVICE_H |
35 | 35 | ||
36 | #include "gnunet_util_lib.h" | 36 | #include "gnunet_util_lib.h" |
37 | #include "gnunet_common.h" | ||
38 | 37 | ||
39 | #ifdef __cplusplus | 38 | #ifdef __cplusplus |
40 | extern "C" | 39 | extern "C" |
@@ -139,6 +138,7 @@ typedef void | |||
139 | const struct GNUNET_PEERSTORE_Record *record, | 138 | const struct GNUNET_PEERSTORE_Record *record, |
140 | const char *emsg); | 139 | const char *emsg); |
141 | 140 | ||
141 | |||
142 | /** | 142 | /** |
143 | * Connect to the PEERSTORE service. | 143 | * Connect to the PEERSTORE service. |
144 | * | 144 | * |
diff --git a/src/include/gnunet_secretsharing_service.h b/src/include/gnunet_secretsharing_service.h index 047120e27..f77fd33d2 100644 --- a/src/include/gnunet_secretsharing_service.h +++ b/src/include/gnunet_secretsharing_service.h | |||
@@ -168,11 +168,12 @@ struct GNUNET_SECRETSHARING_Plaintext | |||
168 | * @param ready_peers peers that successfuly participated in establishing | 168 | * @param ready_peers peers that successfuly participated in establishing |
169 | * the shared secret | 169 | * the shared secret |
170 | */ | 170 | */ |
171 | typedef void (*GNUNET_SECRETSHARING_SecretReadyCallback) (void *cls, | 171 | typedef void |
172 | struct GNUNET_SECRETSHARING_Share *my_share, | 172 | (*GNUNET_SECRETSHARING_SecretReadyCallback) (void *cls, |
173 | struct GNUNET_SECRETSHARING_PublicKey *public_key, | 173 | struct GNUNET_SECRETSHARING_Share *my_share, |
174 | unsigned int num_ready_peers, | 174 | struct GNUNET_SECRETSHARING_PublicKey *public_key, |
175 | struct GNUNET_PeerIdentity *ready_peers); | 175 | unsigned int num_ready_peers, |
176 | const struct GNUNET_PeerIdentity *ready_peers); | ||
176 | 177 | ||
177 | 178 | ||
178 | /** | 179 | /** |
@@ -182,8 +183,9 @@ typedef void (*GNUNET_SECRETSHARING_SecretReadyCallback) (void *cls, | |||
182 | * @param data decrypted value | 183 | * @param data decrypted value |
183 | * @param data_size number of bytes in @a data | 184 | * @param data_size number of bytes in @a data |
184 | */ | 185 | */ |
185 | typedef void (*GNUNET_SECRETSHARING_DecryptCallback) (void *cls, | 186 | typedef void |
186 | const struct GNUNET_SECRETSHARING_Plaintext *plaintext); | 187 | (*GNUNET_SECRETSHARING_DecryptCallback) (void *cls, |
188 | const struct GNUNET_SECRETSHARING_Plaintext *plaintext); | ||
187 | 189 | ||
188 | 190 | ||
189 | /** | 191 | /** |
diff --git a/src/namestore/test_plugin_namestore_flat.conf b/src/namestore/test_plugin_namestore_flat.conf index 1c78093c1..3639ce33e 100644 --- a/src/namestore/test_plugin_namestore_flat.conf +++ b/src/namestore/test_plugin_namestore_flat.conf | |||
@@ -2,4 +2,4 @@ | |||
2 | FILENAME = /tmp/gnunet-test-plugin-namestore-sqlite/flatdb | 2 | FILENAME = /tmp/gnunet-test-plugin-namestore-sqlite/flatdb |
3 | 3 | ||
4 | [namestore] | 4 | [namestore] |
5 | PREFIX = valgrind --log-file=/home/schanzen/dev/gnunet/src/namestore/vg_log | 5 | # PREFIX = valgrind --log-file=/home/schanzen/dev/gnunet/src/namestore/vg_log |