-fix build system issues

[oweals/gnunet.git] / src / conversation / conversation.h

diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h
index 4b42277a55fcf6fb3437d5c98f12079ef56735ea..bc78400f1e83a323cd13d4ae91dd2dc0ac4f4851 100644 (file)
--- a/src/conversation/conversation.h
+++ b/src/conversation/conversation.h
@@ -82,28 +82,54 @@ struct ClientPhoneRingMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Always zero.
+   * CID, internal caller ID to identify which active call we are
+   * talking about.
    */
-  uint32_t reserved GNUNET_PACKED;
+  uint32_t cid GNUNET_PACKED;
 
   /**
    * Who is calling us?
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
 
 };
 
 
 /**
- * Service -> Client message for phone is busy.
+ * Service <-> Client message for phone was suspended.
  */
-struct ClientPhoneBusyMessage
+struct ClientPhoneSuspendMessage
 {
   /**
-   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY
+   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * CID, internal caller ID to identify which active call we are
+   * talking about.
+   */
+  uint32_t cid GNUNET_PACKED;
+
+};
+
+
+/**
+ * Service <-> Client message for phone was resumed.
+ */
+struct ClientPhoneResumeMessage
+{
+  /**
+   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
+   * CID, internal caller ID to identify which active call we are
+   * talking about.
+   */
+  uint32_t cid GNUNET_PACKED;
+
 };
 
 
@@ -117,7 +143,11 @@ struct ClientPhonePickupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /* followed by variable length 0-terminated string with meta data */
+  /**
+   * CID, internal caller ID to identify which active call we are
+   * talking about.
+   */
+  uint32_t cid GNUNET_PACKED;
 
 };
 
@@ -133,7 +163,11 @@ struct ClientPhoneHangupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /* followed by variable length 0-terminated string with meta data */
+  /**
+   * CID, internal caller ID to identify which active call we are
+   * talking about.
+   */
+  uint32_t cid GNUNET_PACKED;
 
 };
 
@@ -148,6 +182,12 @@ struct ClientAudioMessage
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * CID, internal caller ID to identify which active call we are
+   * sending data to.
+   */
+  uint32_t cid GNUNET_PACKED;
+
   /* followed by audio data */
 
 };
@@ -176,7 +216,7 @@ struct ClientCallMessage
   /**
    * Identity of the caller.
    */
-  struct GNUNET_CRYPTO_EccPrivateKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPrivateKey caller_id;
 };
 
 
@@ -191,8 +231,6 @@ struct ClientPhonePickedupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /* followed by variable length 0-terminated string with meta data */
-
 };
 
 
@@ -219,7 +257,7 @@ struct MeshPhoneRingMessage
   /**
    * Who is calling us? (also who is signing).
    */
-  struct GNUNET_CRYPTO_EccPublicSignKey caller_id;
+  struct GNUNET_CRYPTO_EcdsaPublicKey caller_id;
 
   /**
    * Who are we calling?
@@ -239,7 +277,7 @@ struct MeshPhoneRingMessage
   /**
    * Signature on the above.
    */
-  struct GNUNET_CRYPTO_EccSignature signature;
+  struct GNUNET_CRYPTO_EcdsaSignature signature;
 
   /**
    * Source line for audio data in the other direction.
@@ -259,7 +297,6 @@ struct MeshPhoneHangupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /* followed by variable-size 0-terminated reason string */
 };
 
 
@@ -273,17 +310,29 @@ struct MeshPhonePickupMessage
    */
   struct GNUNET_MessageHeader header;
 
-  /* followed by variable-size 0-terminated metadata string */
 };
 
 
 /**
- * Mesh message for phone busy.
+ * Mesh message for phone suspended.
  */
-struct MeshPhoneBusyMessage
+struct MeshPhoneSuspendMessage
 {
   /**
-   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY
+   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND
+   */
+  struct GNUNET_MessageHeader header;
+
+};
+
+
+/**
+ * Mesh message for phone resumed.
+ */
+struct MeshPhoneResumeMessage
+{
+  /**
+   * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME
    */
   struct GNUNET_MessageHeader header;
 
@@ -303,7 +352,12 @@ struct MeshAudioMessage
   /**
    * Target line on the receiving end.
    */
-  uint32_t remote_line;
+  uint32_t remote_line GNUNET_PACKED;
+
+  /**
+   * The source line sending this data
+   */
+  uint32_t source_line GNUNET_PACKED;
 
   /* followed by audio data */