diff options
Diffstat (limited to 'src/testbed')
-rw-r--r-- | src/testbed/test_testbed_api_3peers_3controllers.c | 329 |
1 files changed, 264 insertions, 65 deletions
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c index d028e6373..2d38b8432 100644 --- a/src/testbed/test_testbed_api_3peers_3controllers.c +++ b/src/testbed/test_testbed_api_3peers_3controllers.c | |||
@@ -281,10 +281,22 @@ do_abort (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
281 | { | 281 | { |
282 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); | 282 | LOG (GNUNET_ERROR_TYPE_WARNING, "Test timedout -- Aborting\n"); |
283 | abort_task = GNUNET_SCHEDULER_NO_TASK; | 283 | abort_task = GNUNET_SCHEDULER_NO_TASK; |
284 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == delayed_connect_task); | 284 | if (GNUNET_SCHEDULER_NO_TASK != delayed_connect_task) |
285 | { | ||
286 | GNUNET_SCHEDULER_cancel (delayed_connect_task); | ||
287 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; | ||
288 | } | ||
285 | do_shutdown (cls, tc); | 289 | do_shutdown (cls, tc); |
286 | } | 290 | } |
287 | 291 | ||
292 | static void | ||
293 | abort_test () | ||
294 | { | ||
295 | if (GNUNET_SCHEDULER_NO_TASK != abort_task) | ||
296 | GNUNET_SCHEDULER_cancel (abort_task); | ||
297 | abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL); | ||
298 | } | ||
299 | |||
288 | 300 | ||
289 | /** | 301 | /** |
290 | * Callback to be called when an operation is completed | 302 | * Callback to be called when an operation is completed |
@@ -308,7 +320,12 @@ static void | |||
308 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | 320 | do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) |
309 | { | 321 | { |
310 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; | 322 | delayed_connect_task = GNUNET_SCHEDULER_NO_TASK; |
311 | GNUNET_assert (NULL == common_operation); | 323 | if (NULL != common_operation) |
324 | { | ||
325 | GNUNET_break (0); | ||
326 | abort_test(); | ||
327 | return; | ||
328 | } | ||
312 | common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, | 329 | common_operation = GNUNET_TESTBED_overlay_connect (NULL, &op_comp_cb, NULL, |
313 | peer1.peer, peer2.peer); | 330 | peer1.peer, peer2.peer); |
314 | } | 331 | } |
@@ -325,13 +342,23 @@ do_delayed_connect (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
325 | static void | 342 | static void |
326 | op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) | 343 | op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) |
327 | { | 344 | { |
328 | GNUNET_assert (common_operation == op); | 345 | if (common_operation != op) |
346 | { | ||
347 | GNUNET_break (0); | ||
348 | abort_test(); | ||
349 | return; | ||
350 | } | ||
329 | switch(result) | 351 | switch(result) |
330 | { | 352 | { |
331 | case PEER3_STARTED: | 353 | case PEER3_STARTED: |
332 | GNUNET_assert (NULL == peer1.operation); | 354 | if ((NULL != peer1.operation) || |
333 | GNUNET_assert (NULL == peer2.operation); | 355 | (NULL != peer2.operation) || |
334 | GNUNET_assert (NULL != common_operation); | 356 | (NULL == common_operation)) |
357 | { | ||
358 | GNUNET_break (0); | ||
359 | abort_test(); | ||
360 | return; | ||
361 | } | ||
335 | GNUNET_TESTBED_operation_done (common_operation); | 362 | GNUNET_TESTBED_operation_done (common_operation); |
336 | common_operation = NULL; | 363 | common_operation = NULL; |
337 | result = PEERS_1_2_CONNECTED; | 364 | result = PEERS_1_2_CONNECTED; |
@@ -341,7 +368,12 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) | |||
341 | peer3.peer); | 368 | peer3.peer); |
342 | break; | 369 | break; |
343 | case PEERS_1_2_CONNECTED: | 370 | case PEERS_1_2_CONNECTED: |
344 | GNUNET_assert (NULL != common_operation); | 371 | if (NULL == common_operation) |
372 | { | ||
373 | GNUNET_break (0); | ||
374 | abort_test(); | ||
375 | return; | ||
376 | } | ||
345 | GNUNET_TESTBED_operation_done (common_operation); | 377 | GNUNET_TESTBED_operation_done (common_operation); |
346 | common_operation = NULL; | 378 | common_operation = NULL; |
347 | result = PEERS_2_3_CONNECTED; | 379 | result = PEERS_2_3_CONNECTED; |
@@ -350,9 +382,14 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) | |||
350 | &do_delayed_connect, NULL); | 382 | &do_delayed_connect, NULL); |
351 | break; | 383 | break; |
352 | case PEERS_2_3_CONNECTED: | 384 | case PEERS_2_3_CONNECTED: |
353 | GNUNET_assert (NULL == peer1.operation); | 385 | if ((NULL != peer1.operation) || |
354 | GNUNET_assert (NULL == peer2.operation); | 386 | (NULL != peer2.operation) || |
355 | GNUNET_assert (NULL != common_operation); | 387 | (NULL == common_operation)) |
388 | { | ||
389 | GNUNET_break (0); | ||
390 | abort_test(); | ||
391 | return; | ||
392 | } | ||
356 | GNUNET_TESTBED_operation_done (common_operation); | 393 | GNUNET_TESTBED_operation_done (common_operation); |
357 | common_operation = NULL; | 394 | common_operation = NULL; |
358 | result = PEERS_CONNECTED_2; | 395 | result = PEERS_CONNECTED_2; |
@@ -362,7 +399,9 @@ op_comp_cb (void *cls, struct GNUNET_TESTBED_Operation *op, const char *emsg) | |||
362 | peer3.operation = GNUNET_TESTBED_peer_stop (peer3.peer, NULL, NULL); | 399 | peer3.operation = GNUNET_TESTBED_peer_stop (peer3.peer, NULL, NULL); |
363 | break; | 400 | break; |
364 | default: | 401 | default: |
365 | GNUNET_assert (0); | 402 | GNUNET_break (0); |
403 | abort_test(); | ||
404 | return; | ||
366 | } | 405 | } |
367 | } | 406 | } |
368 | 407 | ||
@@ -382,34 +421,51 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg) | |||
382 | switch (result) | 421 | switch (result) |
383 | { | 422 | { |
384 | case CONTROLLER1_UP: | 423 | case CONTROLLER1_UP: |
385 | GNUNET_assert (NULL != peer1.operation); | 424 | if ((NULL == peer1.operation) || |
386 | GNUNET_assert (NULL != peer); | 425 | (NULL == peer) || |
387 | GNUNET_assert (NULL == peer1.peer); | 426 | (NULL != peer1.peer)) |
427 | { | ||
428 | GNUNET_break (0); | ||
429 | abort_test(); | ||
430 | return; | ||
431 | } | ||
388 | peer1.peer = peer; | 432 | peer1.peer = peer; |
389 | GNUNET_TESTBED_operation_done (peer1.operation); | 433 | GNUNET_TESTBED_operation_done (peer1.operation); |
390 | result = PEER1_CREATED; | 434 | result = PEER1_CREATED; |
391 | peer1.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); | 435 | peer1.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); |
392 | break; | 436 | break; |
393 | case CONTROLLER2_UP: | 437 | case CONTROLLER2_UP: |
394 | GNUNET_assert (NULL != peer2.operation); | 438 | if ((NULL == peer2.operation) || |
395 | GNUNET_assert (NULL != peer); | 439 | (NULL == peer) || |
396 | GNUNET_assert (NULL == peer2.peer); | 440 | (NULL != peer2.peer)) |
441 | { | ||
442 | GNUNET_break (0); | ||
443 | abort_test(); | ||
444 | return; | ||
445 | } | ||
397 | peer2.peer = peer; | 446 | peer2.peer = peer; |
398 | GNUNET_TESTBED_operation_done (peer2.operation); | 447 | GNUNET_TESTBED_operation_done (peer2.operation); |
399 | result = PEER2_CREATED; | 448 | result = PEER2_CREATED; |
400 | peer2.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); | 449 | peer2.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); |
401 | break; | 450 | break; |
402 | case CONTROLLER3_UP: | 451 | case CONTROLLER3_UP: |
403 | GNUNET_assert (NULL != peer3.operation); | 452 | if ((NULL == peer3.operation) || |
404 | GNUNET_assert (NULL != peer); | 453 | (NULL == peer) || |
405 | GNUNET_assert (NULL == peer3.peer); | 454 | (NULL != peer3.peer)) |
455 | { | ||
456 | GNUNET_break (0); | ||
457 | abort_test(); | ||
458 | return; | ||
459 | } | ||
406 | peer3.peer = peer; | 460 | peer3.peer = peer; |
407 | GNUNET_TESTBED_operation_done (peer3.operation); | 461 | GNUNET_TESTBED_operation_done (peer3.operation); |
408 | result = PEER3_CREATED; | 462 | result = PEER3_CREATED; |
409 | peer3.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); | 463 | peer3.operation = GNUNET_TESTBED_peer_start (NULL, peer, NULL, NULL); |
410 | break; | 464 | break; |
411 | default: | 465 | default: |
412 | GNUNET_assert (0); | 466 | GNUNET_break (0); |
467 | abort_test(); | ||
468 | return; | ||
413 | } | 469 | } |
414 | } | 470 | } |
415 | 471 | ||
@@ -440,12 +496,22 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
440 | switch (event->type) | 496 | switch (event->type) |
441 | { | 497 | { |
442 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: | 498 | case GNUNET_TESTBED_ET_OPERATION_FINISHED: |
443 | GNUNET_assert (NULL == event->details.operation_finished.op_cls); | 499 | if ((NULL != event->details.operation_finished.op_cls) |
444 | GNUNET_assert (NULL == event->details.operation_finished.emsg); | 500 | || (NULL != event->details.operation_finished.emsg)) |
501 | { | ||
502 | GNUNET_break (0); | ||
503 | abort_test(); | ||
504 | return; | ||
505 | } | ||
445 | switch (result) | 506 | switch (result) |
446 | { | 507 | { |
447 | case PEERS_STOPPED: | 508 | case PEERS_STOPPED: |
448 | GNUNET_assert (NULL == event->details.operation_finished.generic); | 509 | if (NULL != event->details.operation_finished.generic) |
510 | { | ||
511 | GNUNET_break (0); | ||
512 | abort_test(); | ||
513 | return; | ||
514 | } | ||
449 | if (event->details.operation_finished.operation == peer1.operation) | 515 | if (event->details.operation_finished.operation == peer1.operation) |
450 | { | 516 | { |
451 | GNUNET_TESTBED_operation_done (peer1.operation); | 517 | GNUNET_TESTBED_operation_done (peer1.operation); |
@@ -465,7 +531,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
465 | peer3.peer = NULL; | 531 | peer3.peer = NULL; |
466 | } | 532 | } |
467 | else | 533 | else |
468 | GNUNET_assert (0); | 534 | { |
535 | GNUNET_break (0); | ||
536 | abort_test(); | ||
537 | return; | ||
538 | } | ||
469 | if ((NULL == peer1.peer) && (NULL == peer2.peer) && (NULL == peer3.peer)) | 539 | if ((NULL == peer1.peer) && (NULL == peer2.peer) && (NULL == peer3.peer)) |
470 | { | 540 | { |
471 | result = SUCCESS; | 541 | result = SUCCESS; |
@@ -473,36 +543,63 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
473 | } | 543 | } |
474 | break; | 544 | break; |
475 | case PEER1_STARTED: | 545 | case PEER1_STARTED: |
476 | GNUNET_assert (NULL == event->details.operation_finished.generic); | 546 | if ((NULL != event->details.operation_finished.generic) || |
477 | GNUNET_assert (NULL != common_operation); | 547 | (NULL == common_operation)) |
548 | { | ||
549 | GNUNET_break (0); | ||
550 | abort_test(); | ||
551 | return; | ||
552 | } | ||
478 | GNUNET_TESTBED_operation_done (common_operation); | 553 | GNUNET_TESTBED_operation_done (common_operation); |
479 | common_operation = NULL; | 554 | common_operation = NULL; |
480 | result = CONTROLLER2_UP; | 555 | result = CONTROLLER2_UP; |
481 | peer2.operation = | 556 | peer2.operation = |
482 | GNUNET_TESTBED_peer_create (controller1, neighbour1, cfg, | 557 | GNUNET_TESTBED_peer_create (controller1, neighbour1, cfg, |
483 | &peer_create_cb, NULL); | 558 | &peer_create_cb, NULL); |
484 | GNUNET_assert (NULL != peer2.operation); | 559 | if (NULL == peer2.operation) |
560 | { | ||
561 | GNUNET_break (0); | ||
562 | abort_test(); | ||
563 | return; | ||
564 | } | ||
485 | break; | 565 | break; |
486 | case PEER2_STARTED: | 566 | case PEER2_STARTED: |
487 | GNUNET_assert (NULL == event->details.operation_finished.generic); | 567 | if ((NULL != event->details.operation_finished.generic) || |
488 | GNUNET_assert (NULL != common_operation); | 568 | (NULL == common_operation)) |
569 | { | ||
570 | GNUNET_break (0); | ||
571 | abort_test(); | ||
572 | return; | ||
573 | } | ||
489 | GNUNET_TESTBED_operation_done (common_operation); | 574 | GNUNET_TESTBED_operation_done (common_operation); |
490 | common_operation = NULL; | 575 | common_operation = NULL; |
491 | result = CONTROLLER3_UP; | 576 | result = CONTROLLER3_UP; |
492 | peer3.operation = | 577 | peer3.operation = |
493 | GNUNET_TESTBED_peer_create (controller1, neighbour2, cfg, | 578 | GNUNET_TESTBED_peer_create (controller1, neighbour2, cfg, |
494 | &peer_create_cb, NULL); | 579 | &peer_create_cb, NULL); |
495 | GNUNET_assert (NULL != peer3.operation); | 580 | if (NULL == peer3.operation) |
581 | { | ||
582 | GNUNET_break (0); | ||
583 | abort_test(); | ||
584 | return; | ||
585 | } | ||
496 | break; | 586 | break; |
497 | default: | 587 | default: |
498 | GNUNET_assert (0); | 588 | GNUNET_break (0); |
589 | abort_test(); | ||
590 | return; | ||
499 | } | 591 | } |
500 | break; | 592 | break; |
501 | case GNUNET_TESTBED_ET_PEER_START: | 593 | case GNUNET_TESTBED_ET_PEER_START: |
502 | switch (result) | 594 | switch (result) |
503 | { | 595 | { |
504 | case PEER1_CREATED: | 596 | case PEER1_CREATED: |
505 | GNUNET_assert (event->details.peer_start.host == host); | 597 | if (event->details.peer_start.host != host) |
598 | { | ||
599 | GNUNET_break (0); | ||
600 | abort_test(); | ||
601 | return; | ||
602 | } | ||
506 | peer1.is_running = GNUNET_YES; | 603 | peer1.is_running = GNUNET_YES; |
507 | GNUNET_TESTBED_operation_done (peer1.operation); | 604 | GNUNET_TESTBED_operation_done (peer1.operation); |
508 | peer1.operation = NULL; | 605 | peer1.operation = NULL; |
@@ -512,19 +609,39 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
512 | GNUNET_YES); | 609 | GNUNET_YES); |
513 | break; | 610 | break; |
514 | case PEER2_CREATED: | 611 | case PEER2_CREATED: |
515 | GNUNET_assert (event->details.peer_start.host == neighbour1); | 612 | if (event->details.peer_start.host != neighbour1) |
613 | { | ||
614 | GNUNET_break (0); | ||
615 | abort_test(); | ||
616 | return; | ||
617 | } | ||
516 | peer2.is_running = GNUNET_YES; | 618 | peer2.is_running = GNUNET_YES; |
517 | GNUNET_TESTBED_operation_done (peer2.operation); | 619 | GNUNET_TESTBED_operation_done (peer2.operation); |
518 | peer2.operation = NULL; | 620 | peer2.operation = NULL; |
519 | result = PEER2_STARTED; | 621 | result = PEER2_STARTED; |
520 | GNUNET_assert (NULL == common_operation); | 622 | if (NULL != common_operation) |
623 | { | ||
624 | GNUNET_break (0); | ||
625 | abort_test(); | ||
626 | return; | ||
627 | } | ||
521 | common_operation = | 628 | common_operation = |
522 | GNUNET_TESTBED_controller_link (NULL, controller1, neighbour2, NULL, cfg, | 629 | GNUNET_TESTBED_controller_link (NULL, controller1, neighbour2, NULL, cfg, |
523 | GNUNET_YES); | 630 | GNUNET_YES); |
524 | GNUNET_assert (NULL != common_operation); | 631 | if (NULL == common_operation) |
632 | { | ||
633 | GNUNET_break (0); | ||
634 | abort_test(); | ||
635 | return; | ||
636 | } | ||
525 | break; | 637 | break; |
526 | case PEER3_CREATED: | 638 | case PEER3_CREATED: |
527 | GNUNET_assert (event->details.peer_start.host == neighbour2); | 639 | if (event->details.peer_start.host != neighbour2) |
640 | { | ||
641 | GNUNET_break (0); | ||
642 | abort_test(); | ||
643 | return; | ||
644 | } | ||
528 | peer3.is_running = GNUNET_YES; | 645 | peer3.is_running = GNUNET_YES; |
529 | GNUNET_TESTBED_operation_done (peer3.operation); | 646 | GNUNET_TESTBED_operation_done (peer3.operation); |
530 | peer3.operation = NULL; | 647 | peer3.operation = NULL; |
@@ -534,11 +651,18 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
534 | peer1.peer); | 651 | peer1.peer); |
535 | break; | 652 | break; |
536 | default: | 653 | default: |
537 | GNUNET_assert (0); | 654 | GNUNET_break (0); |
655 | abort_test(); | ||
656 | return; | ||
538 | } | 657 | } |
539 | break; | 658 | break; |
540 | case GNUNET_TESTBED_ET_PEER_STOP: | 659 | case GNUNET_TESTBED_ET_PEER_STOP: |
541 | GNUNET_assert (PEERS_CONNECTED_2 == result); | 660 | if (PEERS_CONNECTED_2 != result) |
661 | { | ||
662 | GNUNET_break (0); | ||
663 | abort_test(); | ||
664 | return; | ||
665 | } | ||
542 | if (event->details.peer_stop.peer == peer1.peer) | 666 | if (event->details.peer_stop.peer == peer1.peer) |
543 | { | 667 | { |
544 | peer1.is_running = GNUNET_NO; | 668 | peer1.is_running = GNUNET_NO; |
@@ -555,7 +679,11 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
555 | GNUNET_TESTBED_operation_done (peer3.operation); | 679 | GNUNET_TESTBED_operation_done (peer3.operation); |
556 | } | 680 | } |
557 | else | 681 | else |
558 | GNUNET_assert (0); | 682 | { |
683 | GNUNET_break (0); | ||
684 | abort_test(); | ||
685 | return; | ||
686 | } | ||
559 | if ((GNUNET_NO == peer1.is_running) && | 687 | if ((GNUNET_NO == peer1.is_running) && |
560 | (GNUNET_NO == peer2.is_running) && | 688 | (GNUNET_NO == peer2.is_running) && |
561 | (GNUNET_NO == peer3.is_running)) | 689 | (GNUNET_NO == peer3.is_running)) |
@@ -567,33 +695,57 @@ controller_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event) | |||
567 | } | 695 | } |
568 | break; | 696 | break; |
569 | case GNUNET_TESTBED_ET_CONNECT: | 697 | case GNUNET_TESTBED_ET_CONNECT: |
570 | GNUNET_assert (NULL == peer1.operation); | 698 | if ((NULL != peer1.operation) || |
571 | GNUNET_assert (NULL == peer2.operation); | 699 | (NULL != peer2.operation) || |
572 | GNUNET_assert (NULL == peer3.operation); | 700 | (NULL != peer3.operation)) |
701 | { | ||
702 | GNUNET_break (0); | ||
703 | abort_test(); | ||
704 | return; | ||
705 | } | ||
573 | switch (result) | 706 | switch (result) |
574 | { | 707 | { |
575 | case PEER3_STARTED: | 708 | case PEER3_STARTED: |
576 | GNUNET_assert (NULL != common_operation); | 709 | if ((NULL == common_operation) || |
577 | GNUNET_assert ((event->details.peer_connect.peer1 == peer2.peer) && | 710 | (event->details.peer_connect.peer1 != peer2.peer) || |
578 | (event->details.peer_connect.peer2 == peer1.peer)); | 711 | (event->details.peer_connect.peer2 != peer1.peer)) |
712 | { | ||
713 | GNUNET_break (0); | ||
714 | abort_test(); | ||
715 | return; | ||
716 | } | ||
579 | break; | 717 | break; |
580 | case PEERS_2_3_CONNECTED: | 718 | case PEERS_2_3_CONNECTED: |
581 | GNUNET_assert (NULL != common_operation); | 719 | if ((NULL == common_operation) || |
582 | GNUNET_assert ((event->details.peer_connect.peer1 == peer1.peer) && | 720 | (event->details.peer_connect.peer1 != peer1.peer) || |
583 | (event->details.peer_connect.peer2 == peer2.peer)); | 721 | (event->details.peer_connect.peer2 != peer2.peer)) |
722 | { | ||
723 | GNUNET_break (0); | ||
724 | abort_test(); | ||
725 | return; | ||
726 | } | ||
584 | break; | 727 | break; |
585 | case PEERS_1_2_CONNECTED: | 728 | case PEERS_1_2_CONNECTED: |
586 | GNUNET_assert (NULL != common_operation); | 729 | if ((NULL == common_operation) || |
587 | GNUNET_assert ((event->details.peer_connect.peer1 == peer2.peer) && | 730 | (event->details.peer_connect.peer1 != peer2.peer) || |
588 | (event->details.peer_connect.peer2 == peer3.peer)); | 731 | (event->details.peer_connect.peer2 != peer3.peer)) |
732 | { | ||
733 | GNUNET_break (0); | ||
734 | abort_test(); | ||
735 | return; | ||
736 | } | ||
589 | break; | 737 | break; |
590 | default: | 738 | default: |
591 | GNUNET_assert (0); | 739 | GNUNET_break (0); |
740 | abort_test(); | ||
741 | return; | ||
592 | } | 742 | } |
593 | break; | 743 | break; |
594 | default: | 744 | default: |
595 | GNUNET_assert (0); | 745 | GNUNET_break (0); |
596 | }; | 746 | abort_test(); |
747 | return; | ||
748 | } | ||
597 | } | 749 | } |
598 | 750 | ||
599 | 751 | ||
@@ -610,18 +762,38 @@ registration_comp (void *cls, const char *emsg) | |||
610 | if (cls == neighbour1) | 762 | if (cls == neighbour1) |
611 | { | 763 | { |
612 | neighbour2 = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0); | 764 | neighbour2 = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0); |
613 | GNUNET_assert (NULL != neighbour2); | 765 | if (NULL == neighbour2) |
766 | { | ||
767 | GNUNET_break (0); | ||
768 | abort_test(); | ||
769 | return; | ||
770 | } | ||
614 | reg_handle = | 771 | reg_handle = |
615 | GNUNET_TESTBED_register_host (controller1, neighbour2, ®istration_comp, | 772 | GNUNET_TESTBED_register_host (controller1, neighbour2, ®istration_comp, |
616 | neighbour2); | 773 | neighbour2); |
617 | GNUNET_assert (NULL != reg_handle); | 774 | if (NULL == reg_handle) |
775 | { | ||
776 | GNUNET_break (0); | ||
777 | abort_test(); | ||
778 | return; | ||
779 | } | ||
780 | return; | ||
781 | } | ||
782 | if (cls != neighbour2) | ||
783 | { | ||
784 | GNUNET_break (0); | ||
785 | abort_test(); | ||
618 | return; | 786 | return; |
619 | } | 787 | } |
620 | GNUNET_assert (cls == neighbour2); | ||
621 | peer1.operation = | 788 | peer1.operation = |
622 | GNUNET_TESTBED_peer_create (controller1, host, cfg, &peer_create_cb, | 789 | GNUNET_TESTBED_peer_create (controller1, host, cfg, &peer_create_cb, |
623 | &peer1); | 790 | &peer1); |
624 | GNUNET_assert (NULL != peer1.operation); | 791 | if (NULL == peer1.operation) |
792 | { | ||
793 | GNUNET_break (0); | ||
794 | abort_test(); | ||
795 | return; | ||
796 | } | ||
625 | } | 797 | } |
626 | 798 | ||
627 | 799 | ||
@@ -639,7 +811,12 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat | |||
639 | { | 811 | { |
640 | uint64_t event_mask; | 812 | uint64_t event_mask; |
641 | 813 | ||
642 | GNUNET_assert (GNUNET_OK == status); | 814 | if (GNUNET_OK != status) |
815 | { | ||
816 | GNUNET_break (0); | ||
817 | abort_test(); | ||
818 | return; | ||
819 | } | ||
643 | event_mask = 0; | 820 | event_mask = 0; |
644 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START); | 821 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_START); |
645 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP); | 822 | event_mask |= (1L << GNUNET_TESTBED_ET_PEER_STOP); |
@@ -651,17 +828,34 @@ status_cb (void *cls, const struct GNUNET_CONFIGURATION_Handle *config, int stat | |||
651 | controller1 = | 828 | controller1 = |
652 | GNUNET_TESTBED_controller_connect (config, host, event_mask, &controller_cb, | 829 | GNUNET_TESTBED_controller_connect (config, host, event_mask, &controller_cb, |
653 | NULL); | 830 | NULL); |
654 | GNUNET_assert (NULL != controller1); | 831 | if (NULL == controller1) |
832 | { | ||
833 | GNUNET_break (0); | ||
834 | abort_test(); | ||
835 | return; | ||
836 | } | ||
655 | result = CONTROLLER1_UP; | 837 | result = CONTROLLER1_UP; |
656 | neighbour1 = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0); | 838 | neighbour1 = GNUNET_TESTBED_host_create ("127.0.0.1", NULL, 0); |
657 | GNUNET_assert (NULL != neighbour1); | 839 | if (NULL == neighbour1) |
840 | { | ||
841 | GNUNET_break (0); | ||
842 | abort_test(); | ||
843 | return; | ||
844 | } | ||
658 | reg_handle = | 845 | reg_handle = |
659 | GNUNET_TESTBED_register_host (controller1, neighbour1, ®istration_comp, | 846 | GNUNET_TESTBED_register_host (controller1, neighbour1, ®istration_comp, |
660 | neighbour1); | 847 | neighbour1); |
661 | GNUNET_assert (NULL != reg_handle); | 848 | if (NULL == reg_handle) |
849 | { | ||
850 | GNUNET_break (0); | ||
851 | abort_test(); | ||
852 | return; | ||
853 | } | ||
662 | break; | 854 | break; |
663 | default: | 855 | default: |
664 | GNUNET_assert (0); | 856 | GNUNET_break (0); |
857 | abort_test(); | ||
858 | return; | ||
665 | } | 859 | } |
666 | } | 860 | } |
667 | 861 | ||
@@ -679,7 +873,12 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
679 | const struct GNUNET_CONFIGURATION_Handle *config) | 873 | const struct GNUNET_CONFIGURATION_Handle *config) |
680 | { | 874 | { |
681 | host = GNUNET_TESTBED_host_create (NULL, NULL, 0); | 875 | host = GNUNET_TESTBED_host_create (NULL, NULL, 0); |
682 | GNUNET_assert (NULL != host); | 876 | if (NULL == host) |
877 | { | ||
878 | GNUNET_break (0); | ||
879 | abort_test(); | ||
880 | return; | ||
881 | } | ||
683 | if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (host, config)) | 882 | if (GNUNET_YES != GNUNET_TESTBED_is_host_habitable (host, config)) |
684 | { | 883 | { |
685 | GNUNET_TESTBED_host_destroy (host); | 884 | GNUNET_TESTBED_host_destroy (host); |