[GNUnet-SVN] r28563 - in gnunet/src: include mesh

[gnunet]

Author: bartpolot
Date: 2013-08-13 13:12:47 +0200 (Tue, 13 Aug 2013)
New Revision: 28563

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/mesh/mesh_common.c
Log:
- update debug info


Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-08-13 10:52:37 UTC (rev 
28562)
+++ gnunet/src/include/gnunet_protocols.h       2013-08-13 11:12:47 UTC (rev 
28563)
@@ -868,13 +868,13 @@
 /**
  * Ask the mesh service to create a new tunnel
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE   273
+#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_CREATE         273
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_CREATE    273
 
 /**
  * Ask the mesh service to destroy a tunnel
  */
-#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY  274
+#define GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY        274
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_DESTROY   274
 
 /**

Modified: gnunet/src/mesh/mesh_common.c
===================================================================
--- gnunet/src/mesh/mesh_common.c       2013-08-13 10:52:37 UTC (rev 28562)
+++ gnunet/src/mesh/mesh_common.c       2013-08-13 11:12:47 UTC (rev 28563)
@@ -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)));
 }
 
 
@@ -63,17 +63,17 @@
       /**
        * 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
@@ -103,7 +103,7 @@
       /**
        * Request the destuction of a path
        */
-    case 266: return "GNUNET_MESSAGE_TYPE_MESH_PATH_DESTROY";
+    case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY";
 
       /**
        * Request the destruction of a whole tunnel
@@ -138,17 +138,27 @@
       /**
        * 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_LOCAL_TUNNEL_DESTROY";
+    case 274: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_DESTROY";
 
       /**
+       * 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 281: return "GNUNET_MESSAGE_TYPE_MESH_BCK";
+
+      /**
        * Local payload traffic
        */
-    case 275: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA";
+    case 285: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_DATA";
 
       /**
        * Local ACK for data.