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

[gnunet]

Author: grothoff
Date: 2013-10-03 18:09:13 +0200 (Thu, 03 Oct 2013)
New Revision: 29822

Modified:
   gnunet/src/include/gnunet_conversation_service.h
   gnunet/src/include/gnunet_protocols.h
Log:
-more work on call API

Modified: gnunet/src/include/gnunet_conversation_service.h
===================================================================
--- gnunet/src/include/gnunet_conversation_service.h    2013-10-03 16:09:03 UTC 
(rev 29821)
+++ gnunet/src/include/gnunet_conversation_service.h    2013-10-03 16:09:13 UTC 
(rev 29822)
@@ -259,17 +259,22 @@
    * a `const char *`.  The caller ID will be a GNS name.
    */
   GNUNET_CONVERSATION_EC_RING,
-
-  /**
-   * The phone is busy.  Varargs will be empty.
-   */
-  GNUNET_CONVERSATION_EC_BUSY,
   
   /**
    * We are ready to talk, metadata about the call may be supplied
    * as a `const char *` in the varargs.
    */
   GNUNET_CONVERSATION_EC_READY,
+
+  /**
+   * We failed to locate a phone record in GNS.
+   */
+  GNUNET_CONVERSATION_EC_GNS_FAIL,
+
+  /**
+   * The phone is busy.  Varargs will be empty.
+   */
+  GNUNET_CONVERSATION_EC_BUSY,
   
   /**
    * The conversation was terminated, a reason may be supplied
@@ -410,7 +415,7 @@
  *        reason given to the other user for why we hung up
  */
 void
-GNUNET_CONVERSATION_call_stop (const struct GNUNET_CONVERSATION_Call *call,
+GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call,
                               const char *reason);
 
 

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2013-10-03 16:09:03 UTC (rev 
29821)
+++ gnunet/src/include/gnunet_protocols.h       2013-10-03 16:09:13 UTC (rev 
29822)
@@ -2224,15 +2224,13 @@
 
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_TEST 750
 
+
+
 /**
-* Message to transmit the audio
-*/
+ * Message to transmit the audio between helper and speaker/microphone library.
+ */
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751
 
-
-
-
-
 /**
  * Client -> Server message register a phone.
  */
@@ -2256,10 +2254,20 @@
 /**
  * Client <-> Server message to send audio data.
  */
-#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 734
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY 734
 
+/**
+ * Client <-> Server message to send audio data.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP 735
 
+/**
+ * Client <-> Server message to send audio data.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 736
 
+
+
 
/*******************************************************************************
  * MULTICAST message types
  
******************************************************************************/