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

[gnunet]

Author: bartpolot
Date: 2013-11-26 16:51:16 +0100 (Tue, 26 Nov 2013)
New Revision: 30877

Modified:
   gnunet/src/mesh/mesh_api.c
Log:
- allow for destruction of channel inside inbound handler


Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c  2013-11-26 15:51:09 UTC (rev 30876)
+++ gnunet/src/mesh/mesh_api.c  2013-11-26 15:51:16 UTC (rev 30877)
@@ -771,6 +771,8 @@
   }
   if (NULL != h->new_channel)
   {
+    void *ctx;
+
     ch = create_channel (h, chid);
     ch->allow_send = GNUNET_NO;
     ch->peer = GNUNET_PEER_intern (&msg->peer);
@@ -794,7 +796,9 @@
       ch->ooorder = GNUNET_NO;
 
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  created channel %p\n", ch);
-    ch->ctx = h->new_channel (h->cls, ch, &msg->peer, ch->port);
+    ctx = h->new_channel (h->cls, ch, &msg->peer, ch->port);
+    if (NULL != ctx)
+      ch->ctx = ctx;
     LOG (GNUNET_ERROR_TYPE_DEBUG, "User notified\n");
   }
   else