All-encompassing ARM update

1 files changed, 47 insertions, 6 deletions

diff --git a/src/arm/arm.h b/src/arm/arm.h
index 21884107c..aad16fd71 100644
--- a/src/arm/arm.h
+++ b/src/arm/arm.h
@@ -36,20 +36,60 @@
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * Reply from ARM to client.
+ * Status update from ARM to client.
  */
-struct GNUNET_ARM_ResultMessage
+struct GNUNET_ARM_StatusMessage
 {
 
   /**
-   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_RESULT. 
+   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_STATUS. 
    */
   struct GNUNET_MessageHeader header;
   
   /**
-   * Status from the 'enum GNUNET_ARM_ProcessStatus'
+   * Status from the 'enum GNUNET_ARM_ServiceStatus'
    */
   uint32_t status;
+
+  /* followed by a 0-terminated service name */
+};
+
+struct GNUNET_ARM_Message
+{
+  /**
+   * Reply to client, type is GNUNET_MESSAGE_TYPE_ARM_RESULT or
+   * GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT. 
+   * OR
+   * Request from client, type is GNUNET_MESSAGE_TYPE_ARM_REQUEST
+   */
+  struct GNUNET_MessageHeader header;
+  
+  /**
+   * ID of a request that is being replied to.
+   * OR
+   * ID of a request that is being sent.
+   */
+  uint64_t request_id;
+
+  /* For requests - followed by a 0-terminated service name */
+};
+
+
+/**
+ * Reply from ARM to client.
+ */
+struct GNUNET_ARM_ResultMessage
+{
+
+  /**
+   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_RESULT, with an ID.
+   */
+  struct GNUNET_ARM_Message arm_msg;
+  
+  /**
+   * Result from the 'enum GNUNET_ARM_Result'
+   */
+  uint32_t result;
 };
 
 /**
@@ -61,9 +101,10 @@ struct GNUNET_ARM_ResultMessage
 struct GNUNET_ARM_ListResultMessage
 {
   /**
-   * Reply to client is of type GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT
+   * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT,
+   * with an ID.
    */
-  struct GNUNET_MessageHeader header;
+  struct GNUNET_ARM_Message arm_msg;
 
   /**
    * Number of '\0' terminated strings that follow