2 files changed, 35 insertions, 0 deletions

diff --git a/src/include/gnunet_applications.h b/src/include/gnunet_applications.h
index bbeb75547..56e45b72e 100644
--- a/src/include/gnunet_applications.h
+++ b/src/include/gnunet_applications.h
@@ -86,6 +86,17 @@ extern "C"
  */
 #define GNUNET_APPLICATION_TYPE_SCALARPRODUCT 20
 
+/**
+ * Conversation control data.
+ */
+#define GNUNET_APPLICATION_TYPE_CONVERSATION_CONTROL 21
+
+/**
+ * Conversation audio data.
+ */
+#define GNUNET_APPLICATION_TYPE_CONVERSATION_AUDIO 22
+
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index afc56cfe2..4d07c7712 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2271,6 +2271,30 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 737
 
+/**
+ * Mesh: call initiation
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RING 738
+
+/**
+ * Mesh: hang up / refuse call
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_HANG_UP 739
+
+/**
+ * Mesh: pick up phone (establish audio channel)
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_PICK_UP 740
+
+/**
+ * Mesh: phone is busy (refuse nicely)
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY 741
+
+/**
+ * Mesh: audio data 
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_AUDIO 742
 
 
 /*******************************************************************************