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)));
}
/**
* 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
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";
/**
- * Avoid path timeouts
+ * Answer to session key challenge.
*/
- case 265: return "GNUNET_MESSAGE_TYPE_MESH_PATH_KEEPALIVE";
+ case 265: return "GNUNET_MESSAGE_TYPE_MESH_KX_PONG";
/**
* 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
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";
/**
* 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";
+
+ /**
+ * Confirm the creation of a channel.
+ */
+ case 275: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_ACK";
+
+ /**
+ * Confirm the creation of a channel.
+ */
+ case 276: return "GNUNET_MESSAGE_TYPE_MESH_CHANNEL_NACK";
+
+ /**
+ * Encrypted payload.
+ */
+ case 280: return "GNUNET_MESSAGE_TYPE_MESH_ENCRYPTED";
/**
* 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.