-remove GNUNET_MQ_impl_send_commit, make it part of send_continue, to ensure calling...

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

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 5e495608808b4c2d3e2df30cd9011a3132d71553..3169e2318d91b06185c847027c5172de7a930205 100644 (file)
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -817,11 +817,23 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_MESH_DATA_ACK               261
 
 /**
- * Key exchange messages.
+ * Key exchange encapsulation.
  */
 #define GNUNET_MESSAGE_TYPE_MESH_KX                     262
+
+/**
+ * New ephemeral key.
+ */
 #define GNUNET_MESSAGE_TYPE_MESH_KX_EPHEMERAL           263
+
+/**
+ * Challenge to test peer's session key.
+ */
 #define GNUNET_MESSAGE_TYPE_MESH_KX_PING                264
+
+/**
+ * Answer to session key challenge.
+ */
 #define GNUNET_MESSAGE_TYPE_MESH_KX_PONG                265
 
 /**
@@ -928,6 +940,11 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_MESH_LOCAL_ACK              286
 
+/**
+ * Local NACK for rejected channels.
+ */
+#define GNUNET_MESSAGE_TYPE_MESH_LOCAL_NACK             287
+
 /**
  * Local information about all tunnels of service. DEPRECATED
  */
@@ -1854,10 +1871,15 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_SET_ITER_DONE 589
 
+/**
+ * Information about the element count for intersection
+ */
+#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_ELEMENT_INFO 591
+
 /**
  * Bloom filter message for intersection exchange started by Bob.
  */
-#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF 591
+#define GNUNET_MESSAGE_TYPE_SET_INTERSECTION_P2P_BF 592
 
 /*******************************************************************************
  * TESTBED LOGGER message types
@@ -2152,67 +2174,77 @@ extern "C"
 /**
  * Client -> Server message register a phone.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 730
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 731
 
 /**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 731
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 732
 
 /**
- * Client -> Server meessage to reject/hangup a call
+ * Client -> Server message to reject/hangup a call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 732
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 733
 
 /**
  * Client <- Server message to indicate a ringing phone
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL 733
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_CALL 734
 
 /**
  * Client <- Server message to indicate a ringing phone
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING 734
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING 735
 
 /**
- * Client <-> Server message to send audio data.
+ * Client <-> Server message to suspend connection.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY 735
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND 736
+
+/**
+ * Client <-> Server message to resume connection.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME 737
 
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 736
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 738
 
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 737
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 739
 
 /**
  * Mesh: call initiation
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 738
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 740
 
 /**
  * Mesh: hang up / refuse call
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 739
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 741
 
 /**
  * Mesh: pick up phone (establish audio channel)
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 740
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 742
+
+/**
+ * Mesh: phone suspended.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND 743
 
 /**
- * Mesh: phone is busy (refuse nicely)
+ * Mesh: phone resumed.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME 744
 
 /**
  * Mesh: audio data
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 745
 
 
 /*******************************************************************************