aboutsummaryrefslogtreecommitdiff
path: root/src/peerinfo-tool/gnunet-peerinfo.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-06-11 09:42:14 +0000
committerChristian Grothoff <christian@grothoff.org>2014-06-11 09:42:14 +0000
commit28159c1f3c6b967074219e4ca5a16b626f8ed818 (patch)
tree6152c4949bb6ddc2638354c08680fd636491c29f /src/peerinfo-tool/gnunet-peerinfo.c
parenta111a1f9a92a74e281fa521325e7df6d52282c9e (diff)
downloadgnunet-28159c1f3c6b967074219e4ca5a16b626f8ed818.tar.gz
gnunet-28159c1f3c6b967074219e4ca5a16b626f8ed818.zip
-cleanup
Diffstat (limited to 'src/peerinfo-tool/gnunet-peerinfo.c')
-rw-r--r--src/peerinfo-tool/gnunet-peerinfo.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index c70724158..d826a8050 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -334,8 +334,7 @@ print_address (void *cls,
334 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg, 334 ar->atsc = GNUNET_TRANSPORT_address_to_string (cfg,
335 address, 335 address,
336 no_resolve, 336 no_resolve,
337 GNUNET_TIME_relative_multiply 337 TIMEOUT,
338 (GNUNET_TIME_UNIT_SECONDS, 10),
339 &process_resolved_address, ar); 338 &process_resolved_address, ar);
340 return GNUNET_OK; 339 return GNUNET_OK;
341} 340}
@@ -588,10 +587,10 @@ parse_hello_uri (const char *put_uri)
588{ 587{
589 struct GNUNET_HELLO_Message *hello = NULL; 588 struct GNUNET_HELLO_Message *hello = NULL;
590 589
591 int ret = GNUNET_HELLO_parse_uri(put_uri, 590 int ret = GNUNET_HELLO_parse_uri (put_uri,
592 &my_peer_identity.public_key, 591 &my_peer_identity.public_key,
593 &hello, 592 &hello,
594 &GPI_plugins_find); 593 &GPI_plugins_find);
595 594
596 if (NULL != hello) 595 if (NULL != hello)
597 { 596 {
@@ -604,10 +603,6 @@ parse_hello_uri (const char *put_uri)
604 tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL); 603 tt = GNUNET_SCHEDULER_add_now (&state_machine, NULL);
605 GNUNET_free (hello); 604 GNUNET_free (hello);
606 } 605 }
607
608 /* wait 1s to give peerinfo operation a chance to succeed */
609 /* FIXME: current peerinfo API sucks to require this; not to mention
610 that we get no feedback to determine if the operation actually succeeded */
611 return ret; 606 return ret;
612} 607}
613 608