[GNUnet-SVN] r31267 - gnunet/src/mesh

[gnunet]

Author: bartpolot
Date: 2013-12-10 20:01:02 +0100 (Tue, 10 Dec 2013)
New Revision: 31267

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- refine assert condition


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-10 16:52:56 UTC 
(rev 31266)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-10 19:01:02 UTC 
(rev 31267)
@@ -2275,7 +2275,7 @@
                                           NULL != existing_copy,
                                           &ch_message_sent, q);
         /* q itself is stored in copy */
-        GNUNET_assert (NULL != q->q);
+        GNUNET_assert (NULL != q->q || GNUNET_NO != ch->destroy);
       }
       else
       {

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-10 16:52:56 UTC 
(rev 31266)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-10 19:01:02 UTC 
(rev 31267)
@@ -815,7 +815,7 @@
     LOG (GNUNET_ERROR_TYPE_DEBUG, " sending queued data\n");
     next = tq->next;
     room--;
-    send_prebuilt_message ((struct GNUNET_MessageHeader *)&tq[1],
+    send_prebuilt_message ((struct GNUNET_MessageHeader *) &tq[1],
                            tq->t, GNUNET_YES, tq->cont, tq->cont_cls, tq->q);
     unqueue_data (tq);
   }