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

[gnunet]

Author: bartpolot
Date: 2013-08-30 05:43:00 +0200 (Fri, 30 Aug 2013)
New Revision: 28905

Modified:
   gnunet/src/mesh/gnunet-service-mesh-enc.c
Log:
- fix shutdown when root and destination are the same client


Modified: gnunet/src/mesh/gnunet-service-mesh-enc.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-08-30 03:23:58 UTC (rev 
28904)
+++ gnunet/src/mesh/gnunet-service-mesh-enc.c   2013-08-30 03:43:00 UTC (rev 
28905)
@@ -4154,10 +4154,13 @@
               peer2s (ch->t->peer),
               ch->gid);
 
-  if (NULL != ch->root)
+  if (channel_is_terminal (ch, GNUNET_NO))
   {
-    msg.chid = htonl (ch->lid_root);
-    send_local_channel_destroy (ch, GNUNET_NO);
+    if (NULL != ch->root)
+    {
+      msg.chid = htonl (ch->lid_root);
+      send_local_channel_destroy (ch, GNUNET_NO);
+    }
   }
   else
   {
@@ -4165,10 +4168,13 @@
     send_prebuilt_message_channel (&msg.header, ch, GNUNET_NO);
   }
 
-  if (NULL != ch->dest)
+  if (channel_is_terminal (ch, GNUNET_YES))
   {
-    msg.chid = htonl (ch->lid_dest);
-    send_local_channel_destroy (ch, GNUNET_YES);
+    if (NULL != ch->dest)
+    {
+      msg.chid = htonl (ch->lid_dest);
+      send_local_channel_destroy (ch, GNUNET_YES);
+    }
   }
   else
   {