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

[gnunet]

Author: bartpolot
Date: 2013-12-12 13:07:05 +0100 (Thu, 12 Dec 2013)
New Revision: 31302

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
Log:
- don't confirm channels scheduled for destruction, client handles are NULL'd

Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 11:55:48 UTC 
(rev 31301)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 12:07:05 UTC 
(rev 31302)
@@ -1114,13 +1114,18 @@
   struct MeshChannelReliability *rel;
   enum MeshChannelState oldstate;
 
+  rel = fwd ? ch->root_rel : ch->dest_rel;
+  if (NULL == rel)
+  {
+    GNUNET_break (GNUNET_NO != ch->destroy);
+    return;
+  }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
               "  channel confirm %s %s\n",
               GM_f2s (fwd), GMCH_2s (ch));
   oldstate = ch->state;
   ch->state = MESH_CHANNEL_READY;
 
-  rel = fwd ? ch->root_rel : ch->dest_rel;
   rel->client_ready = GNUNET_YES;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "  !! retry timer confirm %s\n",