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

[gnunet]

Author: bartpolot
Date: 2013-11-14 17:57:03 +0100 (Thu, 14 Nov 2013)
New Revision: 30703

Modified:
   gnunet/src/mesh/gnunet-service-mesh_tunnel.c
   gnunet/src/mesh/gnunet-service-mesh_tunnel.h
Log:
- remove superfluous tunnel state


Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.c
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-14 16:48:49 UTC 
(rev 30702)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.c        2013-11-14 16:57:03 UTC 
(rev 30703)
@@ -246,8 +246,6 @@
       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 @@
   {
     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;
   }
 }
 

Modified: gnunet/src/mesh/gnunet-service-mesh_tunnel.h
===================================================================
--- gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-11-14 16:48:49 UTC 
(rev 30702)
+++ gnunet/src/mesh/gnunet-service-mesh_tunnel.h        2013-11-14 16:57:03 UTC 
(rev 30703)
@@ -66,11 +66,6 @@
   MESH_TUNNEL3_KEY_SENT,
 
     /**
-     * Have peer's key, sent ping, waiting for pong.
-     */
-  MESH_TUNNEL3_PING_SENT,
-
-    /**
      * Peer connected and ready to accept data.
      */
   MESH_TUNNEL3_READY,
@@ -82,6 +77,8 @@
 
     /**
      * 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,
 };