From c712a1f8b2df7406ac6d7a3346e2b066a23b37ef Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Mon, 9 Dec 2013 19:58:51 +0000 Subject: [PATCH] - crazyness (see doc) --- src/mesh/gnunet-service-mesh_tunnel.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index f03607409..4658d2943 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c @@ -656,13 +656,23 @@ send_queued_data (struct MeshTunnel3 *t) LOG (GNUNET_ERROR_TYPE_DEBUG, " tq head: %p\n", t->tq_head); for (tq = t->tq_head; NULL != tq && room > 0; tq = next) { - LOG (GNUNET_ERROR_TYPE_DEBUG, " data on channel %s\n", GMCH_2s (tq->ch)); + /* GMCH_send_prebuilt_message will call GMT_cancel on the current + * queue handler, therefore free'ing tq before calling GMT_send. + * Since the data to send is part of tq, we need to provide a copy, + * so the data is not invalidated. + */ + struct GNUNET_MessageHeader *msg = (struct GNUNET_MessageHeader *) &tq[1]; + size_t m_size = ntohs (msg->size); + char cbuf[m_size]; + struct GNUNET_MessageHeader *copy = (struct GNUNET_MessageHeader *) cbuf; + + LOG (GNUNET_ERROR_TYPE_DEBUG, " msg on channel %s\n", GMCH_2s (tq->ch)); next = tq->next; room--; - GMCH_send_prebuilt_message ((struct GNUNET_MessageHeader *) &tq[1], + memcpy (copy, msg, m_size); + GMCH_send_prebuilt_message (copy, tq->ch, GMCH_is_origin (tq->ch, GNUNET_YES), NULL); - unqueue_data (tq); } LOG (GNUNET_ERROR_TYPE_DEBUG, "GMT_send_queued_data end\n", -- 2.25.1