From: Bart Polot <bart@net.in.tum.de>
Date: Thu, 7 Nov 2013 00:01:48 +0000 (+0000)
Subject: - fixed state overwriting
X-Git-Tag: initial-import-from-subversion-38251~6216
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7bb0e91714f97429d5a9d2ad7a88524701d3113d;p=oweals%2Fgnunet.git

- fixed state overwriting
---

diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c
index b22981fd8..4c1eba895 100644
--- a/src/mesh/gnunet-service-mesh_tunnel.c
+++ b/src/mesh/gnunet-service-mesh_tunnel.c
@@ -941,6 +941,7 @@ handle_pong (struct MeshTunnel3 *t,
   t->rekey_task = GNUNET_SCHEDULER_NO_TASK;
   GNUNET_free (t->kx_ctx);
   t->kx_ctx = NULL;
+  t->state = MESH_TUNNEL3_READY;
   send_queued_data (t, GNUNET_YES);
   send_queued_data (t, GNUNET_NO);
 }
@@ -1175,7 +1176,10 @@ GMT_change_state (struct MeshTunnel3* t, enum MeshTunnel3State state)
   {
     rekey_tunnel (t, NULL);
   }
-  t->state = state;
+  else
+  {
+    t->state = state;
+  }
   if (MESH_TUNNEL3_READY == state && 3 <= GMT_count_connections (t))
   {
     GMP_stop_search (t->peer);