[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31462 - gnunet/src/mesh
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31462 - gnunet/src/mesh |
Date: |
Tue, 17 Dec 2013 05:19:11 +0100 |
Author: bartpolot
Date: 2013-12-17 05:19:11 +0100 (Tue, 17 Dec 2013)
New Revision: 31462
Modified:
gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
-call GMT_sent when canceling tunneled buffered messages before the KX completes
Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-17 03:37:16 UTC
(rev 31461)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c 2013-12-17 04:19:11 UTC
(rev 31462)
@@ -643,13 +643,13 @@
* Delete a queued message: either was sent or the channel was destroyed
* before the tunnel's key exchange had a chance to finish.
*
- * @param tq Queue handle.
+ * @param tqd Delayed queue handle.
*/
static void
-unqueue_data (struct MeshTunnelDelayed *tq)
+unqueue_data (struct MeshTunnelDelayed *tqd)
{
- GNUNET_CONTAINER_DLL_remove (tq->t->tq_head, tq->t->tq_tail, tq);
- GNUNET_free (tq);
+ GNUNET_CONTAINER_DLL_remove (tqd->t->tq_head, tqd->t->tq_tail, tqd);
+ GNUNET_free (tqd);
}
@@ -1150,7 +1150,7 @@
{
GNUNET_STATISTICS_update (stats, "# data on unknown channel",
1, GNUNET_NO);
- LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel %X unknown\n",
+ LOG (GNUNET_ERROR_TYPE_DEBUG, "WARNING channel 0x%X unknown\n",
ntohl (msg->chid));
return;
}
@@ -2357,6 +2357,10 @@
else if (NULL != q->tqd)
{
unqueue_data (q->tqd);
+ q->tqd = NULL;
+ if (NULL != q->cont)
+ q->cont (q->cont_cls, NULL, q, 0, 0);
+ GNUNET_free (q);
}
else
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31462 - gnunet/src/mesh,
gnunet <=