From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 7 Nov 2013 18:32:28 +0000 (+0000)
Subject: - don't allow ACKs to change KX state
X-Git-Tag: initial-import-from-subversion-38251~6185
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce0c542146f419710528cedd4e4d07446597f430;p=oweals%2Fgnunet.git

- don't allow ACKs to change KX state
---

diff --git a/src/mesh/gnunet-service-mesh_connection.c b/src/mesh/gnunet-service-mesh_connection.c
index d529934eb..e20b4e9db 100644
--- a/src/mesh/gnunet-service-mesh_connection.c
+++ b/src/mesh/gnunet-service-mesh_connection.c
@@ -1214,7 +1214,8 @@ GMC_handle_confirm (void *cls, const struct GNUNET_PeerIdentity *peer,
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG, "  Connection (SYN)ACK for us!\n");
     connection_change_state (c, MESH_CONNECTION_READY);
-    GMT_change_state (c->t, MESH_TUNNEL3_READY);
+    if (MESH_TUNNEL3_WAITING == GMT_get_state (c->t))
+      GMT_change_state (c->t, MESH_TUNNEL3_READY);
     send_connection_ack (c, GNUNET_YES);
     return GNUNET_OK;
   }