-finishing first round of conversation phone API implementation

5 files changed, 52 insertions, 8 deletions

diff --git a/src/include/gnunet_client_lib.h b/src/include/gnunet_client_lib.h
index e4cdd26cc..37f152d97 100644
--- a/src/include/gnunet_client_lib.h
+++ b/src/include/gnunet_client_lib.h
@@ -80,8 +80,7 @@ GNUNET_CLIENT_disconnect (struct GNUNET_CLIENT_Connection *client);
  * @param msg message received, NULL on timeout or fatal error
  */
 typedef void (*GNUNET_CLIENT_MessageHandler) (void *cls,
-                                              const struct GNUNET_MessageHeader
-                                              *msg);
+                                              const struct GNUNET_MessageHeader *msg);
 
 
 /**
@@ -129,8 +128,8 @@ GNUNET_CLIENT_notify_transmit_ready (struct GNUNET_CLIENT_Connection *client,
                                      size_t size,
                                      struct GNUNET_TIME_Relative timeout,
                                      int auto_retry,
-                                     GNUNET_CONNECTION_TransmitReadyNotify
-                                     notify, void *notify_cls);
+                                     GNUNET_CONNECTION_TransmitReadyNotify notify, 
+                                     void *notify_cls);
 
 
 /**
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h
index 677c40244..d4a48b2b8 100644
--- a/src/include/gnunet_conversation_service.h
+++ b/src/include/gnunet_conversation_service.h
@@ -24,6 +24,10 @@
  * @author Simon Dieterle
  * @author Andreas Fuchs
  * @author Christian Grothoff
+ *
+ * TODO:
+ * - call waiting
+ * - put on hold
  */
 #ifndef GNUNET_CONVERSATION_SERVICE_H
 #define GNUNET_CONVERSATION_SERVICE_H
@@ -232,7 +236,8 @@ GNUNET_CONVERSATION_reject (struct GNUNET_CONVERSATION_Handle *handle);
    As this is supposed to be a "secure" service, caller ID is of
    course provided as part of the basic implementation, as only the
    CONVERSATION service can know for sure who it is that we are
-   talking to.x */
+   talking to.
+ */
 
 
 #include "gnunet_util_lib.h"
@@ -254,6 +259,11 @@ enum GNUNET_CONVERSATION_EventCode
    * 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
@@ -301,11 +311,13 @@ struct GNUNET_CONVERSATION_Phone;
  *
  * @param cfg configuration for the phone; specifies the phone service and
  *        which line the phone is to be connected to
+ * @param ego ego to use for name resolution (when determining caller ID)
  * @param event_handler how to notify the owner of the phone about events
  * @param event_handler_cls closure for @a event_handler
  */
 struct GNUNET_CONVERSATION_Phone *
 GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                  const struct GNUNET_IDENTITY_Ego *ego,
                                   GNUNET_CONVERSATION_EventHandler event_handler,
                                   void *event_handler_cls);
 
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index f88017fbe..fd28f3de6 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -28,8 +28,6 @@
 #ifndef GNUNET_MQ_H
 #define GNUNET_MQ_H
 
-#include "gnunet_common.h"
-
 
 /**
  * Allocate an envelope, with extra space allocated after the space needed
@@ -246,7 +244,6 @@ struct GNUNET_MQ_MessageHandler
    */
   GNUNET_MQ_MessageCallback cb;
 
-
   /**
    * Type of the message this handler covers.
    */
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index 4b3a6fcb9..6763c05fc 100644
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -77,6 +77,12 @@ extern "C"
 #define GNUNET_NAMESTORE_TYPE_PLACE 65541
 
 /**
+ * Record type for a phone (of CONVERSATION).
+ */
+#define GNUNET_NAMESTORE_TYPE_PHONE 65542
+
+
+/**
  * Entry in the queue.
  */
 struct GNUNET_NAMESTORE_QueueEntry;
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 60ad23097..a2b3ae60d 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -2230,6 +2230,36 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO 751
 
 
+
+
+
+/**
+ * Client -> Server message register a phone.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_REGISTER 730
+
+/**
+ * Client -> Server meessage to reject/hangup a call
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICK_UP 731
+
+/**
+ * Client -> Server meessage to reject/hangup a call
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP 732
+
+/**
+ * Client <- Server message to indicate a ringing phone
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RING 733
+
+/**
+ * Client <-> Server message to send audio data.
+ */
+#define GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO 734
+
+
+
 /*******************************************************************************
  * MULTICAST message types
  ******************************************************************************/