diff options
Diffstat (limited to 'src/multicast/test_multicast_multipeer.c')
-rw-r--r-- | src/multicast/test_multicast_multipeer.c | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/src/multicast/test_multicast_multipeer.c b/src/multicast/test_multicast_multipeer.c index d1ed1cb39..96e86cbb4 100644 --- a/src/multicast/test_multicast_multipeer.c +++ b/src/multicast/test_multicast_multipeer.c | |||
@@ -54,7 +54,7 @@ enum pingpong | |||
54 | struct pingpong_msg | 54 | struct pingpong_msg |
55 | { | 55 | { |
56 | int peer; | 56 | int peer; |
57 | enum pingpong msg; | 57 | enum pingpong msg; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | static void service_connect (void *cls, | 60 | static void service_connect (void *cls, |
@@ -143,13 +143,13 @@ member_join_request (void *cls, | |||
143 | { | 143 | { |
144 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; | 144 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; |
145 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 145 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
146 | "Peer #%u (%s) sent a join request.\n", | 146 | "Peer #%u (%s) sent a join request.\n", |
147 | mc_peer->peer, | 147 | mc_peer->peer, |
148 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); | 148 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); |
149 | } | 149 | } |
150 | 150 | ||
151 | 151 | ||
152 | static int | 152 | static int |
153 | notify (void *cls, | 153 | notify (void *cls, |
154 | size_t *data_size, | 154 | size_t *data_size, |
155 | void *data) | 155 | void *data) |
@@ -163,7 +163,7 @@ notify (void *cls, | |||
163 | *data_size = sizeof (struct pingpong_msg); | 163 | *data_size = sizeof (struct pingpong_msg); |
164 | GNUNET_memcpy(data, pp_msg, *data_size); | 164 | GNUNET_memcpy(data, pp_msg, *data_size); |
165 | 165 | ||
166 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 166 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
167 | "Peer #%u sents ping to origin\n", mc_peer->peer); | 167 | "Peer #%u sents ping to origin\n", mc_peer->peer); |
168 | 168 | ||
169 | return GNUNET_YES; | 169 | return GNUNET_YES; |
@@ -179,20 +179,20 @@ member_join_decision (void *cls, | |||
179 | const struct GNUNET_MessageHeader *join_msg) | 179 | const struct GNUNET_MessageHeader *join_msg) |
180 | { | 180 | { |
181 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; | 181 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; |
182 | 182 | ||
183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 183 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
184 | "Peer #%u (%s) received a decision from origin: %s\n", | 184 | "Peer #%u (%s) received a decision from origin: %s\n", |
185 | mc_peer->peer, | 185 | mc_peer->peer, |
186 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id), | 186 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id), |
187 | (GNUNET_YES == is_admitted)?"accepted":"rejected"); | 187 | (GNUNET_YES == is_admitted)?"accepted":"rejected"); |
188 | 188 | ||
189 | if (GNUNET_YES == is_admitted) | 189 | if (GNUNET_YES == is_admitted) |
190 | { | 190 | { |
191 | GNUNET_MULTICAST_member_to_origin (members[mc_peer->peer], | 191 | GNUNET_MULTICAST_member_to_origin (members[mc_peer->peer], |
192 | 0, | 192 | 0, |
193 | notify, | 193 | notify, |
194 | cls); | 194 | cls); |
195 | 195 | ||
196 | } | 196 | } |
197 | } | 197 | } |
198 | 198 | ||
@@ -236,7 +236,7 @@ member_disconnected_cb (void *cls) | |||
236 | 236 | ||
237 | 237 | ||
238 | static void | 238 | static void |
239 | member_message (void *cls, | 239 | member_message (void *cls, |
240 | const struct GNUNET_MULTICAST_MessageHeader *msg) | 240 | const struct GNUNET_MULTICAST_MessageHeader *msg) |
241 | { | 241 | { |
242 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; | 242 | struct MulticastPeerContext *mc_peer = (struct MulticastPeerContext*)cls; |
@@ -245,7 +245,7 @@ member_message (void *cls, | |||
245 | if (PONG == pp_msg->msg && mc_peer->peer == pp_msg->peer) | 245 | if (PONG == pp_msg->msg && mc_peer->peer == pp_msg->peer) |
246 | { | 246 | { |
247 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 247 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
248 | "peer #%i (%s) receives a pong\n", | 248 | "peer #%i (%s) receives a pong\n", |
249 | mc_peer->peer, | 249 | mc_peer->peer, |
250 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); | 250 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); |
251 | mc_peer->test_ok = GNUNET_OK; | 251 | mc_peer->test_ok = GNUNET_OK; |
@@ -269,9 +269,9 @@ origin_join_request (void *cls, | |||
269 | 269 | ||
270 | uint8_t data_size = ntohs (join_msg->size); | 270 | uint8_t data_size = ntohs (join_msg->size); |
271 | 271 | ||
272 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 272 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
273 | "origin got a join request...\n"); | 273 | "origin got a join request...\n"); |
274 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 274 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
275 | "origin receives: '%s'\n", (char *)&join_msg[1]); | 275 | "origin receives: '%s'\n", (char *)&join_msg[1]); |
276 | 276 | ||
277 | char data[] = "Come in!"; | 277 | char data[] = "Come in!"; |
@@ -281,7 +281,7 @@ origin_join_request (void *cls, | |||
281 | join_resp->type = htons (123); | 281 | join_resp->type = htons (123); |
282 | GNUNET_memcpy (&join_resp[1], data, data_size); | 282 | GNUNET_memcpy (&join_resp[1], data, data_size); |
283 | 283 | ||
284 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 284 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
285 | "origin sends: '%s'\n", data); | 285 | "origin sends: '%s'\n", data); |
286 | 286 | ||
287 | GNUNET_MULTICAST_join_decision (jh, | 287 | GNUNET_MULTICAST_join_decision (jh, |
@@ -311,7 +311,7 @@ origin_replay_msg (void *cls, | |||
311 | uint64_t message_id, | 311 | uint64_t message_id, |
312 | uint64_t fragment_offset, | 312 | uint64_t fragment_offset, |
313 | uint64_t flags, | 313 | uint64_t flags, |
314 | struct GNUNET_MULTICAST_ReplayHandle *rh) | 314 | struct GNUNET_MULTICAST_ReplayHandle *rh) |
315 | { | 315 | { |
316 | 316 | ||
317 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n"); | 317 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin replay msg\n"); |
@@ -319,8 +319,8 @@ origin_replay_msg (void *cls, | |||
319 | 319 | ||
320 | 320 | ||
321 | static int | 321 | static int |
322 | origin_notify (void *cls, | 322 | origin_notify (void *cls, |
323 | size_t *data_size, | 323 | size_t *data_size, |
324 | void *data) | 324 | void *data) |
325 | { | 325 | { |
326 | struct pingpong_msg *rcv_pp_msg = (struct pingpong_msg*)cls; | 326 | struct pingpong_msg *rcv_pp_msg = (struct pingpong_msg*)cls; |
@@ -329,11 +329,11 @@ origin_notify (void *cls, | |||
329 | pp_msg->peer = rcv_pp_msg->peer; | 329 | pp_msg->peer = rcv_pp_msg->peer; |
330 | pp_msg->msg = PONG; | 330 | pp_msg->msg = PONG; |
331 | *data_size = sizeof (struct pingpong_msg); | 331 | *data_size = sizeof (struct pingpong_msg); |
332 | memcpy(data, pp_msg, *data_size); | 332 | GNUNET_memcpy(data, pp_msg, *data_size); |
333 | 333 | ||
334 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong\n"); | 334 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin sends pong\n"); |
335 | 335 | ||
336 | return GNUNET_YES; | 336 | return GNUNET_YES; |
337 | } | 337 | } |
338 | 338 | ||
339 | 339 | ||
@@ -345,7 +345,7 @@ origin_request (void *cls, | |||
345 | 345 | ||
346 | req++; | 346 | req++; |
347 | struct pingpong_msg *pp_msg = (struct pingpong_msg *) req; | 347 | struct pingpong_msg *pp_msg = (struct pingpong_msg *) req; |
348 | 348 | ||
349 | if (1 != pp_msg->msg) { | 349 | if (1 != pp_msg->msg) { |
350 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct request"); | 350 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "origin didn't reveice a correct request"); |
351 | } | 351 | } |
@@ -360,7 +360,7 @@ origin_request (void *cls, | |||
360 | 360 | ||
361 | static void | 361 | static void |
362 | origin_message (void *cls, | 362 | origin_message (void *cls, |
363 | const struct GNUNET_MULTICAST_MessageHeader *msg) | 363 | const struct GNUNET_MULTICAST_MessageHeader *msg) |
364 | { | 364 | { |
365 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin message msg\n"); | 365 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, "origin message msg\n"); |
366 | } | 366 | } |
@@ -386,7 +386,7 @@ multicast_connect (void *cls, | |||
386 | { | 386 | { |
387 | group_key = GNUNET_CRYPTO_eddsa_key_create (); | 387 | group_key = GNUNET_CRYPTO_eddsa_key_create (); |
388 | GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key); | 388 | GNUNET_CRYPTO_eddsa_key_get_public (group_key, &group_pub_key); |
389 | 389 | ||
390 | GNUNET_CRYPTO_hash (&group_pub_key, sizeof (group_pub_key), &group_pub_key_hash); | 390 | GNUNET_CRYPTO_hash (&group_pub_key, sizeof (group_pub_key), &group_pub_key_hash); |
391 | origin = GNUNET_MULTICAST_origin_start (cfg, | 391 | origin = GNUNET_MULTICAST_origin_start (cfg, |
392 | group_key, | 392 | group_key, |
@@ -414,7 +414,7 @@ multicast_connect (void *cls, | |||
414 | { | 414 | { |
415 | multicast_peer->key = GNUNET_CRYPTO_ecdsa_key_create (); | 415 | multicast_peer->key = GNUNET_CRYPTO_ecdsa_key_create (); |
416 | 416 | ||
417 | sprintf(data, "Hi, I am peer #%u (%s). Can I enter?", | 417 | sprintf(data, "Hi, I am peer #%u (%s). Can I enter?", |
418 | multicast_peer->peer, | 418 | multicast_peer->peer, |
419 | GNUNET_i2s (multicast_peers[multicast_peer->peer]->id)); | 419 | GNUNET_i2s (multicast_peers[multicast_peer->peer]->id)); |
420 | uint8_t data_size = strlen (data) + 1; | 420 | uint8_t data_size = strlen (data) + 1; |
@@ -424,7 +424,7 @@ multicast_connect (void *cls, | |||
424 | GNUNET_memcpy (&join_msg[1], data, data_size); | 424 | GNUNET_memcpy (&join_msg[1], data, data_size); |
425 | 425 | ||
426 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 426 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
427 | "Peer #%u (%s) tries to join multicast group %s\n", | 427 | "Peer #%u (%s) tries to join multicast group %s\n", |
428 | multicast_peer->peer, | 428 | multicast_peer->peer, |
429 | GNUNET_i2s (multicast_peers[multicast_peer->peer]->id), | 429 | GNUNET_i2s (multicast_peers[multicast_peer->peer]->id), |
430 | GNUNET_h2s (&group_pub_key_hash)); | 430 | GNUNET_h2s (&group_pub_key_hash)); |
@@ -465,12 +465,12 @@ peer_information_cb (void *cls, | |||
465 | multicast_peers[mc_peer->peer]->id = pinfo->result.id; | 465 | multicast_peers[mc_peer->peer]->id = pinfo->result.id; |
466 | 466 | ||
467 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 467 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
468 | "Got peer information of %s (%s)\n", | 468 | "Got peer information of %s (%s)\n", |
469 | (0 == mc_peer->peer)? "origin" : "member", | 469 | (0 == mc_peer->peer)? "origin" : "member", |
470 | GNUNET_i2s (pinfo->result.id)); | 470 | GNUNET_i2s (pinfo->result.id)); |
471 | 471 | ||
472 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 472 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
473 | "Create peer #%u (%s)\n", | 473 | "Create peer #%u (%s)\n", |
474 | mc_peer->peer, | 474 | mc_peer->peer, |
475 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); | 475 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); |
476 | 476 | ||
@@ -479,7 +479,7 @@ peer_information_cb (void *cls, | |||
479 | /* connect to multicast service of members */ | 479 | /* connect to multicast service of members */ |
480 | op[mc_peer->peer] = | 480 | op[mc_peer->peer] = |
481 | GNUNET_TESTBED_service_connect (/* Closure for operation */ | 481 | GNUNET_TESTBED_service_connect (/* Closure for operation */ |
482 | NULL, | 482 | NULL, |
483 | /* The peer whose service to connect to */ | 483 | /* The peer whose service to connect to */ |
484 | peers[mc_peer->peer], | 484 | peers[mc_peer->peer], |
485 | /* The name of the service */ | 485 | /* The name of the service */ |
@@ -508,8 +508,8 @@ service_connect (void *cls, | |||
508 | 508 | ||
509 | if (NULL == ca_result) | 509 | if (NULL == ca_result) |
510 | { | 510 | { |
511 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | 511 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, |
512 | "Connection adapter not created for peer #%u (%s)\n", | 512 | "Connection adapter not created for peer #%u (%s)\n", |
513 | mc_peer->peer, | 513 | mc_peer->peer, |
514 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); | 514 | GNUNET_i2s (multicast_peers[mc_peer->peer]->id)); |
515 | 515 | ||
@@ -519,8 +519,8 @@ service_connect (void *cls, | |||
519 | 519 | ||
520 | if (0 == mc_peer->peer) | 520 | if (0 == mc_peer->peer) |
521 | { | 521 | { |
522 | // Get GNUnet identity of members | 522 | // Get GNUnet identity of members |
523 | for (int i = 0; i<PEERS_REQUESTED; i++) | 523 | for (int i = 0; i<PEERS_REQUESTED; i++) |
524 | { | 524 | { |
525 | pi_op[i] = GNUNET_TESTBED_peer_get_information (peers[i], | 525 | pi_op[i] = GNUNET_TESTBED_peer_get_information (peers[i], |
526 | GNUNET_TESTBED_PIT_IDENTITY, | 526 | GNUNET_TESTBED_PIT_IDENTITY, |
@@ -547,7 +547,7 @@ service_connect (void *cls, | |||
547 | * @param PEERS_REQUESTED size of the 'peers' array | 547 | * @param PEERS_REQUESTED size of the 'peers' array |
548 | * @param links_succeeded number of links between peers that were created | 548 | * @param links_succeeded number of links between peers that were created |
549 | * @param links_failed number of links testbed was unable to establish | 549 | * @param links_failed number of links testbed was unable to establish |
550 | */ | 550 | */ |
551 | static void | 551 | static void |
552 | testbed_master (void *cls, | 552 | testbed_master (void *cls, |
553 | struct GNUNET_TESTBED_RunHandle *h, | 553 | struct GNUNET_TESTBED_RunHandle *h, |
@@ -562,7 +562,7 @@ testbed_master (void *cls, | |||
562 | multicast_peers = GNUNET_new_array (PEERS_REQUESTED, struct MulticastPeerContext*); | 562 | multicast_peers = GNUNET_new_array (PEERS_REQUESTED, struct MulticastPeerContext*); |
563 | 563 | ||
564 | // Create test contexts for members | 564 | // Create test contexts for members |
565 | for (int i = 0; i<PEERS_REQUESTED; i++) | 565 | for (int i = 0; i<PEERS_REQUESTED; i++) |
566 | { | 566 | { |
567 | multicast_peers[i] = GNUNET_new (struct MulticastPeerContext); | 567 | multicast_peers[i] = GNUNET_new (struct MulticastPeerContext); |
568 | multicast_peers[i]->peer = i; | 568 | multicast_peers[i]->peer = i; |
@@ -604,7 +604,7 @@ main (int argc, char *argv[]) | |||
604 | int ret; | 604 | int ret; |
605 | char const *config_file; | 605 | char const *config_file; |
606 | 606 | ||
607 | if (strstr (argv[0], "_line") != NULL) | 607 | if (strstr (argv[0], "_line") != NULL) |
608 | { | 608 | { |
609 | config_file = "test_multicast_line.conf"; | 609 | config_file = "test_multicast_line.conf"; |
610 | } | 610 | } |
@@ -612,7 +612,7 @@ main (int argc, char *argv[]) | |||
612 | { | 612 | { |
613 | config_file = "test_multicast_star.conf"; | 613 | config_file = "test_multicast_star.conf"; |
614 | } | 614 | } |
615 | else | 615 | else |
616 | { | 616 | { |
617 | config_file = "test_multicast_star.conf"; | 617 | config_file = "test_multicast_star.conf"; |
618 | } | 618 | } |
@@ -620,19 +620,19 @@ main (int argc, char *argv[]) | |||
620 | result = GNUNET_SYSERR; | 620 | result = GNUNET_SYSERR; |
621 | ret = | 621 | ret = |
622 | GNUNET_TESTBED_test_run ("test-multicast-multipeer", | 622 | GNUNET_TESTBED_test_run ("test-multicast-multipeer", |
623 | config_file, | 623 | config_file, |
624 | /* number of peers to start */ | 624 | /* number of peers to start */ |
625 | PEERS_REQUESTED, | 625 | PEERS_REQUESTED, |
626 | /* Event mask - set to 0 for no event notifications */ | 626 | /* Event mask - set to 0 for no event notifications */ |
627 | 0LL, | 627 | 0LL, |
628 | /* Controller event callback */ | 628 | /* Controller event callback */ |
629 | NULL, | 629 | NULL, |
630 | /* Closure for controller event callback */ | 630 | /* Closure for controller event callback */ |
631 | NULL, | 631 | NULL, |
632 | /* called when testbed setup is complete */ | 632 | /* called when testbed setup is complete */ |
633 | testbed_master, | 633 | testbed_master, |
634 | /* Closure for the test_master callback */ | 634 | /* Closure for the test_master callback */ |
635 | NULL); | 635 | NULL); |
636 | if ( (GNUNET_OK != ret) || (GNUNET_OK != result) ) | 636 | if ( (GNUNET_OK != ret) || (GNUNET_OK != result) ) |
637 | return 1; | 637 | return 1; |
638 | return 0; | 638 | return 0; |