From ebdafc8a9fa3f05eaad9a283b346996c83419f13 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Tue, 10 Dec 2013 16:51:54 +0000 Subject: [PATCH] - wip --- src/mesh/gnunet-service-mesh_channel.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_channel.c b/src/mesh/gnunet-service-mesh_channel.c index bd12ede37..8102d750a 100644 --- a/src/mesh/gnunet-service-mesh_channel.c +++ b/src/mesh/gnunet-service-mesh_channel.c @@ -735,7 +735,9 @@ ch_message_sent (void *cls, rel = copy->rel; if (GNUNET_SCHEDULER_NO_TASK == rel->retry_task) { - LOG (GNUNET_ERROR_TYPE_DEBUG, "!! scheduling retry %u\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "!! scheduling retry in %s\n", + GNUNET_STRINGS_relative_time_to_string (rel->expected_delay, + GNUNET_YES)); if (0 != rel->expected_delay.rel_value_us) { LOG (GNUNET_ERROR_TYPE_DEBUG, "!! delay != 0\n"); @@ -745,7 +747,7 @@ ch_message_sent (void *cls, } else { - LOG (GNUNET_ERROR_TYPE_DEBUG, "!! delay 0\n"); + LOG (GNUNET_ERROR_TYPE_DEBUG, "!! delay reset\n"); rel->retry_timer = MESH_RETRANSMIT_TIME; } LOG (GNUNET_ERROR_TYPE_DEBUG, "!! using delay %s\n", @@ -1113,8 +1115,8 @@ channel_confirm (struct MeshChannel *ch, int fwd) enum MeshChannelState oldstate; LOG (GNUNET_ERROR_TYPE_DEBUG, - " channel confirm %s %s:%X\n", - GM_f2s (fwd), GMT_2s (ch->t), ch->gid); + " channel confirm %s %s\n", + GM_f2s (fwd), GMCH_2s (ch)); oldstate = ch->state; ch->state = MESH_CHANNEL_READY; @@ -2273,6 +2275,7 @@ GMCH_send_prebuilt_message (const struct GNUNET_MessageHeader *message, NULL != existing_copy, &ch_message_sent, q); /* q itself is stored in copy */ + GNUNET_assert (NULL != q->q); } else { -- 2.25.1