[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r23604 - gnunet/src/testbed
From: |
gnunet |
Subject: |
[GNUnet-SVN] r23604 - gnunet/src/testbed |
Date: |
Tue, 4 Sep 2012 12:28:11 +0200 |
Author: harsha
Date: 2012-09-04 12:28:11 +0200 (Tue, 04 Sep 2012)
New Revision: 23604
Modified:
gnunet/src/testbed/gnunet-service-testbed.c
Log:
sane logging and code
Modified: gnunet/src/testbed/gnunet-service-testbed.c
===================================================================
--- gnunet/src/testbed/gnunet-service-testbed.c 2012-09-04 10:01:37 UTC (rev
23603)
+++ gnunet/src/testbed/gnunet-service-testbed.c 2012-09-04 10:28:11 UTC (rev
23604)
@@ -2044,8 +2044,9 @@
GNUNET_free (other_peer_str);
return;
}
- LOG_DEBUG ("Peer %4s connected to peer %4s\n", new_peer_str, other_peer_str);
GNUNET_free (new_peer_str);
+ LOG_DEBUG ("Peer %4s connected to peer %4s\n", other_peer_str,
+ GNUNET_i2s (&occ->peer_identity));
GNUNET_free (other_peer_str);
if (GNUNET_SCHEDULER_NO_TASK != occ->send_hello_task)
{
@@ -2193,17 +2194,15 @@
if ((NULL == occ->p1th) || (NULL == occ->p2th))
{
occ->emsg = GNUNET_strdup ("Cannot connect to TRANSPORTs of peers");
- goto send_failure;
+ GNUNET_SCHEDULER_cancel (occ->timeout_task);
+ occ->timeout_task = GNUNET_SCHEDULER_add_now (&timeout_overlay_connect,
+ occ);
+ return;
}
LOG_DEBUG ("Acquiring HELLO of peer %s\n",
GNUNET_i2s (&occ->other_peer_identity));
occ->emsg = GNUNET_strdup ("Timeout while acquiring HELLO message");
occ->ghh = GNUNET_TRANSPORT_get_hello (occ->p2th, &hello_update_cb, occ);
- return;
-
-send_failure:
- GNUNET_SCHEDULER_cancel (occ->timeout_task);
- occ->timeout_task = GNUNET_SCHEDULER_add_now (&timeout_overlay_connect, occ);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r23604 - gnunet/src/testbed,
gnunet <=