[GNUnet-SVN] [gnunet] branch master updated: another channel-add destroy-cancel fix

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 08ac9f58f another channel-add destroy-cancel fix
08ac9f58f is described below

commit 08ac9f58f96ede5158ca9ff371691390e87aeff4
Author: Christian Grothoff <address@hidden>
AuthorDate: Wed Feb 1 09:36:14 2017 +0100

    another channel-add destroy-cancel fix
---
 src/cadet/gnunet-service-cadet-new_tunnels.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/cadet/gnunet-service-cadet-new_tunnels.c 
b/src/cadet/gnunet-service-cadet-new_tunnels.c
index cbc1303d9..c1532e835 100644
--- a/src/cadet/gnunet-service-cadet-new_tunnels.c
+++ b/src/cadet/gnunet-service-cadet-new_tunnels.c
@@ -1910,6 +1910,11 @@ GCT_add_channel (struct CadetTunnel *t,
   struct GNUNET_CADET_ChannelTunnelNumber ctn;
 
   ctn = get_next_free_ctn (t);
+  if (NULL != t->destroy_task)
+  {
+    GNUNET_SCHEDULER_cancel (t->destroy_task);
+    t->destroy_task = NULL;
+  }
   GNUNET_assert (GNUNET_YES ==
                  GNUNET_CONTAINER_multihashmap32_put (t->channels,
                                                       ntohl (ctn.cn),

-- 
To stop receiving notification emails like this one, please contact
address@hidden