#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)));
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;
}
#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)
*/
case 266: return "GNUNET_MESSAGE_TYPE_MESH_CONNECTION_DESTROY";
- /**
- * Request the destruction of a whole tunnel
- */
- case 267: return "GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY";
-
/**
* ACK for a data packet.
*/
/**
* 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
/**
* Local monitoring of service.
*/
- case 287: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNELS";
-
- /**
- * Local monitoring of service of a specific tunnel.
- */
- case 288: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_INFO_TUNNEL";
+ case 287: return "GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK";
/**
* 640kb should be enough for everybody
}
#else
const char *
-GNUNET_MESH_DEBUG_M2S (uint16_t m)
+GM_m2s (uint16_t m)
{
return "";
}