- use proper channel_ack/data_ack

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

diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c
index d3a26cd7c9e3f9f929fcd8fb44f49ae8c1398085..1089e8edc347973e690a44a5c764185a46372e81 100644 (file)
--- a/src/mesh/mesh_common.c
+++ b/src/mesh/mesh_common.c
@@ -30,8 +30,8 @@
 int
 GMC_is_pid_bigger (uint32_t bigger, uint32_t smaller)
 {
-    return (GNUNET_YES == PID_OVERFLOW(smaller, bigger) ||
-            (bigger > smaller && GNUNET_NO == PID_OVERFLOW(bigger, smaller)));
+    return (GNUNET_YES == PID_OVERFLOW (smaller, bigger) ||
+            (bigger > smaller && GNUNET_NO == PID_OVERFLOW (bigger, smaller)));
 }
 
 
@@ -52,13 +52,6 @@ GMC_min_pid (uint32_t a, uint32_t b)
   return a;
 }
 
-void
-GMC_hash32 (uint32_t i, struct GNUNET_HashCode *h)
-{
-  memset (h, 0, sizeof(struct GNUNET_HashCode));
-  *(unsigned int *) h = i;
-}
-
 
 #if !defined(GNUNET_CULL_LOGGING)
 const char *
@@ -70,17 +63,17 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
       /**
        * Request the creation of a path
        */
-    case 256: return "GNUNET_MESSAGE_TYPE_MESH_PATH_CREATE";
+    case 256: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_CREATE";
 
       /**
        * Request the modification of an existing path
        */
-    case 257: return "GNUNET_MESSAGE_TYPE_MESH_PATH_ACK";
+    case 257: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_ACK";
 
       /**
        * Notify that a connection of a path is no longer valid
        */
-    case 258: return "GNUNET_MESSAGE_TYPE_MESH_PATH_BROKEN";
+    case 258: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_BROKEN";
 
       /**
        * At some point, the route will spontaneously change
@@ -98,36 +91,46 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
     case 262: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIGIN";
 
       /**
-       * Send origin an ACK that the path is complete
+       * Send origin an ACK that UNICAST arrived
        */
-    case 263: return "GNUNET_MESSAGE_TYPE_MESH_DATA_ACK";
+    case 263: return "GNUNET_MESSAGE_TYPE_MESH_UNICAST_ACK";
 
       /**
-       * Avoid path timeouts
+       * Send origin an ACK that TO_ORIGIN arrived
        */
-    case 264: return "GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE";
+    case 264: return "GNUNET_MESSAGE_TYPE_MESH_TO_ORIG_ACK";
 
       /**
        * Request the destuction of a path
        */
-    case 265: return "GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY";
+    case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY";
 
       /**
        * Request the destruction of a whole tunnel
        */
-    case 266: return "GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY";
+    case 267: return "GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY";
 
       /**
        * ACK for a data packet.
        */
-    case 267: return "GNUNET_MESSAGE_TYPE_MESH_ACK";
+    case 268: return "GNUNET_MESSAGE_TYPE_MESH_ACK";
 
       /**
        * POLL for ACK.
        */
-    case 268: return "GNUNET_MESSAGE_TYPE_MESH_POLL";
+    case 269: return "GNUNET_MESSAGE_TYPE_MESH_POLL";
+
+      /**
+       * 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";
+
+    /**
        * Connect to the mesh service, specifying subscriptions
        */
     case 272: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_CONNECT";
@@ -135,12 +138,32 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
       /**
        * Ask the mesh service to create a new tunnel
        */
-    case 273: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE";
+    case 273: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE";
+
+      /**
+       * Ask the mesh service to destroy a tunnel
+       */
+    case 274: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY";
+
+      /**
+       * Confirm the creation of a channel
+       */
+    case 275: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK";
+
+      /**
+       * Ask the mesh service to create a new tunnel
+       */
+    case 280: return "GNUNET_MESSAGE_TYPE_MESH_FWD";
 
       /**
        * Ask the mesh service to destroy a tunnel
        */
-    case 274: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY";
+    case 281: return "GNUNET_MESSAGE_TYPE_MESH_BCK";
+
+      /**
+       * Local payload traffic
+       */
+    case 285: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA";
 
       /**
        * Local ACK for data.