*/
#define DEBUG_ARM GNUNET_EXTRA_LOGGING
+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;
+};
+
+/**
+ * Reply from ARM to client for the
+ * GNUNET_MESSAGE_TYPE_ARM_LIST request followed by count
+ * '\0' terminated strings. header->size contains the
+ * total size (including all strings).
+ */
+struct GNUNET_ARM_ListResultMessage
+{
+ /**
+ * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT,
+ * with an ID.
+ */
+ struct GNUNET_ARM_Message arm_msg;
+
+ /**
+ * Number of '\0' terminated strings that follow
+ * this message.
+ */
+ uint16_t count;
};
+GNUNET_NETWORK_STRUCT_END
#endif