diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-11-08 12:25:12 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-11-08 12:25:12 +0000 |
commit | 8ccaf285bc9abc7b9e224fa106656c874c3294ef (patch) | |
tree | 73d35588f5e221ddad0a8ae1c2feca9ca3394099 | |
parent | c2beda80149b118743b91e7f44e7a1dc03c8a776 (diff) | |
download | gnunet-8ccaf285bc9abc7b9e224fa106656c874c3294ef.tar.gz gnunet-8ccaf285bc9abc7b9e224fa106656c874c3294ef.zip |
- working: -i -e, todo: -c, -m -s -b
-rw-r--r-- | src/transport/gnunet-transport.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c index 9c3d3a73c..312859695 100644 --- a/src/transport/gnunet-transport.c +++ b/src/transport/gnunet-transport.c | |||
@@ -220,13 +220,11 @@ shutdown_task (void *cls, | |||
220 | GNUNET_TRANSPORT_disconnect(handle); | 220 | GNUNET_TRANSPORT_disconnect(handle); |
221 | handle = NULL; | 221 | handle = NULL; |
222 | } | 222 | } |
223 | |||
224 | if (NULL != peers) | 223 | if (NULL != peers) |
225 | { | 224 | { |
226 | GNUNET_CONTAINER_multihashmap_destroy (peers); | 225 | GNUNET_CONTAINER_multihashmap_destroy (peers); |
227 | peers = NULL; | 226 | peers = NULL; |
228 | } | 227 | } |
229 | GNUNET_break (0); | ||
230 | } | 228 | } |
231 | 229 | ||
232 | /** | 230 | /** |
@@ -604,13 +602,11 @@ process_string (void *cls, const char *address) | |||
604 | FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name); | 602 | FPRINTF (stdout, _("Peer `%s': %s <unable to resolve address>\n"), GNUNET_i2s (&addrcp->peer), addrcp->transport_name); |
605 | GNUNET_free (rc->addrcp); | 603 | GNUNET_free (rc->addrcp); |
606 | GNUNET_free (rc); | 604 | GNUNET_free (rc); |
607 | FPRINTF (stdout, _("Peer --: %u\n"), address_resolutions); | ||
608 | if (0 == address_resolutions) | 605 | if (0 == address_resolutions) |
609 | { | 606 | { |
610 | if (GNUNET_SCHEDULER_NO_TASK == end) | 607 | if (GNUNET_SCHEDULER_NO_TASK != end) |
611 | GNUNET_SCHEDULER_cancel (end); | 608 | GNUNET_SCHEDULER_cancel (end); |
612 | GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); | 609 | end = GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); |
613 | GNUNET_break (0); | ||
614 | } | 610 | } |
615 | } | 611 | } |
616 | } | 612 | } |
@@ -648,7 +644,6 @@ process_address (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
648 | 644 | ||
649 | GNUNET_assert (NULL != rc); | 645 | GNUNET_assert (NULL != rc); |
650 | address_resolutions ++; | 646 | address_resolutions ++; |
651 | FPRINTF (stdout, _("Peer `%s' ++: %u\n"), GNUNET_i2s (peer), address_resolutions); | ||
652 | /* Resolve address to string */ | 647 | /* Resolve address to string */ |
653 | GNUNET_TRANSPORT_address_to_string (cfg, address, numeric, | 648 | GNUNET_TRANSPORT_address_to_string (cfg, address, numeric, |
654 | RESOLUTION_TIMEOUT, &process_string, | 649 | RESOLUTION_TIMEOUT, &process_string, |
@@ -664,6 +659,7 @@ testservice_task (void *cls, | |||
664 | int counter = 0; | 659 | int counter = 0; |
665 | int try_connect = 0; | 660 | int try_connect = 0; |
666 | 661 | ||
662 | |||
667 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) | 663 | if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_TIMEOUT)) |
668 | { | 664 | { |
669 | FPRINTF (stderr, _("Service `%s' is not running\n"), "transport"); | 665 | FPRINTF (stderr, _("Service `%s' is not running\n"), "transport"); |
@@ -692,6 +688,9 @@ testservice_task (void *cls, | |||
692 | return; | 688 | return; |
693 | } | 689 | } |
694 | 690 | ||
691 | end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | ||
692 | &shutdown_task, | ||
693 | NULL); | ||
695 | 694 | ||
696 | if (try_connect) | 695 | if (try_connect) |
697 | { | 696 | { |
@@ -733,11 +732,12 @@ testservice_task (void *cls, | |||
733 | return; | 732 | return; |
734 | } | 733 | } |
735 | GNUNET_TRANSPORT_try_connect (handle, &pid); | 734 | GNUNET_TRANSPORT_try_connect (handle, &pid); |
735 | /* | ||
736 | end = GNUNET_SCHEDULER_add_delayed (benchmark_send ? | 736 | end = GNUNET_SCHEDULER_add_delayed (benchmark_send ? |
737 | GNUNET_TIME_UNIT_FOREVER_REL : | 737 | GNUNET_TIME_UNIT_FOREVER_REL : |
738 | GNUNET_TIME_UNIT_SECONDS, | 738 | GNUNET_TIME_UNIT_SECONDS, |
739 | &do_disconnect, | 739 | &do_disconnect, |
740 | NULL); | 740 | NULL);*/ |
741 | } | 741 | } |
742 | else if (benchmark_receive) /* Benchmark receiving */ | 742 | else if (benchmark_receive) /* Benchmark receiving */ |
743 | { | 743 | { |
@@ -751,16 +751,16 @@ testservice_task (void *cls, | |||
751 | } | 751 | } |
752 | GNUNET_TRANSPORT_try_connect (handle, &pid); | 752 | GNUNET_TRANSPORT_try_connect (handle, &pid); |
753 | start_time = GNUNET_TIME_absolute_get (); | 753 | start_time = GNUNET_TIME_absolute_get (); |
754 | end = | 754 | /* |
755 | GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | 755 | end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, |
756 | &do_disconnect, NULL); | 756 | &do_disconnect, NULL);*/ |
757 | } | 757 | } |
758 | else if (iterate_connections) /* -i: List all active addresses once */ | 758 | else if (iterate_connections) /* -i: List all active addresses once */ |
759 | { | 759 | { |
760 | peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO); | 760 | peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO); |
761 | address_resolution_in_progress = GNUNET_YES; | 761 | address_resolution_in_progress = GNUNET_YES; |
762 | pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, | 762 | pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, |
763 | GNUNET_NO, | 763 | GNUNET_YES, |
764 | TIMEOUT, | 764 | TIMEOUT, |
765 | &process_address, (void *) cfg); | 765 | &process_address, (void *) cfg); |
766 | } | 766 | } |
@@ -769,7 +769,7 @@ testservice_task (void *cls, | |||
769 | peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO); | 769 | peers = GNUNET_CONTAINER_multihashmap_create (20, GNUNET_NO); |
770 | address_resolution_in_progress = GNUNET_YES; | 770 | address_resolution_in_progress = GNUNET_YES; |
771 | pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, | 771 | pic = GNUNET_TRANSPORT_peer_get_active_addresses (cfg, NULL, |
772 | GNUNET_YES, | 772 | GNUNET_NO, |
773 | TIMEOUT, | 773 | TIMEOUT, |
774 | &process_address, (void *) cfg); | 774 | &process_address, (void *) cfg); |
775 | } | 775 | } |
@@ -790,10 +790,6 @@ testservice_task (void *cls, | |||
790 | GNUNET_break (0); | 790 | GNUNET_break (0); |
791 | return; | 791 | return; |
792 | } | 792 | } |
793 | |||
794 | end = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, | ||
795 | &shutdown_task, | ||
796 | NULL); | ||
797 | } | 793 | } |
798 | 794 | ||
799 | 795 | ||