diff options
author | LRN <lrn1986@gmail.com> | 2013-03-13 17:49:26 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2013-03-13 17:49:26 +0000 |
commit | 405f776bc08486af4edb80e18149c0829732b347 (patch) | |
tree | d5fc635a51641dec6b53cb2540276f34ae8f6210 /src/arm/arm.h | |
parent | 3ceae682287492ecc768aea5c4c463216a35774d (diff) | |
download | gnunet-405f776bc08486af4edb80e18149c0829732b347.tar.gz gnunet-405f776bc08486af4edb80e18149c0829732b347.zip |
All-encompassing ARM update
Diffstat (limited to 'src/arm/arm.h')
-rw-r--r-- | src/arm/arm.h | 53 |
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 @@ | |||
36 | GNUNET_NETWORK_STRUCT_BEGIN | 36 | GNUNET_NETWORK_STRUCT_BEGIN |
37 | 37 | ||
38 | /** | 38 | /** |
39 | * Reply from ARM to client. | 39 | * Status update from ARM to client. |
40 | */ | 40 | */ |
41 | struct GNUNET_ARM_ResultMessage | 41 | struct GNUNET_ARM_StatusMessage |
42 | { | 42 | { |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_RESULT. | 45 | * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_STATUS. |
46 | */ | 46 | */ |
47 | struct GNUNET_MessageHeader header; | 47 | struct GNUNET_MessageHeader header; |
48 | 48 | ||
49 | /** | 49 | /** |
50 | * Status from the 'enum GNUNET_ARM_ProcessStatus' | 50 | * Status from the 'enum GNUNET_ARM_ServiceStatus' |
51 | */ | 51 | */ |
52 | uint32_t status; | 52 | uint32_t status; |
53 | |||
54 | /* followed by a 0-terminated service name */ | ||
55 | }; | ||
56 | |||
57 | struct GNUNET_ARM_Message | ||
58 | { | ||
59 | /** | ||
60 | * Reply to client, type is GNUNET_MESSAGE_TYPE_ARM_RESULT or | ||
61 | * GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT. | ||
62 | * OR | ||
63 | * Request from client, type is GNUNET_MESSAGE_TYPE_ARM_REQUEST | ||
64 | */ | ||
65 | struct GNUNET_MessageHeader header; | ||
66 | |||
67 | /** | ||
68 | * ID of a request that is being replied to. | ||
69 | * OR | ||
70 | * ID of a request that is being sent. | ||
71 | */ | ||
72 | uint64_t request_id; | ||
73 | |||
74 | /* For requests - followed by a 0-terminated service name */ | ||
75 | }; | ||
76 | |||
77 | |||
78 | /** | ||
79 | * Reply from ARM to client. | ||
80 | */ | ||
81 | struct GNUNET_ARM_ResultMessage | ||
82 | { | ||
83 | |||
84 | /** | ||
85 | * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_RESULT, with an ID. | ||
86 | */ | ||
87 | struct GNUNET_ARM_Message arm_msg; | ||
88 | |||
89 | /** | ||
90 | * Result from the 'enum GNUNET_ARM_Result' | ||
91 | */ | ||
92 | uint32_t result; | ||
53 | }; | 93 | }; |
54 | 94 | ||
55 | /** | 95 | /** |
@@ -61,9 +101,10 @@ struct GNUNET_ARM_ResultMessage | |||
61 | struct GNUNET_ARM_ListResultMessage | 101 | struct GNUNET_ARM_ListResultMessage |
62 | { | 102 | { |
63 | /** | 103 | /** |
64 | * Reply to client is of type GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT | 104 | * Reply to client, of type is GNUNET_MESSAGE_TYPE_ARM_LIST_RESULT, |
105 | * with an ID. | ||
65 | */ | 106 | */ |
66 | struct GNUNET_MessageHeader header; | 107 | struct GNUNET_ARM_Message arm_msg; |
67 | 108 | ||
68 | /** | 109 | /** |
69 | * Number of '\0' terminated strings that follow | 110 | * Number of '\0' terminated strings that follow |