messages for inter-controller overlay connect

[oweals/gnunet.git] / src / include / gnunet_protocols.h

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index dc29a4d02319f98045ac2b0fb3cf67be9f1b65af..b3b5e4f402a19cb5228240f18ee342512d3417e0 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -790,30 +790,10 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_DESTROY         266
 
-/**
- * Set tunnel speed to slowest peer
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_MIN             267
-
-/**
- * Set tunnel speed to fastest peer
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_MAX             268
-
-/**
- * Set tunnel buffering on.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_BUFFER          269
-
-/**
- * Set tunnel buffering off.
- */
-#define GNUNET_MESSAGE_TYPE_MESH_TUNNEL_NOBUFFER        270
-
 /**
  * ACK for a data packet.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_ACK                    271
+#define GNUNET_MESSAGE_TYPE_MESH_ACK                    267
 
 /**
  * Connect to the mesh service, specifying subscriptions
@@ -868,27 +848,32 @@ extern "C"
 /**
  * Set tunnel speed to slowest peer
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MIN    282
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MIN       282
 
 /**
  * Set tunnel speed to fastest peer
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MAX   283
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_MAX       283
 
 /**
  * Set tunnel buffering on.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_BUFFER   284
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_BUFFER    284
 
 /**
  * Set tunnel buffering off.
  */
-#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_NOBUFFER   285
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_TUNNEL_NOBUFFER  285
+
+/**
+ * Local ACK for data.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK              286
 
 /**
  * 640kb should be enough for everybody
  */
-#define GNUNET_MESSAGE_TYPE_MESH_RESERVE_END            288
+#define GNUNET_MESSAGE_TYPE_MESH_RESERVE_END            299
 
 
 
@@ -1242,7 +1227,7 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON 384
 
 /*******************************************************************************
- * STREAM LIRBRARY MESSAGES
+ * STREAM messages types
  ******************************************************************************/
 
 /**
@@ -1518,7 +1503,7 @@ extern "C"
 /**
  * Message for operation events
  */
-#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONEVENT 474
+#define GNUNET_MESSAGE_TYPE_TESTBED_OPERATIONFAILEVENT 474
 
 /**
  * Message to signal successful peer creation
@@ -1540,11 +1525,22 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TESTBED_PEERCONFIG 478
 
+/**
+ * Message to request a controller to make one of its peer to connect to another
+ * peer using the contained HELLO
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECT 479
+
+/**
+ * Message to cancel a REQUESTCONNECT request
+ */
+#define GNUNET_MESSAGE_TYPE_TESTBED_REQUESTCONNECTCANCEL 480
+
 /**
  * Not really a message, but for careful checks on the testbed messages; Should
  * always be the maximum and never be used to send messages with this type
  */
-#define GNUNET_MESSAGE_TYPE_TESTBED_MAX 479
+#define GNUNET_MESSAGE_TYPE_TESTBED_MAX 481
 
 /**
  * The initialization message towards gnunet-testbed-helper