From 41c4af58154915dfc614d3c43cfa8d8919fcc987 Mon Sep 17 00:00:00 2001 From: Bart Polot Date: Thu, 14 Nov 2013 16:57:03 +0000 Subject: [PATCH] - remove superfluous tunnel state --- src/mesh/gnunet-service-mesh_tunnel.c | 4 +--- src/mesh/gnunet-service-mesh_tunnel.h | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index 4033da4ca..9b1397d95 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c @@ -246,8 +246,6 @@ GMT_state2s (enum MeshTunnel3State s) return "MESH_TUNNEL3_WAITING"; case MESH_TUNNEL3_KEY_SENT: return "MESH_TUNNEL3_KEY_SENT"; - case MESH_TUNNEL3_PING_SENT: - return "MESH_TUNNEL3_PING_SENT"; case MESH_TUNNEL3_READY: return "MESH_TUNNEL3_READY"; case MESH_TUNNEL3_RECONNECTING: @@ -1109,7 +1107,7 @@ handle_ephemeral (struct MeshTunnel3 *t, { LOG (GNUNET_ERROR_TYPE_DEBUG, " our key was sent, send ping\n"); send_ping (t); - t->state = MESH_TUNNEL3_PING_SENT; + t->state = MESH_TUNNEL3_REKEY; } } diff --git a/src/mesh/gnunet-service-mesh_tunnel.h b/src/mesh/gnunet-service-mesh_tunnel.h index c0520256c..2c57b9e14 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.h +++ b/src/mesh/gnunet-service-mesh_tunnel.h @@ -65,11 +65,6 @@ enum MeshTunnel3State */ MESH_TUNNEL3_KEY_SENT, - /** - * Have peer's key, sent ping, waiting for pong. - */ - MESH_TUNNEL3_PING_SENT, - /** * Peer connected and ready to accept data. */ @@ -82,6 +77,8 @@ enum MeshTunnel3State /** * New ephemeral key and ping sent, waiting for pong. + * This means that we DO have the peer's ephemeral key, otherwise the + * state would be KEY_SENT. */ MESH_TUNNEL3_REKEY, }; -- 2.25.1