diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-04 21:12:42 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-01-04 21:12:42 +0000 |
commit | 93f5349f1993c32e4360beaff084ad32df0f7acc (patch) | |
tree | cffaf85ede07605038bd4742fa10ba8e40376229 /src/testbed/gnunet-service-testbed.c | |
parent | 5e404ae4f96408aa15dfee884deee89b99dcb0c3 (diff) | |
download | gnunet-93f5349f1993c32e4360beaff084ad32df0f7acc.tar.gz gnunet-93f5349f1993c32e4360beaff084ad32df0f7acc.zip |
- extra logging
Diffstat (limited to 'src/testbed/gnunet-service-testbed.c')
-rw-r--r-- | src/testbed/gnunet-service-testbed.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 1bb249122..0f31fe771 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -422,6 +422,7 @@ struct LCFContextQueue | |||
422 | /** | 422 | /** |
423 | * A peer | 423 | * A peer |
424 | */ | 424 | */ |
425 | |||
425 | struct Peer | 426 | struct Peer |
426 | { | 427 | { |
427 | 428 | ||
@@ -3556,7 +3557,9 @@ timeout_rocc_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3556 | { | 3557 | { |
3557 | struct RequestOverlayConnectContext *rocc = cls; | 3558 | struct RequestOverlayConnectContext *rocc = cls; |
3558 | 3559 | ||
3560 | GNUNET_assert (rocc->timeout_rocc_task_id != GNUNET_SCHEDULER_NO_TASK); | ||
3559 | rocc->timeout_rocc_task_id = GNUNET_SCHEDULER_NO_TASK; | 3561 | rocc->timeout_rocc_task_id = GNUNET_SCHEDULER_NO_TASK; |
3562 | LOG_DEBUG ("rocc timed out\n"); | ||
3560 | cleanup_rocc (rocc); | 3563 | cleanup_rocc (rocc); |
3561 | } | 3564 | } |
3562 | 3565 | ||
@@ -3611,6 +3614,8 @@ rocc_hello_sent_cb (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3611 | 3614 | ||
3612 | rocc->ohh = NULL; | 3615 | rocc->ohh = NULL; |
3613 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rocc->attempt_connect_task_id); | 3616 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == rocc->attempt_connect_task_id); |
3617 | LOG_DEBUG ("HELLO of peer %4s sent to local peer with id: %u\n", | ||
3618 | GNUNET_i2s (&rocc->a_id), rocc->peer->id); | ||
3614 | if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason) | 3619 | if (GNUNET_SCHEDULER_REASON_TIMEOUT == tc->reason) |
3615 | { | 3620 | { |
3616 | GNUNET_break (0); | 3621 | GNUNET_break (0); |
@@ -3637,7 +3642,10 @@ attempt_connect_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
3637 | { | 3642 | { |
3638 | struct RequestOverlayConnectContext *rocc = cls; | 3643 | struct RequestOverlayConnectContext *rocc = cls; |
3639 | 3644 | ||
3645 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != rocc->attempt_connect_task_id); | ||
3640 | rocc->attempt_connect_task_id = GNUNET_SCHEDULER_NO_TASK; | 3646 | rocc->attempt_connect_task_id = GNUNET_SCHEDULER_NO_TASK; |
3647 | LOG_DEBUG ("Offering HELLO of peer %4s to local peer with id: %u\n", | ||
3648 | GNUNET_i2s (&rocc->a_id), rocc->peer->id); | ||
3641 | rocc->ohh = GNUNET_TRANSPORT_offer_hello (rocc->tcc.th, rocc->hello, | 3649 | rocc->ohh = GNUNET_TRANSPORT_offer_hello (rocc->tcc.th, rocc->hello, |
3642 | rocc_hello_sent_cb, rocc); | 3650 | rocc_hello_sent_cb, rocc); |
3643 | if (NULL == rocc->ohh) | 3651 | if (NULL == rocc->ohh) |
@@ -3708,6 +3716,10 @@ handle_overlay_request_connect (void *cls, struct GNUNET_SERVER_Client *client, | |||
3708 | } | 3716 | } |
3709 | rocc = GNUNET_malloc (sizeof (struct RequestOverlayConnectContext)); | 3717 | rocc = GNUNET_malloc (sizeof (struct RequestOverlayConnectContext)); |
3710 | GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc); | 3718 | GNUNET_CONTAINER_DLL_insert_tail (roccq_head, roccq_tail, rocc); |
3719 | memcpy (&rocc->a_id, &msg->peer_identity, | ||
3720 | sizeof (struct GNUNET_PeerIdentity)); | ||
3721 | LOG_DEBUG ("Received request for overlay connection to peer %4s\n", | ||
3722 | GNUNET_i2s (&rocc->a_id)); | ||
3711 | rocc->peer = peer; | 3723 | rocc->peer = peer; |
3712 | rocc->peer->reference_cnt++; | 3724 | rocc->peer->reference_cnt++; |
3713 | rocc->tcc.th = GNUNET_TRANSPORT_connect (rocc->peer->details.local.cfg, NULL, rocc, | 3725 | rocc->tcc.th = GNUNET_TRANSPORT_connect (rocc->peer->details.local.cfg, NULL, rocc, |
@@ -3719,8 +3731,6 @@ handle_overlay_request_connect (void *cls, struct GNUNET_SERVER_Client *client, | |||
3719 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 3731 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); |
3720 | return; | 3732 | return; |
3721 | } | 3733 | } |
3722 | memcpy (&rocc->a_id, &msg->peer_identity, | ||
3723 | sizeof (struct GNUNET_PeerIdentity)); | ||
3724 | rocc->tcc.pid = &rocc->a_id; | 3734 | rocc->tcc.pid = &rocc->a_id; |
3725 | rocc->hello = GNUNET_malloc (hsize); | 3735 | rocc->hello = GNUNET_malloc (hsize); |
3726 | memcpy (rocc->hello, msg->hello, hsize); | 3736 | memcpy (rocc->hello, msg->hello, hsize); |