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

[gnunet]

Author: bartpolot
Date: 2013-12-12 19:19:40 +0100 (Thu, 12 Dec 2013)
New Revision: 31326

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
Log:
- cancel transmission altogether on error


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 18:19:08 UTC 
(rev 31325)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 18:19:40 UTC 
(rev 31326)
@@ -2324,6 +2324,12 @@
       }
       chq->tq = GMT_send_prebuilt_message (message, ch->t, GNUNET_YES,
                                            &ch_message_sent, chq);
+      if (NULL != chq->tq)
+      {
+        GNUNET_break (0);
+        GNUNET_free (chq);
+        chq = NULL;
+      }
       chq->rel->uniq = chq;
       break;
 

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-12 18:19:08 UTC 
(rev 31325)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-12-12 18:19:40 UTC 
(rev 31326)
@@ -1748,7 +1748,6 @@
 GMT_remove_connection (struct MeshTunnel3 *t, struct MeshConnection *c)
 {
   struct MeshTConnection *aux;
-  unsigned int i;
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "Removing connection %s from tunnel %s\n",
        GMC_2s (c), GMT_2s (t));