From 5764b04e161a8908d277cd2f0610261c590e62cf Mon Sep 17 00:00:00 2001 From: Florian Dold Date: Wed, 24 Jul 2013 13:52:21 +0000 Subject: [PATCH] - logging --- src/mesh/mesh_api.c | 7 +++++++ src/util/mq.c | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/mesh/mesh_api.c b/src/mesh/mesh_api.c index fc91801ef..230d5bbbf 100644 --- a/src/mesh/mesh_api.c +++ b/src/mesh/mesh_api.c @@ -1722,6 +1722,10 @@ mesh_mq_ntr (void *cls, size_t size, const struct GNUNET_MessageHeader *msg = GNUNET_MQ_impl_current (mq); uint16_t msize; + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq", + "writing message (t: %s, s: %s) to buffer\n", + ntohs (msg->type), ntohs (msg->size)); + state->th = NULL; if (NULL == buf) { @@ -1752,6 +1756,9 @@ mesh_mq_send_impl (struct GNUNET_MQ_Handle *mq, GNUNET_assert (NULL == state->th); GNUNET_MQ_impl_send_commit (mq); + GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq", + "calling ntr for message (t: %s, s: %s)\n", + ntohs (msg->type), ntohs (msg->size)); state->th = GNUNET_MESH_notify_transmit_ready (state->tunnel, /* FIXME: add option for corking */ diff --git a/src/util/mq.c b/src/util/mq.c index 68134881e..9a3092f65 100644 --- a/src/util/mq.c +++ b/src/util/mq.c @@ -690,9 +690,7 @@ GNUNET_MQ_assoc_remove (struct GNUNET_MQ_Handle *mq, uint32_t request_id) if (NULL == mq->assoc_map) return NULL; val = GNUNET_CONTAINER_multihashmap32_get (mq->assoc_map, request_id); - GNUNET_assert (NULL != val); - GNUNET_assert (GNUNET_YES == - GNUNET_CONTAINER_multihashmap32_remove (mq->assoc_map, request_id, val)); + GNUNET_CONTAINER_multihashmap32_remove_all (mq->assoc_map, request_id); return val; } -- 2.25.1