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

[gnunet]

Author: bartpolot
Date: 2013-11-07 19:23:33 +0100 (Thu, 07 Nov 2013)
New Revision: 30614

Modified:
   gnunet/src/mesh/gnunet-service-mesh_connection.c
Log:
- account for out-of-order kx messages


Modified: gnunet/src/mesh/gnunet-service-mesh_connection.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-07 18:07:23 UTC 
(rev 30613)
+++ gnunet/src/mesh/gnunet-service-mesh_connection.c    2013-11-07 18:23:33 UTC 
(rev 30614)
@@ -1528,6 +1528,17 @@
     }
   }
 
+  /* Count as connection confirmation. */
+  if (MESH_CONNECTION_SENT == c->state || MESH_CONNECTION_ACK == c->state)
+    connection_change_state (c, MESH_CONNECTION_READY);
+  connection_reset_timeout (c, fwd);
+  if (NULL != c->t)
+  {
+    if (MESH_TUNNEL3_WAITING == GMT_get_state (c->t))
+      GMT_change_state (c->t, MESH_TUNNEL3_READY);
+  }
+
+  /* Is this message for us? */
   if (GMC_is_terminal (c, fwd))
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  message for us!\n");