X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fmesh%2Fmesh_common.c;h=2e8104e1b34a4bbf275b67cc3110db69927a124c;hb=e43078b68951ad8a3daa3a193473e9c321549e1d;hp=56b669efc17d07b643fb410440a2c9a4245936b2;hpb=1d39a4da8d582754858266cac8ce1066efd37879;p=oweals%2Fgnunet.git

diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c
index 56b669efc..2e8104e1b 100644
--- a/src/mesh/mesh_common.c
+++ b/src/mesh/mesh_common.c
@@ -26,9 +26,33 @@
 
 #include "mesh.h"
 
+/**
+ * @brief Translate a fwd variable into a string representation, for logging.
+ *
+ * @param fwd Is FWD? (#GNUNET_YES or #GNUNET_NO)
+ *
+ * @return String representing FWD or BCK.
+ */
+char *
+GM_f2s (int fwd)
+{
+  if (GNUNET_YES == fwd)
+  {
+    return "FWD";
+  }
+  else if (GNUNET_NO == fwd)
+  {
+    return "BCK";
+  }
+  else
+  {
+    GNUNET_break (0);
+    return "";
+  }
+}
 
 int
-GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller)
+GM_is_pid_bigger (uint32_t bigger, uint32_t smaller)
 {
     return (GNUNET_YES == PID_OVERFLOW (smaller, bigger) ||
             (bigger > smaller && GNUNET_NO == PID_OVERFLOW (bigger, smaller)));
@@ -36,18 +60,18 @@ GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller)
 
 
 uint32_t
-GMC_max_pid (uint32_t a, uint32_t b)
+GM_max_pid (uint32_t a, uint32_t b)
 {
-  if (GMC_is_pid_bigger(a, b))
+  if (GM_is_pid_bigger(a, b))
     return a;
   return b;
 }
 
 
 uint32_t
-GMC_min_pid (uint32_t a, uint32_t b)
+GM_min_pid (uint32_t a, uint32_t b)
 {
-  if (GMC_is_pid_bigger(a, b))
+  if (GM_is_pid_bigger(a, b))
     return b;
   return a;
 }
@@ -55,7 +79,7 @@ GMC_min_pid (uint32_t a, uint32_t b)
 
 #if !defined(GNUNET_CULL_LOGGING)
 const char *
-GNUNET_MESH_DEBUG_M2S (uint16_t m)
+GM_m2s (uint16_t m)
 {
   static char buf[32];
   switch (m)
@@ -81,34 +105,39 @@ 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";
 
       /**
-       * Transport data back in the mesh (end->origin)
+       * Key exchange encapsulation.
        */
-    case 262: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN";
+    case 262: return "GNUNET_MESSAGE_TYPE_MESH_KX";
 
       /**
-       * Send origin an ACK that UNICAST arrived
+       * New ephemeral key.
        */
-    case 263: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK";
+    case 263: return "GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL";
 
       /**
-       * Send origin an ACK that TO_ORIGIN arrived
+       * Challenge to test peer's session key.
        */
-    case 264: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK";
+    case 264: return "GNUNET_MESSAGE_TYPE_MESH_KX_PING";
 
       /**
-       * Request the destuction of a path
+       * Answer to session key challenge.
        */
-    case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY";
+    case 265: return "GNUNET_MESSAGE_TYPE_MESH_KX_PONG";
 
       /**
-       * Request the destruction of a whole tunnel
+       * Request the destuction of a path
        */
-    case 267: return "GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY";
+    case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY";
 
       /**
        * ACK for a data packet.
@@ -123,12 +152,7 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
       /**
        * Announce origin is still alive.
        */
-    case 270: return "GNUNET_MESSAGE_TYPE_MESH_FWD_KEEPALIVE";
-
-      /**
-       * Announce destination is still alive.
-       */
-    case 271: return "GNUNET_MESSAGE_TYPE_MESH_BCK_KEEPALIVE";
+    case 270: return "GNUNET_MESSAGE_TYPE_MESH_KEEPALIVE";
 
     /**
        * Connect to the mesh service, specifying subscriptions
@@ -146,14 +170,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 281: return "GNUNET_MESSAGE_TYPE_MESH_BCK";
+    case 276: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK";
+
+      /**
+       * Encrypted payload.
+       */
+    case 280: return "GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED";
 
       /**
        * Local payload traffic
@@ -168,12 +197,17 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
       /**
        * Local monitoring of service.
        */
-    case 287: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS";
+    case 287: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK";
 
       /**
-       * Local monitoring of service of a specific tunnel.
+       * Local monitoring of service.
        */
-    case 288: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL";
+    case 292: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS";
+
+      /**
+       * Local monitoring of service.
+      */
+    case 293: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL";
 
       /**
        * 640kb should be enough for everybody
@@ -185,7 +219,7 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
 }
 #else
 const char *
-GNUNET_MESH_DEBUG_M2S (uint16_t m)
+GM_m2s (uint16_t m)
 {
   return "";
 }