[GNUnet-SVN] r29834 - gnunet/src/include

[gnunet]

Author: grothoff
Date: 2013-10-04 07:33:29 +0200 (Fri, 04 Oct 2013)
New Revision: 29834

Modified:
   gnunet/src/include/gnunet_applications.h
   gnunet/src/include/gnunet_protocols.h
Log:
-add missing #defines

Modified: gnunet/src/include/gnunet_applications.h
===================================================================
--- gnunet/src/include/gnunet_applications.h    2013-10-04 05:32:47 UTC (rev 
29833)
+++ gnunet/src/include/gnunet_applications.h    2013-10-04 05:33:29 UTC (rev 
29834)
@@ -86,6 +86,17 @@
  */
 #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

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-10-04 05:32:47 UTC (rev 
29833)
+++ gnunet/src/include/gnunet_protocols.h       2013-10-04 05:33:29 UTC (rev 
29834)
@@ -2271,8 +2271,32 @@
  */
 #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
+
+
 
/*******************************************************************************
  * MULTICAST message types
  
******************************************************************************/