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

[gnunet]

Author: bartpolot
Date: 2013-12-12 16:51:28 +0100 (Thu, 12 Dec 2013)
New Revision: 31312

Modified:
   gnunet/src/mesh/gnunet-service-mesh_channel.c
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- dont retransmit connection_destroy to self


Modified: gnunet/src/mesh/gnunet-service-mesh_channel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 15:36:12 UTC 
(rev 31311)
+++ gnunet/src/mesh/gnunet-service-mesh_channel.c       2013-12-12 15:51:28 UTC 
(rev 31312)
@@ -1812,6 +1812,7 @@
   }
   else
   {
+    /* FIXME change to a tunnel API, eliminate ch <-> peer connection */
     GMP_connect (peer);
   }
 

Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-12 15:36:12 UTC 
(rev 31311)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-12 15:51:28 UTC 
(rev 31312)
@@ -1553,7 +1553,7 @@
      * destroyed the tunnel and retransmitted to children.
      * Safe to ignore.
      */
-    GNUNET_STATISTICS_update (stats, "# control on unknown tunnel",
+    GNUNET_STATISTICS_update (stats, "# control on unknown connection",
                               1, GNUNET_NO);
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  connection unknown: already 
destroyed?\n");
     return GNUNET_OK;
@@ -1564,7 +1564,14 @@
     GNUNET_break_op (0);
     return GNUNET_OK;
   }
-  GMC_send_prebuilt_message (message, c, fwd, GNUNET_YES, NULL, NULL);
+  if (GNUNET_NO == GMC_is_terminal (c, fwd))
+    GMC_send_prebuilt_message (message, c, fwd, GNUNET_YES, NULL, NULL);
+  else if (0 == c->pending_messages)
+  {
+    LOG (GNUNET_ERROR_TYPE_DEBUG, "!  directly destroying connection!\n");
+    GMC_destroy (c);
+    return;
+  }
   c->destroy = GNUNET_YES;
   c->state = MESH_CONNECTION_DESTROYED;