[GNUnet-SVN] r28306 - in gnunet/src: mesh util

[gnunet]

Author: dold
Date: 2013-07-24 15:52:21 +0200 (Wed, 24 Jul 2013)
New Revision: 28306

Modified:
   gnunet/src/mesh/mesh_api.c
   gnunet/src/util/mq.c
Log:
- logging


Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-07-24 13:50:40 UTC (rev 28305)
+++ gnunet/src/mesh/mesh_api.c  2013-07-24 13:52:21 UTC (rev 28306)
@@ -1722,6 +1722,10 @@
   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 @@
 
   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 */

Modified: gnunet/src/util/mq.c
===================================================================
--- gnunet/src/util/mq.c        2013-07-24 13:50:40 UTC (rev 28305)
+++ gnunet/src/util/mq.c        2013-07-24 13:52:21 UTC (rev 28306)
@@ -690,9 +690,7 @@
   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;
 }