diff options
author | Bart Polot <bart@net.in.tum.de> | 2013-11-14 16:57:03 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2013-11-14 16:57:03 +0000 |
commit | 41c4af58154915dfc614d3c43cfa8d8919fcc987 (patch) | |
tree | 46da437e5968067680e2e8e57047ed38cb10cd63 | |
parent | 0d6e1036ad64d341651d113e3427323a157353d3 (diff) | |
download | gnunet-41c4af58154915dfc614d3c43cfa8d8919fcc987.tar.gz gnunet-41c4af58154915dfc614d3c43cfa8d8919fcc987.zip |
- remove superfluous tunnel state
-rw-r--r-- | src/mesh/gnunet-service-mesh_tunnel.c | 4 | ||||
-rw-r--r-- | 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) | |||
246 | return "MESH_TUNNEL3_WAITING"; | 246 | return "MESH_TUNNEL3_WAITING"; |
247 | case MESH_TUNNEL3_KEY_SENT: | 247 | case MESH_TUNNEL3_KEY_SENT: |
248 | return "MESH_TUNNEL3_KEY_SENT"; | 248 | return "MESH_TUNNEL3_KEY_SENT"; |
249 | case MESH_TUNNEL3_PING_SENT: | ||
250 | return "MESH_TUNNEL3_PING_SENT"; | ||
251 | case MESH_TUNNEL3_READY: | 249 | case MESH_TUNNEL3_READY: |
252 | return "MESH_TUNNEL3_READY"; | 250 | return "MESH_TUNNEL3_READY"; |
253 | case MESH_TUNNEL3_RECONNECTING: | 251 | case MESH_TUNNEL3_RECONNECTING: |
@@ -1109,7 +1107,7 @@ handle_ephemeral (struct MeshTunnel3 *t, | |||
1109 | { | 1107 | { |
1110 | LOG (GNUNET_ERROR_TYPE_DEBUG, " our key was sent, send ping\n"); | 1108 | LOG (GNUNET_ERROR_TYPE_DEBUG, " our key was sent, send ping\n"); |
1111 | send_ping (t); | 1109 | send_ping (t); |
1112 | t->state = MESH_TUNNEL3_PING_SENT; | 1110 | t->state = MESH_TUNNEL3_REKEY; |
1113 | } | 1111 | } |
1114 | } | 1112 | } |
1115 | 1113 | ||
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 | |||
@@ -66,11 +66,6 @@ enum MeshTunnel3State | |||
66 | MESH_TUNNEL3_KEY_SENT, | 66 | MESH_TUNNEL3_KEY_SENT, |
67 | 67 | ||
68 | /** | 68 | /** |
69 | * Have peer's key, sent ping, waiting for pong. | ||
70 | */ | ||
71 | MESH_TUNNEL3_PING_SENT, | ||
72 | |||
73 | /** | ||
74 | * Peer connected and ready to accept data. | 69 | * Peer connected and ready to accept data. |
75 | */ | 70 | */ |
76 | MESH_TUNNEL3_READY, | 71 | MESH_TUNNEL3_READY, |
@@ -82,6 +77,8 @@ enum MeshTunnel3State | |||
82 | 77 | ||
83 | /** | 78 | /** |
84 | * New ephemeral key and ping sent, waiting for pong. | 79 | * New ephemeral key and ping sent, waiting for pong. |
80 | * This means that we DO have the peer's ephemeral key, otherwise the | ||
81 | * state would be KEY_SENT. | ||
85 | */ | 82 | */ |
86 | MESH_TUNNEL3_REKEY, | 83 | MESH_TUNNEL3_REKEY, |
87 | }; | 84 | }; |