diff options
Diffstat (limited to 'src/namestore/namestore.h')
-rw-r--r-- | src/namestore/namestore.h | 66 |
1 files changed, 28 insertions, 38 deletions
diff --git a/src/namestore/namestore.h b/src/namestore/namestore.h index 0b50ac1ab..35d54d317 100644 --- a/src/namestore/namestore.h +++ b/src/namestore/namestore.h | |||
@@ -98,7 +98,7 @@ struct RecordStoreMessage | |||
98 | /** | 98 | /** |
99 | * Length of the zone key | 99 | * Length of the zone key |
100 | */ | 100 | */ |
101 | uint32_t key_len GNUNET_PACKED; | 101 | uint16_t key_len GNUNET_PACKED; |
102 | 102 | ||
103 | /** | 103 | /** |
104 | * Followed by the private zone key | 104 | * Followed by the private zone key |
@@ -138,12 +138,12 @@ struct LabelLookupMessage | |||
138 | /** | 138 | /** |
139 | * Length of the name | 139 | * Length of the name |
140 | */ | 140 | */ |
141 | uint32_t label_len GNUNET_PACKED; | 141 | uint16_t label_len GNUNET_PACKED; |
142 | 142 | ||
143 | /** | 143 | /** |
144 | * GNUNET_YES if this lookup corresponds to an edit request | 144 | * GNUNET_YES if this lookup corresponds to an edit request |
145 | */ | 145 | */ |
146 | uint32_t is_edit_request GNUNET_PACKED; | 146 | uint16_t is_edit_request GNUNET_PACKED; |
147 | 147 | ||
148 | /** | 148 | /** |
149 | * The record filter | 149 | * The record filter |
@@ -153,7 +153,7 @@ struct LabelLookupMessage | |||
153 | /** | 153 | /** |
154 | * Length of the zone key | 154 | * Length of the zone key |
155 | */ | 155 | */ |
156 | uint32_t key_len GNUNET_PACKED; | 156 | uint16_t key_len GNUNET_PACKED; |
157 | 157 | ||
158 | /* followed by: | 158 | /* followed by: |
159 | * the private zone key | 159 | * the private zone key |
@@ -194,9 +194,14 @@ struct LabelLookupResponseMessage | |||
194 | int16_t found GNUNET_PACKED; | 194 | int16_t found GNUNET_PACKED; |
195 | 195 | ||
196 | /** | 196 | /** |
197 | * Reserved (alignment) | ||
198 | */ | ||
199 | uint16_t reserved GNUNET_PACKED; | ||
200 | |||
201 | /** | ||
197 | * Length of the zone key | 202 | * Length of the zone key |
198 | */ | 203 | */ |
199 | uint32_t key_len GNUNET_PACKED; | 204 | uint16_t key_len GNUNET_PACKED; |
200 | 205 | ||
201 | /* followed by: | 206 | /* followed by: |
202 | * the private zone key | 207 | * the private zone key |
@@ -219,12 +224,12 @@ struct ZoneToNameMessage | |||
219 | /** | 224 | /** |
220 | * Length of the zone key | 225 | * Length of the zone key |
221 | */ | 226 | */ |
222 | uint32_t key_len GNUNET_PACKED; | 227 | uint16_t key_len GNUNET_PACKED; |
223 | 228 | ||
224 | /** | 229 | /** |
225 | * Length of the public value zone key | 230 | * Length of the public value zone key |
226 | */ | 231 | */ |
227 | uint32_t pkey_len GNUNET_PACKED; | 232 | uint16_t pkey_len GNUNET_PACKED; |
228 | 233 | ||
229 | /** | 234 | /** |
230 | * Followed by | 235 | * Followed by |
@@ -245,6 +250,14 @@ struct ZoneToNameResponseMessage | |||
245 | struct GNUNET_NAMESTORE_Header gns_header; | 250 | struct GNUNET_NAMESTORE_Header gns_header; |
246 | 251 | ||
247 | /** | 252 | /** |
253 | * result in NBO: #GNUNET_EC_NONE on success, | ||
254 | * #GNUNET_EC_NAMESTORE_NO_RESULTS if there were no | ||
255 | * results. | ||
256 | * Other error messages on error. | ||
257 | */ | ||
258 | int32_t ec GNUNET_PACKED; | ||
259 | |||
260 | /** | ||
248 | * Length of the name | 261 | * Length of the name |
249 | */ | 262 | */ |
250 | uint16_t name_len GNUNET_PACKED; | 263 | uint16_t name_len GNUNET_PACKED; |
@@ -260,17 +273,9 @@ struct ZoneToNameResponseMessage | |||
260 | uint16_t rd_count GNUNET_PACKED; | 273 | uint16_t rd_count GNUNET_PACKED; |
261 | 274 | ||
262 | /** | 275 | /** |
263 | * result in NBO: #GNUNET_EC_NONE on success, | ||
264 | * #GNUNET_EC_NAMESTORE_NO_RESULTS if there were no | ||
265 | * results. | ||
266 | * Other error messages on error. | ||
267 | */ | ||
268 | int32_t ec GNUNET_PACKED; | ||
269 | |||
270 | /** | ||
271 | * Length of the zone key | 276 | * Length of the zone key |
272 | */ | 277 | */ |
273 | uint32_t key_len GNUNET_PACKED; | 278 | uint16_t key_len GNUNET_PACKED; |
274 | 279 | ||
275 | /* followed by: | 280 | /* followed by: |
276 | * the private zone key | 281 | * the private zone key |
@@ -312,14 +317,9 @@ struct RecordResultMessage | |||
312 | uint16_t rd_count GNUNET_PACKED; | 317 | uint16_t rd_count GNUNET_PACKED; |
313 | 318 | ||
314 | /** | 319 | /** |
315 | * always zero (for alignment) | ||
316 | */ | ||
317 | uint16_t reserved GNUNET_PACKED; | ||
318 | |||
319 | /** | ||
320 | * Length of the zone key | 320 | * Length of the zone key |
321 | */ | 321 | */ |
322 | uint32_t key_len GNUNET_PACKED; | 322 | uint16_t key_len GNUNET_PACKED; |
323 | 323 | ||
324 | /* followed by: | 324 | /* followed by: |
325 | * the private key of the authority | 325 | * the private key of the authority |
@@ -339,14 +339,14 @@ struct TxControlMessage | |||
339 | struct GNUNET_NAMESTORE_Header gns_header; | 339 | struct GNUNET_NAMESTORE_Header gns_header; |
340 | 340 | ||
341 | /** | 341 | /** |
342 | * The type of control message to send | 342 | * always zero (for alignment) |
343 | */ | 343 | */ |
344 | uint16_t control GNUNET_PACKED; | 344 | uint16_t reserved GNUNET_PACKED; |
345 | 345 | ||
346 | /** | 346 | /** |
347 | * always zero (for alignment) | 347 | * The type of control message to send |
348 | */ | 348 | */ |
349 | uint16_t reserved GNUNET_PACKED; | 349 | uint16_t control GNUNET_PACKED; |
350 | 350 | ||
351 | }; | 351 | }; |
352 | 352 | ||
@@ -392,14 +392,9 @@ struct ZoneMonitorStartMessage | |||
392 | uint16_t filter; | 392 | uint16_t filter; |
393 | 393 | ||
394 | /** | 394 | /** |
395 | * Reserved for alignment | ||
396 | */ | ||
397 | uint16_t reserved; | ||
398 | |||
399 | /** | ||
400 | * Length of the zone key | 395 | * Length of the zone key |
401 | */ | 396 | */ |
402 | uint32_t key_len GNUNET_PACKED; | 397 | uint16_t key_len GNUNET_PACKED; |
403 | 398 | ||
404 | /** | 399 | /** |
405 | * Followed by the private zone key. | 400 | * Followed by the private zone key. |
@@ -448,14 +443,9 @@ struct ZoneIterationStartMessage | |||
448 | uint16_t filter; | 443 | uint16_t filter; |
449 | 444 | ||
450 | /** | 445 | /** |
451 | * Reserved for alignment | ||
452 | */ | ||
453 | uint16_t reserved; | ||
454 | |||
455 | /** | ||
456 | * Length of the zone key | 446 | * Length of the zone key |
457 | */ | 447 | */ |
458 | uint32_t key_len GNUNET_PACKED; | 448 | uint16_t key_len GNUNET_PACKED; |
459 | 449 | ||
460 | /** | 450 | /** |
461 | * Followed by the private zone key (optional) | 451 | * Followed by the private zone key (optional) |