diff options
author | xrs <xrs@mail36.net> | 2017-02-28 19:37:43 +0100 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2017-02-28 19:37:43 +0100 |
commit | f82b3a27df765f4a31548ae4efe66dc3dbc42cef (patch) | |
tree | 5a08cd0026d2b85bca3160b6ca40573c871c8635 /src/multicast/test_multicast_multipeer.c | |
parent | b0042448a40e90426ea8013b1abba8b2ecb69c2b (diff) | |
parent | a9a6b98c54f5cc3e680c8ea2f9c69e3955e2a7da (diff) | |
download | gnunet-f82b3a27df765f4a31548ae4efe66dc3dbc42cef.tar.gz gnunet-f82b3a27df765f4a31548ae4efe66dc3dbc42cef.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Conflicts:
src/multicast/test_multicast_multipeer.c
Diffstat (limited to 'src/multicast/test_multicast_multipeer.c')
-rw-r--r-- | src/multicast/test_multicast_multipeer.c | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index aee3a44d5..0f973517d 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c | |||
@@ -35,7 +35,7 @@ | |||
35 | 35 | ||
36 | #define NUM_PEERS 2 | 36 | #define NUM_PEERS 2 |
37 | 37 | ||
38 | static struct GNUNET_TESTBED_Operation *op0; | 38 | static struct GNUNET_TESTBED_Operation *op0; |
39 | static struct GNUNET_TESTBED_Operation *op1; | 39 | static struct GNUNET_TESTBED_Operation *op1; |
40 | static struct GNUNET_TESTBED_Operation *pi_op0; | 40 | static struct GNUNET_TESTBED_Operation *pi_op0; |
41 | static struct GNUNET_TESTBED_Operation *pi_op1; | 41 | static struct GNUNET_TESTBED_Operation *pi_op1; |
@@ -114,15 +114,15 @@ timeout_task (void *cls) | |||
114 | } | 114 | } |
115 | 115 | ||
116 | 116 | ||
117 | static void | 117 | static void |
118 | member_join_request (void *cls, | 118 | member_join_request (void *cls, |
119 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, | 119 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, |
120 | const struct GNUNET_MessageHeader *join_msg, | 120 | const struct GNUNET_MessageHeader *join_msg, |
121 | struct GNUNET_MULTICAST_JoinHandle *jh) | 121 | struct GNUNET_MULTICAST_JoinHandle *jh) |
122 | { | 122 | { |
123 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 123 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
124 | "Member sent a join request.\n"); | 124 | "Member sent a join request.\n"); |
125 | 125 | ||
126 | } | 126 | } |
127 | 127 | ||
128 | int notify (void *cls, | 128 | int notify (void *cls, |
@@ -143,7 +143,7 @@ int notify (void *cls, | |||
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | ||
146 | static void | 146 | static void |
147 | member_join_decision (void *cls, | 147 | member_join_decision (void *cls, |
148 | int is_admitted, | 148 | int is_admitted, |
149 | const struct GNUNET_PeerIdentity *peer, | 149 | const struct GNUNET_PeerIdentity *peer, |
@@ -165,32 +165,32 @@ member_join_decision (void *cls, | |||
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||
168 | static void | 168 | static void |
169 | member_replay_frag () | 169 | member_replay_frag () |
170 | { | 170 | { |
171 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 171 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
172 | "member replay frag...\n"); | 172 | "member replay frag...\n"); |
173 | } | 173 | } |
174 | 174 | ||
175 | static void | 175 | static void |
176 | member_replay_msg () | 176 | member_replay_msg () |
177 | { | 177 | { |
178 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 178 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
179 | "member replay msg...\n"); | 179 | "member replay msg...\n"); |
180 | } | 180 | } |
181 | 181 | ||
182 | static void | 182 | static void |
183 | member_message () | 183 | member_message () |
184 | { | 184 | { |
185 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 185 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
186 | "member message...\n"); | 186 | "member message...\n"); |
187 | } | 187 | } |
188 | 188 | ||
189 | static void | 189 | static void |
190 | origin_join_request (void *cls, | 190 | origin_join_request (void *cls, |
191 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, | 191 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, |
192 | const struct GNUNET_MessageHeader *join_msg, | 192 | const struct GNUNET_MessageHeader *join_msg, |
193 | struct GNUNET_MULTICAST_JoinHandle *jh) | 193 | struct GNUNET_MULTICAST_JoinHandle *jh) |
194 | { | 194 | { |
195 | struct GNUNET_MessageHeader *join_resp; | 195 | struct GNUNET_MessageHeader *join_resp; |
196 | 196 | ||
@@ -217,7 +217,7 @@ origin_join_request (void *cls, | |||
217 | result = GNUNET_OK; | 217 | result = GNUNET_OK; |
218 | } | 218 | } |
219 | 219 | ||
220 | static void | 220 | static void |
221 | origin_replay_frag (void *cls, | 221 | origin_replay_frag (void *cls, |
222 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, | 222 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, |
223 | uint64_t fragment_id, | 223 | uint64_t fragment_id, |
@@ -227,7 +227,7 @@ origin_replay_frag (void *cls, | |||
227 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay fraq msg\n"); | 227 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay fraq msg\n"); |
228 | } | 228 | } |
229 | 229 | ||
230 | static void | 230 | static void |
231 | origin_replay_msg (void *cls, | 231 | origin_replay_msg (void *cls, |
232 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, | 232 | const struct GNUNET_CRYPTO_EcdsaPublicKey *member_pub_key, |
233 | uint64_t message_id, | 233 | uint64_t message_id, |
@@ -235,7 +235,7 @@ origin_replay_msg (void *cls, | |||
235 | uint64_t flags, | 235 | uint64_t flags, |
236 | struct GNUNET_MULTICAST_ReplayHandle *rh) | 236 | struct GNUNET_MULTICAST_ReplayHandle *rh) |
237 | { | 237 | { |
238 | 238 | ||
239 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n"); | 239 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n"); |
240 | } | 240 | } |
241 | 241 | ||
@@ -267,11 +267,11 @@ service_connect1 (void *cls, | |||
267 | void *ca_result, | 267 | void *ca_result, |
268 | const char *emsg) | 268 | const char *emsg) |
269 | { | 269 | { |
270 | member = ca_result; | 270 | member = ca_result; |
271 | 271 | ||
272 | if (NULL != member) | 272 | if (NULL != member) |
273 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to multicast service of member\n"); | 273 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to multicast service of member\n"); |
274 | else | 274 | else |
275 | result = GNUNET_SYSERR; | 275 | result = GNUNET_SYSERR; |
276 | } | 276 | } |
277 | 277 | ||
@@ -291,7 +291,7 @@ multicast_ca1 (void *cls, | |||
291 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 291 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
292 | { | 292 | { |
293 | struct GNUNET_MessageHeader *join_msg; | 293 | struct GNUNET_MessageHeader *join_msg; |
294 | 294 | ||
295 | // Get members keys | 295 | // Get members keys |
296 | member_key = GNUNET_CRYPTO_ecdsa_key_create (); | 296 | member_key = GNUNET_CRYPTO_ecdsa_key_create (); |
297 | GNUNET_CRYPTO_ecdsa_key_get_public (member_key, &member_pub_key); | 297 | GNUNET_CRYPTO_ecdsa_key_get_public (member_key, &member_pub_key); |
@@ -302,10 +302,10 @@ multicast_ca1 (void *cls, | |||
302 | join_msg->size = htons (sizeof (join_msg) + data_size); | 302 | join_msg->size = htons (sizeof (join_msg) + data_size); |
303 | join_msg->type = htons (123); | 303 | join_msg->type = htons (123); |
304 | GNUNET_memcpy (&join_msg[1], data, data_size); | 304 | GNUNET_memcpy (&join_msg[1], data, data_size); |
305 | 305 | ||
306 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 306 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
307 | "Members tries to join multicast group\n"); | 307 | "Members tries to join multicast group\n"); |
308 | 308 | ||
309 | return GNUNET_MULTICAST_member_join (cfg, | 309 | return GNUNET_MULTICAST_member_join (cfg, |
310 | &group_pub_key, | 310 | &group_pub_key, |
311 | member_key, | 311 | member_key, |
@@ -328,13 +328,13 @@ peer_information_cb (void *cls, | |||
328 | const struct GNUNET_TESTBED_PeerInformation *pinfo, | 328 | const struct GNUNET_TESTBED_PeerInformation *pinfo, |
329 | const char *emsg) | 329 | const char *emsg) |
330 | { | 330 | { |
331 | int i = (int) cls; | 331 | int i = (int) (long) cls; |
332 | 332 | ||
333 | if (NULL == pinfo) { | 333 | if (NULL == pinfo) { |
334 | result = GNUNET_SYSERR; | 334 | result = GNUNET_SYSERR; |
335 | GNUNET_SCHEDULER_shutdown (); | 335 | GNUNET_SCHEDULER_shutdown (); |
336 | } | 336 | } |
337 | 337 | ||
338 | peer_id[i] = pinfo->result.id; | 338 | peer_id[i] = pinfo->result.id; |
339 | 339 | ||
340 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 340 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
@@ -403,13 +403,13 @@ service_connect0 (void *cls, | |||
403 | * Function run when service multicast has started and is providing us | 403 | * Function run when service multicast has started and is providing us |
404 | * with a configuration file. | 404 | * with a configuration file. |
405 | */ | 405 | */ |
406 | static void * | 406 | static void * |
407 | multicast_ca0 (void *cls, | 407 | multicast_ca0 (void *cls, |
408 | const struct GNUNET_CONFIGURATION_Handle *cfg) | 408 | const struct GNUNET_CONFIGURATION_Handle *cfg) |
409 | { | 409 | { |
410 | group_key = GNUNET_CRYPTO_eddsa_key_create (); | 410 | group_key = GNUNET_CRYPTO_eddsa_key_create (); |
411 | GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key); | 411 | GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key); |
412 | 412 | ||
413 | return GNUNET_MULTICAST_origin_start (cfg, | 413 | return GNUNET_MULTICAST_origin_start (cfg, |
414 | group_key, | 414 | group_key, |
415 | 0, | 415 | 0, |
@@ -460,7 +460,7 @@ testbed_master (void *cls, | |||
460 | topology (FIXME) */ | 460 | topology (FIXME) */ |
461 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 461 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
462 | "Connected to testbed_master()\n"); | 462 | "Connected to testbed_master()\n"); |
463 | 463 | ||
464 | peers = p; | 464 | peers = p; |
465 | 465 | ||
466 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 466 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
@@ -478,7 +478,7 @@ testbed_master (void *cls, | |||
478 | NULL); /* closure for the above two callbacks */ | 478 | NULL); /* closure for the above two callbacks */ |
479 | 479 | ||
480 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */ | 480 | GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); /* Schedule a new task on shutdown */ |
481 | 481 | ||
482 | /* Schedule the shutdown task with a delay of a few Seconds */ | 482 | /* Schedule the shutdown task with a delay of a few Seconds */ |
483 | timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40), | 483 | timeout_tid = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 40), |
484 | &timeout_task, NULL); | 484 | &timeout_task, NULL); |