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

[gnunet]

Author: bartpolot
Date: 2013-12-16 18:27:34 +0100 (Mon, 16 Dec 2013)
New Revision: 31432

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- only treat KX as confirmation if connection is not in destroy state


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 17:11:28 UTC 
(rev 31431)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-12-16 17:27:34 UTC 
(rev 31432)
@@ -1788,13 +1788,15 @@
 
   /* Count as connection confirmation. */
   if (MESH_CONNECTION_SENT == c->state || MESH_CONNECTION_ACK == c->state)
+  {
     connection_change_state (c, MESH_CONNECTION_READY);
+    if (NULL != c->t)
+    {
+      if (MESH_TUNNEL3_WAITING == GMT_get_cstate (c->t))
+        GMT_change_cstate (c->t, MESH_TUNNEL3_READY);
+    }
+  }
   connection_reset_timeout (c, fwd);
-  if (NULL != c->t)
-  {
-    if (MESH_TUNNEL3_WAITING == GMT_get_cstate (c->t))
-      GMT_change_cstate (c->t, MESH_TUNNEL3_READY);
-  }
 
   /* Is this message for us? */
   if (GMC_is_terminal (c, fwd))