diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-05 12:38:05 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-03-05 12:38:05 +0000 |
commit | eb6cfba7b01459be713171e66043c1b4317cb427 (patch) | |
tree | 0f8b238d25c9c1d8550d4261bf795a9caa086f1e /src | |
parent | 9e6ab20fa33948e18f544fc14f549375b2fabc21 (diff) | |
download | gnunet-eb6cfba7b01459be713171e66043c1b4317cb427.tar.gz gnunet-eb6cfba7b01459be713171e66043c1b4317cb427.zip |
be verbose while sending error message instead of emitting a warning
Diffstat (limited to 'src')
-rw-r--r-- | src/testbed/gnunet-service-testbed.c | 9 | ||||
-rw-r--r-- | src/testbed/gnunet-service-testbed_oc.c | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c index 2e1af39b9..2435ba50e 100644 --- a/src/testbed/gnunet-service-testbed.c +++ b/src/testbed/gnunet-service-testbed.c | |||
@@ -708,8 +708,9 @@ GST_forwarded_operation_timeout (void *cls, | |||
708 | struct ForwardedOperationContext *fopc = cls; | 708 | struct ForwardedOperationContext *fopc = cls; |
709 | 709 | ||
710 | GNUNET_TESTBED_forward_operation_msg_cancel_ (fopc->opc); | 710 | GNUNET_TESTBED_forward_operation_msg_cancel_ (fopc->opc); |
711 | LOG (GNUNET_ERROR_TYPE_WARNING, "A forwarded operation has timed out\n"); | 711 | LOG (GNUNET_ERROR_TYPE_DEBUG, "A forwarded operation has timed out\n"); |
712 | GST_send_operation_fail_msg (fopc->client, fopc->operation_id, "Timeout"); | 712 | GST_send_operation_fail_msg (fopc->client, fopc->operation_id, |
713 | "A forwarded operation has timed out"); | ||
713 | GNUNET_SERVER_client_drop (fopc->client); | 714 | GNUNET_SERVER_client_drop (fopc->client); |
714 | GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc); | 715 | GNUNET_CONTAINER_DLL_remove (fopcq_head, fopcq_tail, fopc); |
715 | GNUNET_free (fopc); | 716 | GNUNET_free (fopc); |
@@ -742,7 +743,9 @@ lcf_forwarded_operation_timeout (void *cls, | |||
742 | // GST_forwarded_operation_timeout (lcf->fopc, tc); | 743 | // GST_forwarded_operation_timeout (lcf->fopc, tc); |
743 | LOG (GNUNET_ERROR_TYPE_WARNING, | 744 | LOG (GNUNET_ERROR_TYPE_WARNING, |
744 | "A forwarded controller link operation has timed out\n"); | 745 | "A forwarded controller link operation has timed out\n"); |
745 | send_controller_link_response (lcf->client, lcf->operation_id, NULL, "Timeout"); | 746 | send_controller_link_response (lcf->client, lcf->operation_id, NULL, |
747 | "A forwarded controller link operation has " | ||
748 | "timed out\n"); | ||
746 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id); | 749 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == lcf_proc_task_id); |
747 | lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf); | 750 | lcf_proc_task_id = GNUNET_SCHEDULER_add_now (&lcf_proc_task, lcf); |
748 | } | 751 | } |
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c index 79ac03bf1..10da67779 100644 --- a/src/testbed/gnunet-service-testbed_oc.c +++ b/src/testbed/gnunet-service-testbed_oc.c | |||
@@ -469,9 +469,9 @@ timeout_overlay_connect (void *cls, | |||
469 | 469 | ||
470 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task); | 470 | GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != occ->timeout_task); |
471 | occ->timeout_task = GNUNET_SCHEDULER_NO_TASK; | 471 | occ->timeout_task = GNUNET_SCHEDULER_NO_TASK; |
472 | LOG (GNUNET_ERROR_TYPE_WARNING, | 472 | /* LOG (GNUNET_ERROR_TYPE_WARNING, */ |
473 | "0x%llx: Timeout while connecting peers %u and %u: %s\n", occ->op_id, | 473 | /* "0x%llx: Timeout while connecting peers %u and %u: %s\n", occ->op_id, */ |
474 | occ->peer->id, occ->other_peer_id, occ->emsg); | 474 | /* occ->peer->id, occ->other_peer_id, occ->emsg); */ |
475 | GST_send_operation_fail_msg (occ->client, occ->op_id, occ->emsg); | 475 | GST_send_operation_fail_msg (occ->client, occ->op_id, occ->emsg); |
476 | cleanup_occ (occ); | 476 | cleanup_occ (occ); |
477 | } | 477 | } |