aboutsummaryrefslogtreecommitdiff
path: root/src/transport
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2012-11-08 12:14:38 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2012-11-08 12:14:38 +0000
commit7654fc4f50812076c2f1374ac95af49db945a8b3 (patch)
treee3c8c28480b924c9222cce2bf6aba1c2856e4b79 /src/transport
parent7cae25dda2a746beebb2319291422647948eee74 (diff)
downloadgnunet-7654fc4f50812076c2f1374ac95af49db945a8b3.tar.gz
gnunet-7654fc4f50812076c2f1374ac95af49db945a8b3.zip
- changes
Diffstat (limited to 'src/transport')
-rw-r--r--src/transport/gnunet-transport.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 19abda0ea..a4fb227cc 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -456,7 +456,11 @@ notify_connect (void *cls, const struct GNUNET_PeerIdentity *peer,
456 ret = 0; 456 ret = 0;
457 if (try_connect) 457 if (try_connect)
458 { 458 {
459 /*FIXME */ 459 /* all done, terminate instantly */
460 if (verbosity > 0)
461 FPRINTF (stdout, _("Successfully connected to %s\n"), GNUNET_i2s (peer));
462 GNUNET_SCHEDULER_cancel (end);
463 end = GNUNET_SCHEDULER_add_now (&do_disconnect, NULL);
460 } 464 }
461 else if (benchmark_send) 465 else if (benchmark_send)
462 { 466 {
@@ -700,6 +704,12 @@ testservice_task (void *cls,
700 &notify_receive, 704 &notify_receive,
701 &notify_connect, 705 &notify_connect,
702 &notify_disconnect); 706 &notify_disconnect);
707 if (NULL == handle)
708 {
709 FPRINTF (stderr, _("Failed to connect to transport service\n"));
710 return;
711 }
712
703 GNUNET_TRANSPORT_try_connect (handle, &pid); 713 GNUNET_TRANSPORT_try_connect (handle, &pid);
704 714
705 } 715 }
@@ -716,6 +726,11 @@ testservice_task (void *cls,
716 &notify_receive, 726 &notify_receive,
717 &notify_connect, 727 &notify_connect,
718 &notify_disconnect); 728 &notify_disconnect);
729 if (NULL == handle)
730 {
731 FPRINTF (stderr, _("Failed to connect to transport service\n"));
732 return;
733 }
719 GNUNET_TRANSPORT_try_connect (handle, &pid); 734 GNUNET_TRANSPORT_try_connect (handle, &pid);
720 end = GNUNET_SCHEDULER_add_delayed (benchmark_send ? 735 end = GNUNET_SCHEDULER_add_delayed (benchmark_send ?
721 GNUNET_TIME_UNIT_FOREVER_REL : 736 GNUNET_TIME_UNIT_FOREVER_REL :
@@ -728,6 +743,11 @@ testservice_task (void *cls,
728 handle = 743 handle =
729 GNUNET_TRANSPORT_connect (cfg, NULL, NULL, &notify_receive, 744 GNUNET_TRANSPORT_connect (cfg, NULL, NULL, &notify_receive,
730 &notify_connect, &notify_disconnect); 745 &notify_connect, &notify_disconnect);
746 if (NULL == handle)
747 {
748 FPRINTF (stderr, _("Failed to connect to transport service\n"));
749 return;
750 }
731 GNUNET_TRANSPORT_try_connect (handle, &pid); 751 GNUNET_TRANSPORT_try_connect (handle, &pid);
732 start_time = GNUNET_TIME_absolute_get (); 752 start_time = GNUNET_TIME_absolute_get ();
733 end = 753 end =
@@ -760,7 +780,7 @@ testservice_task (void *cls,
760 &monitor_notify_disconnect); 780 &monitor_notify_disconnect);
761 if (NULL == handle) 781 if (NULL == handle)
762 { 782 {
763 GNUNET_SCHEDULER_add_now (&shutdown_task, NULL); 783 FPRINTF (stderr, _("Failed to connect to transport service\n"));
764 return; 784 return;
765 } 785 }
766 } 786 }