diff options
author | Florian Dold <florian.dold@gmail.com> | 2013-07-24 13:52:21 +0000 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2013-07-24 13:52:21 +0000 |
commit | 5764b04e161a8908d277cd2f0610261c590e62cf (patch) | |
tree | 6c5709b3ac4f937106358d575af21416d5ed9452 | |
parent | 145ec2625b75e1141a6d080a8cd9d93290431c41 (diff) | |
download | gnunet-5764b04e161a8908d277cd2f0610261c590e62cf.tar.gz gnunet-5764b04e161a8908d277cd2f0610261c590e62cf.zip |
- logging
-rw-r--r-- | src/mesh/mesh_api.c | 7 | ||||
-rw-r--r-- | 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, | |||
1722 | const struct GNUNET_MessageHeader *msg = GNUNET_MQ_impl_current (mq); | 1722 | const struct GNUNET_MessageHeader *msg = GNUNET_MQ_impl_current (mq); |
1723 | uint16_t msize; | 1723 | uint16_t msize; |
1724 | 1724 | ||
1725 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq", | ||
1726 | "writing message (t: %s, s: %s) to buffer\n", | ||
1727 | ntohs (msg->type), ntohs (msg->size)); | ||
1728 | |||
1725 | state->th = NULL; | 1729 | state->th = NULL; |
1726 | if (NULL == buf) | 1730 | if (NULL == buf) |
1727 | { | 1731 | { |
@@ -1752,6 +1756,9 @@ mesh_mq_send_impl (struct GNUNET_MQ_Handle *mq, | |||
1752 | 1756 | ||
1753 | GNUNET_assert (NULL == state->th); | 1757 | GNUNET_assert (NULL == state->th); |
1754 | GNUNET_MQ_impl_send_commit (mq); | 1758 | GNUNET_MQ_impl_send_commit (mq); |
1759 | GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "mesh-mq", | ||
1760 | "calling ntr for message (t: %s, s: %s)\n", | ||
1761 | ntohs (msg->type), ntohs (msg->size)); | ||
1755 | state->th = | 1762 | state->th = |
1756 | GNUNET_MESH_notify_transmit_ready (state->tunnel, | 1763 | GNUNET_MESH_notify_transmit_ready (state->tunnel, |
1757 | /* FIXME: add option for corking */ | 1764 | /* 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) | |||
690 | if (NULL == mq->assoc_map) | 690 | if (NULL == mq->assoc_map) |
691 | return NULL; | 691 | return NULL; |
692 | val = GNUNET_CONTAINER_multihashmap32_get (mq->assoc_map, request_id); | 692 | val = GNUNET_CONTAINER_multihashmap32_get (mq->assoc_map, request_id); |
693 | GNUNET_assert (NULL != val); | 693 | GNUNET_CONTAINER_multihashmap32_remove_all (mq->assoc_map, request_id); |
694 | GNUNET_assert (GNUNET_YES == | ||
695 | GNUNET_CONTAINER_multihashmap32_remove (mq->assoc_map, request_id, val)); | ||
696 | return val; | 694 | return val; |
697 | } | 695 | } |
698 | 696 | ||