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

diff --git a/src/mesh/mesh_common.c b/src/mesh/mesh_common.c
index ad446646a..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)
@@ -175,6 +199,16 @@ GNUNET_MESH_DEBUG_M2S (uint16_t m)
        */
     case 287: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK";
 
+      /**
+       * Local monitoring of service.
+       */
+    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 "";
 }