aboutsummaryrefslogtreecommitdiff
path: root/src/peerinfo-tool/gnunet-peerinfo.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-07-12 09:15:23 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-07-12 09:15:23 +0000
commit0c053e7ae2e82c5664c68cddb8d1ecec8108b926 (patch)
tree0063a66af06c5f5ed2eddda99743c7d34df907d2 /src/peerinfo-tool/gnunet-peerinfo.c
parent817bb023f88341e7ccfa986182878d7e75300e8f (diff)
downloadgnunet-0c053e7ae2e82c5664c68cddb8d1ecec8108b926.tar.gz
gnunet-0c053e7ae2e82c5664c68cddb8d1ecec8108b926.zip
fix state machine
Diffstat (limited to 'src/peerinfo-tool/gnunet-peerinfo.c')
-rw-r--r--src/peerinfo-tool/gnunet-peerinfo.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index ba311dced..bae7fae4c 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -723,19 +723,17 @@ state_machine (void *cls,
723 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, NULL, 723 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, NULL,
724 TIMEOUT, 724 TIMEOUT,
725 &print_peer_info, NULL); 725 &print_peer_info, NULL);
726 return;
727 } 726 }
728 else if (GNUNET_YES == get_self) 727 else if (GNUNET_YES == get_self)
729 { 728 {
730 struct GNUNET_CRYPTO_HashAsciiEncoded enc; 729 struct GNUNET_CRYPTO_HashAsciiEncoded enc;
731
732 get_self = GNUNET_NO; 730 get_self = GNUNET_NO;
733 GNUNET_CRYPTO_hash_to_enc (&my_peer_identity.hashPubKey, &enc); 731 GNUNET_CRYPTO_hash_to_enc (&my_peer_identity.hashPubKey, &enc);
734 if (be_quiet) 732 if (be_quiet)
735 printf ("%s\n", (char *) &enc); 733 printf ("%s\n", (char *) &enc);
736 else 734 else
737 printf (_("I am peer `%s'.\n"), (const char *) &enc); 735 printf (_("I am peer `%s'.\n"), (const char *) &enc);
738 736 tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
739 } 737 }
740 else if (GNUNET_YES == get_uri) 738 else if (GNUNET_YES == get_uri)
741 { 739 {
@@ -743,13 +741,11 @@ state_machine (void *cls,
743 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity, 741 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity,
744 TIMEOUT, &print_my_uri, NULL); 742 TIMEOUT, &print_my_uri, NULL);
745 get_uri = GNUNET_NO; 743 get_uri = GNUNET_NO;
746 return;
747 } 744 }
748 else if (NULL != dump_hello) 745 else if (NULL != dump_hello)
749 { 746 {
750 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity, 747 pic = GNUNET_PEERINFO_iterate (peerinfo, include_friend_only, &my_peer_identity,
751 TIMEOUT, &dump_my_hello, NULL); 748 TIMEOUT, &dump_my_hello, NULL);
752 return;
753 } 749 }
754 else if (GNUNET_YES == default_operation) 750 else if (GNUNET_YES == default_operation)
755 { 751 {
@@ -757,11 +753,12 @@ state_machine (void *cls,
757 default_operation = GNUNET_NO; 753 default_operation = GNUNET_NO;
758 get_info = GNUNET_YES; 754 get_info = GNUNET_YES;
759 tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL); 755 tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
760 return;
761 } 756 }
762 757 else
763 758 {
764 GNUNET_SCHEDULER_shutdown (); 759 GNUNET_SCHEDULER_shutdown ();
760 }
761 default_operation = GNUNET_NO;
765} 762}
766 763
767 764