-only notify AFTER sending is really close to finished, not before

[oweals/gnunet.git] / src / mesh / mesh_common.c

diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c
index 56b669efc17d07b643fb410440a2c9a4245936b2..06c9b7b84e9f2c3061b3f5b58af8a83e686ff4cb 100644 (file)
--- a/src/mesh/mesh_common.c
+++ b/src/mesh/mesh_common.c
@@ -81,24 +81,34 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
     case 259: return "GNUNET_MESSAGE_TYPE_MESH_PATH_CHANGED";
 
       /**
-       * Transport data in the mesh (origin->end) unicast
+       * Transport payload data.
        */
-    case 260: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST";
+    case 260: return "GNUNET_MESSAGE_TYPE_MESH_DATA";
+
+    /**
+     * Confirm receipt of payload data.
+     */
+    case 261: return "GNUNET_MESSAGE_TYPE_MESH_DATA_ACK";
+
+      /**
+       * Key exchange encapsulation.
+       */
+    case 262: return "GNUNET_MESSAGE_TYPE_MESH_KX";
 
       /**
-       * Transport data back in the mesh (end->origin)
+       * New ephemeral key.
        */
-    case 262: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN";
+    case 263: return "GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL";
 
       /**
-       * Send origin an ACK that UNICAST arrived
+       * Challenge to test peer's session key.
        */
-    case 263: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK";
+    case 264: return "GNUNET_MESSAGE_TYPE_MESH_KX_PING";
 
       /**
-       * Send origin an ACK that TO_ORIGIN arrived
+       * Answer to session key challenge.
        */
-    case 264: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK";
+    case 265: return "GNUNET_MESSAGE_TYPE_MESH_KX_PONG";
 
       /**
        * Request the destuction of a path
@@ -146,14 +156,19 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
     case 274: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY";
 
       /**
-       * Ask the mesh service to create a new tunnel
+       * Confirm the creation of a channel.
        */
-    case 280: return "GNUNET_MESSAGE_TYPE_MESH_FWD";
+    case 275: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK";
 
       /**
-       * Ask the mesh service to destroy a tunnel
+       * Confirm the creation of a channel.
+       */
+    case 276: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK";
+
+      /**
+       * Encrypted payload.
        */
-    case 281: return "GNUNET_MESSAGE_TYPE_MESH_BCK";
+    case 280: return "GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED";
 
       /**
        * Local payload traffic