diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-15 19:06:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-15 19:06:55 +0000 |
commit | dd594a4b0a7dbc57ea49f8a797a7a412e53baa53 (patch) | |
tree | 6a651b061395ebd9370cef01f14655ff50e81a66 /src/conversation/conversation.h | |
parent | 1c405f3fb76f509113526678dbe9a5736dfce394 (diff) | |
download | gnunet-dd594a4b0a7dbc57ea49f8a797a7a412e53baa53.tar.gz gnunet-dd594a4b0a7dbc57ea49f8a797a7a412e53baa53.zip |
-towards enabling call waiting in conversation -- creates FTBFS
Diffstat (limited to 'src/conversation/conversation.h')
-rw-r--r-- | src/conversation/conversation.h | 77 |
1 files changed, 63 insertions, 14 deletions
diff --git a/src/conversation/conversation.h b/src/conversation/conversation.h index e2316984a..91afbbce4 100644 --- a/src/conversation/conversation.h +++ b/src/conversation/conversation.h | |||
@@ -82,9 +82,10 @@ struct ClientPhoneRingMessage | |||
82 | struct GNUNET_MessageHeader header; | 82 | struct GNUNET_MessageHeader header; |
83 | 83 | ||
84 | /** | 84 | /** |
85 | * Always zero. | 85 | * CID, internal caller ID to identify which active call we are |
86 | * talking about. | ||
86 | */ | 87 | */ |
87 | uint32_t reserved GNUNET_PACKED; | 88 | uint32_t cid GNUNET_PACKED; |
88 | 89 | ||
89 | /** | 90 | /** |
90 | * Who is calling us? | 91 | * Who is calling us? |
@@ -95,15 +96,40 @@ struct ClientPhoneRingMessage | |||
95 | 96 | ||
96 | 97 | ||
97 | /** | 98 | /** |
98 | * Service -> Client message for phone is busy. | 99 | * Service <-> Client message for phone was suspended. |
99 | */ | 100 | */ |
100 | struct ClientPhoneBusyMessage | 101 | struct ClientPhoneSuspendMessage |
101 | { | 102 | { |
102 | /** | 103 | /** |
103 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_BUSY | 104 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_SUSPEND |
104 | */ | 105 | */ |
105 | struct GNUNET_MessageHeader header; | 106 | struct GNUNET_MessageHeader header; |
106 | 107 | ||
108 | /** | ||
109 | * CID, internal caller ID to identify which active call we are | ||
110 | * talking about. | ||
111 | */ | ||
112 | uint32_t cid GNUNET_PACKED; | ||
113 | |||
114 | }; | ||
115 | |||
116 | |||
117 | /** | ||
118 | * Service <-> Client message for phone was resumed. | ||
119 | */ | ||
120 | struct ClientPhoneResumeMessage | ||
121 | { | ||
122 | /** | ||
123 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_RESUME | ||
124 | */ | ||
125 | struct GNUNET_MessageHeader header; | ||
126 | |||
127 | /** | ||
128 | * CID, internal caller ID to identify which active call we are | ||
129 | * talking about. | ||
130 | */ | ||
131 | uint32_t cid GNUNET_PACKED; | ||
132 | |||
107 | }; | 133 | }; |
108 | 134 | ||
109 | 135 | ||
@@ -117,7 +143,11 @@ struct ClientPhonePickupMessage | |||
117 | */ | 143 | */ |
118 | struct GNUNET_MessageHeader header; | 144 | struct GNUNET_MessageHeader header; |
119 | 145 | ||
120 | /* followed by variable length 0-terminated string with meta data */ | 146 | /** |
147 | * CID, internal caller ID to identify which active call we are | ||
148 | * talking about. | ||
149 | */ | ||
150 | uint32_t cid GNUNET_PACKED; | ||
121 | 151 | ||
122 | }; | 152 | }; |
123 | 153 | ||
@@ -133,7 +163,11 @@ struct ClientPhoneHangupMessage | |||
133 | */ | 163 | */ |
134 | struct GNUNET_MessageHeader header; | 164 | struct GNUNET_MessageHeader header; |
135 | 165 | ||
136 | /* followed by variable length 0-terminated string with meta data */ | 166 | /** |
167 | * CID, internal caller ID to identify which active call we are | ||
168 | * talking about. | ||
169 | */ | ||
170 | uint32_t cid GNUNET_PACKED; | ||
137 | 171 | ||
138 | }; | 172 | }; |
139 | 173 | ||
@@ -148,6 +182,12 @@ struct ClientAudioMessage | |||
148 | */ | 182 | */ |
149 | struct GNUNET_MessageHeader header; | 183 | struct GNUNET_MessageHeader header; |
150 | 184 | ||
185 | /** | ||
186 | * CID, internal caller ID to identify which active call we are | ||
187 | * sending data to. | ||
188 | */ | ||
189 | uint32_t cid GNUNET_PACKED; | ||
190 | |||
151 | /* followed by audio data */ | 191 | /* followed by audio data */ |
152 | 192 | ||
153 | }; | 193 | }; |
@@ -191,8 +231,6 @@ struct ClientPhonePickedupMessage | |||
191 | */ | 231 | */ |
192 | struct GNUNET_MessageHeader header; | 232 | struct GNUNET_MessageHeader header; |
193 | 233 | ||
194 | /* followed by variable length 0-terminated string with meta data */ | ||
195 | |||
196 | }; | 234 | }; |
197 | 235 | ||
198 | 236 | ||
@@ -259,7 +297,6 @@ struct MeshPhoneHangupMessage | |||
259 | */ | 297 | */ |
260 | struct GNUNET_MessageHeader header; | 298 | struct GNUNET_MessageHeader header; |
261 | 299 | ||
262 | /* followed by variable-size 0-terminated reason string */ | ||
263 | }; | 300 | }; |
264 | 301 | ||
265 | 302 | ||
@@ -273,17 +310,29 @@ struct MeshPhonePickupMessage | |||
273 | */ | 310 | */ |
274 | struct GNUNET_MessageHeader header; | 311 | struct GNUNET_MessageHeader header; |
275 | 312 | ||
276 | /* followed by variable-size 0-terminated metadata string */ | ||
277 | }; | 313 | }; |
278 | 314 | ||
279 | 315 | ||
280 | /** | 316 | /** |
281 | * Mesh message for phone busy. | 317 | * Mesh message for phone suspended. |
318 | */ | ||
319 | struct MeshPhoneSuspendMessage | ||
320 | { | ||
321 | /** | ||
322 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_SUSPEND | ||
323 | */ | ||
324 | struct GNUNET_MessageHeader header; | ||
325 | |||
326 | }; | ||
327 | |||
328 | |||
329 | /** | ||
330 | * Mesh message for phone resumed. | ||
282 | */ | 331 | */ |
283 | struct MeshPhoneBusyMessage | 332 | struct MeshPhoneResumeMessage |
284 | { | 333 | { |
285 | /** | 334 | /** |
286 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_BUSY | 335 | * Type is: #GNUNET_MESSAGE_TYPE_CONVERSATION_MESH_PHONE_RESUME |
287 | */ | 336 | */ |
288 | struct GNUNET_MessageHeader header; | 337 | struct GNUNET_MessageHeader header; |
289 | 338 | ||