diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/block_dns.h | 2 | ||||
-rw-r--r-- | src/include/block_fs.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_block_lib.h | 10 | ||||
-rw-r--r-- | src/include/gnunet_block_plugin.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_chat_service.h | 6 | ||||
-rw-r--r-- | src/include/gnunet_common.h | 11 | ||||
-rw-r--r-- | src/include/gnunet_constants.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_container_lib.h | 24 | ||||
-rw-r--r-- | src/include/gnunet_crypto_lib.h | 60 | ||||
-rw-r--r-- | src/include/gnunet_datacache_lib.h | 6 | ||||
-rw-r--r-- | src/include/gnunet_datacache_plugin.h | 6 | ||||
-rw-r--r-- | src/include/gnunet_datastore_plugin.h | 10 | ||||
-rw-r--r-- | src/include/gnunet_datastore_service.h | 8 | ||||
-rw-r--r-- | src/include/gnunet_dht_service.h | 14 | ||||
-rw-r--r-- | src/include/gnunet_fs_service.h | 12 | ||||
-rw-r--r-- | src/include/gnunet_pseudonym_lib.h | 14 | ||||
-rw-r--r-- | src/include/gnunet_regex_lib.h | 8 | ||||
-rw-r--r-- | src/include/gnunet_vpn_service.h | 2 |
18 files changed, 101 insertions, 102 deletions
diff --git a/src/include/block_dns.h b/src/include/block_dns.h index e047779c5..0ca5a47a5 100644 --- a/src/include/block_dns.h +++ b/src/include/block_dns.h | |||
@@ -64,7 +64,7 @@ struct GNUNET_DNS_Record | |||
64 | * The descriptor for the service | 64 | * The descriptor for the service |
65 | * (a peer may provide more than one service) | 65 | * (a peer may provide more than one service) |
66 | */ | 66 | */ |
67 | GNUNET_HashCode service_descriptor; | 67 | struct GNUNET_HashCode service_descriptor; |
68 | 68 | ||
69 | /** | 69 | /** |
70 | * When does this record expire? | 70 | * When does this record expire? |
diff --git a/src/include/block_fs.h b/src/include/block_fs.h index aae741e60..0b77adc49 100644 --- a/src/include/block_fs.h +++ b/src/include/block_fs.h | |||
@@ -78,7 +78,7 @@ struct SBlock | |||
78 | * used as the key for decryption; the xor of this identifier | 78 | * used as the key for decryption; the xor of this identifier |
79 | * and the hash of the "keyspace" is the datastore-query hash). | 79 | * and the hash of the "keyspace" is the datastore-query hash). |
80 | */ | 80 | */ |
81 | GNUNET_HashCode identifier; | 81 | struct GNUNET_HashCode identifier; |
82 | 82 | ||
83 | /** | 83 | /** |
84 | * Public key of the namespace. | 84 | * Public key of the namespace. |
@@ -153,7 +153,7 @@ struct OnDemandBlock | |||
153 | * file that was indexed (used to uniquely | 153 | * file that was indexed (used to uniquely |
154 | * identify the plaintext file). | 154 | * identify the plaintext file). |
155 | */ | 155 | */ |
156 | GNUNET_HashCode file_id; | 156 | struct GNUNET_HashCode file_id; |
157 | 157 | ||
158 | /** | 158 | /** |
159 | * At which offset should we be able to find | 159 | * At which offset should we be able to find |
diff --git a/src/include/gnunet_block_lib.h b/src/include/gnunet_block_lib.h index adc17751d..41001fb0b 100644 --- a/src/include/gnunet_block_lib.h +++ b/src/include/gnunet_block_lib.h | |||
@@ -160,8 +160,8 @@ struct GNUNET_BLOCK_Context; | |||
160 | * @param hc where to store the result. | 160 | * @param hc where to store the result. |
161 | */ | 161 | */ |
162 | void | 162 | void |
163 | GNUNET_BLOCK_mingle_hash (const GNUNET_HashCode * in, uint32_t mingle_number, | 163 | GNUNET_BLOCK_mingle_hash (const struct GNUNET_HashCode * in, uint32_t mingle_number, |
164 | GNUNET_HashCode * hc); | 164 | struct GNUNET_HashCode * hc); |
165 | 165 | ||
166 | 166 | ||
167 | /** | 167 | /** |
@@ -204,7 +204,7 @@ GNUNET_BLOCK_context_destroy (struct GNUNET_BLOCK_Context *ctx); | |||
204 | enum GNUNET_BLOCK_EvaluationResult | 204 | enum GNUNET_BLOCK_EvaluationResult |
205 | GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | 205 | GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, |
206 | enum GNUNET_BLOCK_Type type, | 206 | enum GNUNET_BLOCK_Type type, |
207 | const GNUNET_HashCode * query, | 207 | const struct GNUNET_HashCode * query, |
208 | struct GNUNET_CONTAINER_BloomFilter **bf, | 208 | struct GNUNET_CONTAINER_BloomFilter **bf, |
209 | int32_t bf_mutator, const void *xquery, | 209 | int32_t bf_mutator, const void *xquery, |
210 | size_t xquery_size, const void *reply_block, | 210 | size_t xquery_size, const void *reply_block, |
@@ -227,7 +227,7 @@ GNUNET_BLOCK_evaluate (struct GNUNET_BLOCK_Context *ctx, | |||
227 | int | 227 | int |
228 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, | 228 | GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, |
229 | enum GNUNET_BLOCK_Type type, const void *block, | 229 | enum GNUNET_BLOCK_Type type, const void *block, |
230 | size_t block_size, GNUNET_HashCode * key); | 230 | size_t block_size, struct GNUNET_HashCode * key); |
231 | 231 | ||
232 | 232 | ||
233 | 233 | ||
@@ -243,7 +243,7 @@ GNUNET_BLOCK_get_key (struct GNUNET_BLOCK_Context *ctx, | |||
243 | */ | 243 | */ |
244 | struct GNUNET_CONTAINER_BloomFilter * | 244 | struct GNUNET_CONTAINER_BloomFilter * |
245 | GNUNET_BLOCK_construct_bloomfilter (int32_t bf_mutator, | 245 | GNUNET_BLOCK_construct_bloomfilter (int32_t bf_mutator, |
246 | const GNUNET_HashCode * seen_results, | 246 | const struct GNUNET_HashCode * seen_results, |
247 | unsigned int seen_results_count); | 247 | unsigned int seen_results_count); |
248 | 248 | ||
249 | 249 | ||
diff --git a/src/include/gnunet_block_plugin.h b/src/include/gnunet_block_plugin.h index 0ead4afad..ac549fec7 100644 --- a/src/include/gnunet_block_plugin.h +++ b/src/include/gnunet_block_plugin.h | |||
@@ -56,7 +56,7 @@ typedef enum | |||
56 | GNUNET_BLOCK_Type | 56 | GNUNET_BLOCK_Type |
57 | type, | 57 | type, |
58 | const | 58 | const |
59 | GNUNET_HashCode | 59 | struct GNUNET_HashCode |
60 | * query, | 60 | * query, |
61 | struct | 61 | struct |
62 | GNUNET_CONTAINER_BloomFilter | 62 | GNUNET_CONTAINER_BloomFilter |
@@ -90,7 +90,7 @@ typedef int (*GNUNET_BLOCK_GetKeyFunction) (void *cls, | |||
90 | enum GNUNET_BLOCK_Type type, | 90 | enum GNUNET_BLOCK_Type type, |
91 | const void *block, | 91 | const void *block, |
92 | size_t block_size, | 92 | size_t block_size, |
93 | GNUNET_HashCode * key); | 93 | struct GNUNET_HashCode * key); |
94 | 94 | ||
95 | 95 | ||
96 | 96 | ||
diff --git a/src/include/gnunet_chat_service.h b/src/include/gnunet_chat_service.h index 938b43423..8e77f9b65 100644 --- a/src/include/gnunet_chat_service.h +++ b/src/include/gnunet_chat_service.h | |||
@@ -111,7 +111,7 @@ typedef int (*GNUNET_CHAT_JoinCallback) (void *cls); | |||
111 | */ | 111 | */ |
112 | typedef int (*GNUNET_CHAT_MessageCallback) (void *cls, | 112 | typedef int (*GNUNET_CHAT_MessageCallback) (void *cls, |
113 | struct GNUNET_CHAT_Room * room, | 113 | struct GNUNET_CHAT_Room * room, |
114 | const GNUNET_HashCode * sender, | 114 | const struct GNUNET_HashCode * sender, |
115 | const struct | 115 | const struct |
116 | GNUNET_CONTAINER_MetaData * | 116 | GNUNET_CONTAINER_MetaData * |
117 | member_info, const char *message, | 117 | member_info, const char *message, |
@@ -156,7 +156,7 @@ typedef int (*GNUNET_CHAT_MessageConfirmation) (void *cls, | |||
156 | uint32_t orig_seq_number, | 156 | uint32_t orig_seq_number, |
157 | struct GNUNET_TIME_Absolute | 157 | struct GNUNET_TIME_Absolute |
158 | timestamp, | 158 | timestamp, |
159 | const GNUNET_HashCode * | 159 | const struct GNUNET_HashCode * |
160 | receiver); | 160 | receiver); |
161 | 161 | ||
162 | /** | 162 | /** |
@@ -195,7 +195,7 @@ GNUNET_CHAT_join_room (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
195 | GNUNET_CHAT_MemberListCallback memberCallback, | 195 | GNUNET_CHAT_MemberListCallback memberCallback, |
196 | void *member_cls, | 196 | void *member_cls, |
197 | GNUNET_CHAT_MessageConfirmation confirmationCallback, | 197 | GNUNET_CHAT_MessageConfirmation confirmationCallback, |
198 | void *confirmation_cls, GNUNET_HashCode * me); | 198 | void *confirmation_cls, struct GNUNET_HashCode * me); |
199 | 199 | ||
200 | /** | 200 | /** |
201 | * Send a message. | 201 | * Send a message. |
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h index 9f776587e..63a154390 100644 --- a/src/include/gnunet_common.h +++ b/src/include/gnunet_common.h | |||
@@ -224,11 +224,10 @@ struct GNUNET_MessageHeader | |||
224 | /** | 224 | /** |
225 | * @brief 512-bit hashcode | 225 | * @brief 512-bit hashcode |
226 | */ | 226 | */ |
227 | typedef struct GNUNET_HashCode | 227 | struct GNUNET_HashCode |
228 | { | 228 | { |
229 | uint32_t bits[512 / 8 / sizeof (uint32_t)]; /* = 16 */ | 229 | uint32_t bits[512 / 8 / sizeof (uint32_t)]; /* = 16 */ |
230 | } | 230 | }; |
231 | GNUNET_HashCode; | ||
232 | 231 | ||
233 | 232 | ||
234 | /** | 233 | /** |
@@ -237,7 +236,7 @@ GNUNET_HashCode; | |||
237 | */ | 236 | */ |
238 | struct GNUNET_PeerIdentity | 237 | struct GNUNET_PeerIdentity |
239 | { | 238 | { |
240 | GNUNET_HashCode hashPubKey; | 239 | struct GNUNET_HashCode hashPubKey; |
241 | }; | 240 | }; |
242 | GNUNET_NETWORK_STRUCT_END | 241 | GNUNET_NETWORK_STRUCT_END |
243 | 242 | ||
@@ -428,7 +427,7 @@ GNUNET_logger_remove (GNUNET_Logger logger, void *logger_cls); | |||
428 | * @return string | 427 | * @return string |
429 | */ | 428 | */ |
430 | const char * | 429 | const char * |
431 | GNUNET_h2s (const GNUNET_HashCode * hc); | 430 | GNUNET_h2s (const struct GNUNET_HashCode * hc); |
432 | 431 | ||
433 | 432 | ||
434 | /** | 433 | /** |
@@ -441,7 +440,7 @@ GNUNET_h2s (const GNUNET_HashCode * hc); | |||
441 | * @return string | 440 | * @return string |
442 | */ | 441 | */ |
443 | const char * | 442 | const char * |
444 | GNUNET_h2s_full (const GNUNET_HashCode * hc); | 443 | GNUNET_h2s_full (const struct GNUNET_HashCode * hc); |
445 | 444 | ||
446 | 445 | ||
447 | /** | 446 | /** |
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h index 771b473e8..93eec8ded 100644 --- a/src/include/gnunet_constants.h +++ b/src/include/gnunet_constants.h | |||
@@ -116,7 +116,7 @@ extern "C" | |||
116 | * Size of the 'struct EncryptedMessage' of the core (which | 116 | * Size of the 'struct EncryptedMessage' of the core (which |
117 | * is the per-message overhead of the core). | 117 | * is the per-message overhead of the core). |
118 | */ | 118 | */ |
119 | #define GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE (24 + sizeof (GNUNET_HashCode)) | 119 | #define GNUNET_CONSTANTS_CORE_SIZE_ENCRYPTED_MESSAGE (24 + sizeof (struct GNUNET_HashCode)) |
120 | 120 | ||
121 | /** | 121 | /** |
122 | * Size of the 'struct OutboundMessage' of the transport | 122 | * Size of the 'struct OutboundMessage' of the transport |
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h index a78d8cc8f..d9f17d6a8 100644 --- a/src/include/gnunet_container_lib.h +++ b/src/include/gnunet_container_lib.h | |||
@@ -62,7 +62,7 @@ struct GNUNET_CONTAINER_BloomFilter; | |||
62 | * @return GNUNET_YES if next was updated | 62 | * @return GNUNET_YES if next was updated |
63 | * GNUNET_NO if there are no more entries | 63 | * GNUNET_NO if there are no more entries |
64 | */ | 64 | */ |
65 | typedef int (*GNUNET_HashCodeIterator) (void *cls, GNUNET_HashCode * next); | 65 | typedef int (*GNUNET_HashCodeIterator) (void *cls, struct GNUNET_HashCode * next); |
66 | 66 | ||
67 | 67 | ||
68 | /** | 68 | /** |
@@ -121,7 +121,7 @@ GNUNET_CONTAINER_bloomfilter_get_raw_data (const struct | |||
121 | */ | 121 | */ |
122 | int | 122 | int |
123 | GNUNET_CONTAINER_bloomfilter_test (const struct GNUNET_CONTAINER_BloomFilter | 123 | GNUNET_CONTAINER_bloomfilter_test (const struct GNUNET_CONTAINER_BloomFilter |
124 | *bf, const GNUNET_HashCode * e); | 124 | *bf, const struct GNUNET_HashCode * e); |
125 | 125 | ||
126 | 126 | ||
127 | /** | 127 | /** |
@@ -131,7 +131,7 @@ GNUNET_CONTAINER_bloomfilter_test (const struct GNUNET_CONTAINER_BloomFilter | |||
131 | */ | 131 | */ |
132 | void | 132 | void |
133 | GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf, | 133 | GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf, |
134 | const GNUNET_HashCode * e); | 134 | const struct GNUNET_HashCode * e); |
135 | 135 | ||
136 | 136 | ||
137 | /** | 137 | /** |
@@ -141,7 +141,7 @@ GNUNET_CONTAINER_bloomfilter_add (struct GNUNET_CONTAINER_BloomFilter *bf, | |||
141 | */ | 141 | */ |
142 | void | 142 | void |
143 | GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf, | 143 | GNUNET_CONTAINER_bloomfilter_remove (struct GNUNET_CONTAINER_BloomFilter *bf, |
144 | const GNUNET_HashCode * e); | 144 | const struct GNUNET_HashCode * e); |
145 | 145 | ||
146 | 146 | ||
147 | /** | 147 | /** |
@@ -534,7 +534,7 @@ enum GNUNET_CONTAINER_MultiHashMapOption | |||
534 | * GNUNET_NO if not. | 534 | * GNUNET_NO if not. |
535 | */ | 535 | */ |
536 | typedef int (*GNUNET_CONTAINER_HashMapIterator) (void *cls, | 536 | typedef int (*GNUNET_CONTAINER_HashMapIterator) (void *cls, |
537 | const GNUNET_HashCode * key, | 537 | const struct GNUNET_HashCode * key, |
538 | void *value); | 538 | void *value); |
539 | 539 | ||
540 | 540 | ||
@@ -571,7 +571,7 @@ GNUNET_CONTAINER_multihashmap_destroy (struct GNUNET_CONTAINER_MultiHashMap | |||
571 | */ | 571 | */ |
572 | void * | 572 | void * |
573 | GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap | 573 | GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap |
574 | *map, const GNUNET_HashCode * key); | 574 | *map, const struct GNUNET_HashCode * key); |
575 | 575 | ||
576 | 576 | ||
577 | /** | 577 | /** |
@@ -587,7 +587,7 @@ GNUNET_CONTAINER_multihashmap_get (const struct GNUNET_CONTAINER_MultiHashMap | |||
587 | */ | 587 | */ |
588 | int | 588 | int |
589 | GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, | 589 | GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, |
590 | const GNUNET_HashCode * key, void *value); | 590 | const struct GNUNET_HashCode * key, void *value); |
591 | 591 | ||
592 | /** | 592 | /** |
593 | * Remove all entries for the given key from the map. | 593 | * Remove all entries for the given key from the map. |
@@ -599,7 +599,7 @@ GNUNET_CONTAINER_multihashmap_remove (struct GNUNET_CONTAINER_MultiHashMap *map, | |||
599 | */ | 599 | */ |
600 | int | 600 | int |
601 | GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap | 601 | GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap |
602 | *map, const GNUNET_HashCode * key); | 602 | *map, const struct GNUNET_HashCode * key); |
603 | 603 | ||
604 | 604 | ||
605 | /** | 605 | /** |
@@ -614,7 +614,7 @@ GNUNET_CONTAINER_multihashmap_remove_all (struct GNUNET_CONTAINER_MultiHashMap | |||
614 | int | 614 | int |
615 | GNUNET_CONTAINER_multihashmap_contains (const struct | 615 | GNUNET_CONTAINER_multihashmap_contains (const struct |
616 | GNUNET_CONTAINER_MultiHashMap *map, | 616 | GNUNET_CONTAINER_MultiHashMap *map, |
617 | const GNUNET_HashCode * key); | 617 | const struct GNUNET_HashCode * key); |
618 | 618 | ||
619 | 619 | ||
620 | /** | 620 | /** |
@@ -630,7 +630,7 @@ GNUNET_CONTAINER_multihashmap_contains (const struct | |||
630 | int | 630 | int |
631 | GNUNET_CONTAINER_multihashmap_contains_value (const struct | 631 | GNUNET_CONTAINER_multihashmap_contains_value (const struct |
632 | GNUNET_CONTAINER_MultiHashMap | 632 | GNUNET_CONTAINER_MultiHashMap |
633 | *map, const GNUNET_HashCode * key, | 633 | *map, const struct GNUNET_HashCode * key, |
634 | const void *value); | 634 | const void *value); |
635 | 635 | ||
636 | 636 | ||
@@ -648,7 +648,7 @@ GNUNET_CONTAINER_multihashmap_contains_value (const struct | |||
648 | */ | 648 | */ |
649 | int | 649 | int |
650 | GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map, | 650 | GNUNET_CONTAINER_multihashmap_put (struct GNUNET_CONTAINER_MultiHashMap *map, |
651 | const GNUNET_HashCode * key, void *value, | 651 | const struct GNUNET_HashCode * key, void *value, |
652 | enum GNUNET_CONTAINER_MultiHashMapOption | 652 | enum GNUNET_CONTAINER_MultiHashMapOption |
653 | opt); | 653 | opt); |
654 | 654 | ||
@@ -692,7 +692,7 @@ GNUNET_CONTAINER_multihashmap_iterate (const struct | |||
692 | int | 692 | int |
693 | GNUNET_CONTAINER_multihashmap_get_multiple (const struct | 693 | GNUNET_CONTAINER_multihashmap_get_multiple (const struct |
694 | GNUNET_CONTAINER_MultiHashMap *map, | 694 | GNUNET_CONTAINER_MultiHashMap *map, |
695 | const GNUNET_HashCode * key, | 695 | const struct GNUNET_HashCode * key, |
696 | GNUNET_CONTAINER_HashMapIterator it, | 696 | GNUNET_CONTAINER_HashMapIterator it, |
697 | void *it_cls); | 697 | void *it_cls); |
698 | 698 | ||
diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h index 777ddd97e..879b1cae2 100644 --- a/src/include/gnunet_crypto_lib.h +++ b/src/include/gnunet_crypto_lib.h | |||
@@ -129,7 +129,7 @@ GNUNET_NETWORK_STRUCT_END | |||
129 | 129 | ||
130 | 130 | ||
131 | /** | 131 | /** |
132 | * @brief 0-terminated ASCII encoding of a GNUNET_HashCode. | 132 | * @brief 0-terminated ASCII encoding of a struct GNUNET_HashCode. |
133 | */ | 133 | */ |
134 | struct GNUNET_CRYPTO_HashAsciiEncoded | 134 | struct GNUNET_CRYPTO_HashAsciiEncoded |
135 | { | 135 | { |
@@ -251,7 +251,7 @@ GNUNET_NETWORK_STRUCT_END | |||
251 | * @brief IV for sym cipher | 251 | * @brief IV for sym cipher |
252 | * | 252 | * |
253 | * NOTE: must be smaller (!) in size than the | 253 | * NOTE: must be smaller (!) in size than the |
254 | * GNUNET_HashCode. | 254 | * struct GNUNET_HashCode. |
255 | */ | 255 | */ |
256 | struct GNUNET_CRYPTO_AesInitializationVector | 256 | struct GNUNET_CRYPTO_AesInitializationVector |
257 | { | 257 | { |
@@ -448,7 +448,7 @@ GNUNET_CRYPTO_aes_derive_iv_v (struct GNUNET_CRYPTO_AesInitializationVector *iv, | |||
448 | * safely cast to char*, a '\\0' termination is set). | 448 | * safely cast to char*, a '\\0' termination is set). |
449 | */ | 449 | */ |
450 | void | 450 | void |
451 | GNUNET_CRYPTO_hash_to_enc (const GNUNET_HashCode * block, | 451 | GNUNET_CRYPTO_hash_to_enc (const struct GNUNET_HashCode * block, |
452 | struct GNUNET_CRYPTO_HashAsciiEncoded *result); | 452 | struct GNUNET_CRYPTO_HashAsciiEncoded *result); |
453 | 453 | ||
454 | 454 | ||
@@ -465,7 +465,7 @@ GNUNET_CRYPTO_short_hash_to_enc (const struct GNUNET_CRYPTO_ShortHashCode * bloc | |||
465 | 465 | ||
466 | 466 | ||
467 | /** | 467 | /** |
468 | * Convert ASCII encoding back to a 'GNUNET_HashCode' | 468 | * Convert ASCII encoding back to a 'struct GNUNET_HashCode' |
469 | * | 469 | * |
470 | * @param enc the encoding | 470 | * @param enc the encoding |
471 | * @param enclen number of characters in 'enc' (without 0-terminator, which can be missing) | 471 | * @param enclen number of characters in 'enc' (without 0-terminator, which can be missing) |
@@ -474,7 +474,7 @@ GNUNET_CRYPTO_short_hash_to_enc (const struct GNUNET_CRYPTO_ShortHashCode * bloc | |||
474 | */ | 474 | */ |
475 | int | 475 | int |
476 | GNUNET_CRYPTO_hash_from_string2 (const char *enc, size_t enclen, | 476 | GNUNET_CRYPTO_hash_from_string2 (const char *enc, size_t enclen, |
477 | GNUNET_HashCode * result); | 477 | struct GNUNET_HashCode * result); |
478 | 478 | ||
479 | 479 | ||
480 | /** | 480 | /** |
@@ -491,7 +491,7 @@ GNUNET_CRYPTO_short_hash_from_string2 (const char *enc, size_t enclen, | |||
491 | 491 | ||
492 | 492 | ||
493 | /** | 493 | /** |
494 | * Convert ASCII encoding back to GNUNET_HashCode | 494 | * Convert ASCII encoding back to struct GNUNET_HashCode |
495 | * | 495 | * |
496 | * @param enc the encoding | 496 | * @param enc the encoding |
497 | * @param result where to store the hash code | 497 | * @param result where to store the hash code |
@@ -536,8 +536,8 @@ GNUNET_CRYPTO_short_hash_cmp (const struct GNUNET_CRYPTO_ShortHashCode * h1, | |||
536 | * @return number between 0 and UINT32_MAX | 536 | * @return number between 0 and UINT32_MAX |
537 | */ | 537 | */ |
538 | uint32_t | 538 | uint32_t |
539 | GNUNET_CRYPTO_hash_distance_u32 (const GNUNET_HashCode * a, | 539 | GNUNET_CRYPTO_hash_distance_u32 (const struct GNUNET_HashCode * a, |
540 | const GNUNET_HashCode * b); | 540 | const struct GNUNET_HashCode * b); |
541 | 541 | ||
542 | 542 | ||
543 | /** | 543 | /** |
@@ -548,7 +548,7 @@ GNUNET_CRYPTO_hash_distance_u32 (const GNUNET_HashCode * a, | |||
548 | * @param ret pointer to where to write the hashcode | 548 | * @param ret pointer to where to write the hashcode |
549 | */ | 549 | */ |
550 | void | 550 | void |
551 | GNUNET_CRYPTO_hash (const void *block, size_t size, GNUNET_HashCode * ret); | 551 | GNUNET_CRYPTO_hash (const void *block, size_t size, struct GNUNET_HashCode * ret); |
552 | 552 | ||
553 | 553 | ||
554 | /** | 554 | /** |
@@ -598,7 +598,7 @@ GNUNET_CRYPTO_short_hash_from_truncation (const struct GNUNET_HashCode *dh, | |||
598 | void | 598 | void |
599 | GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, | 599 | GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, |
600 | const void *plaintext, size_t plaintext_len, | 600 | const void *plaintext, size_t plaintext_len, |
601 | GNUNET_HashCode * hmac); | 601 | struct GNUNET_HashCode * hmac); |
602 | 602 | ||
603 | 603 | ||
604 | /** | 604 | /** |
@@ -609,7 +609,7 @@ GNUNET_CRYPTO_hmac (const struct GNUNET_CRYPTO_AuthKey *key, | |||
609 | * @param res resulting hash, NULL on error | 609 | * @param res resulting hash, NULL on error |
610 | */ | 610 | */ |
611 | typedef void (*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, | 611 | typedef void (*GNUNET_CRYPTO_HashCompletedCallback) (void *cls, |
612 | const GNUNET_HashCode * | 612 | const struct GNUNET_HashCode * |
613 | res); | 613 | res); |
614 | 614 | ||
615 | 615 | ||
@@ -652,7 +652,7 @@ GNUNET_CRYPTO_hash_file_cancel (struct GNUNET_CRYPTO_FileHashContext *fhc); | |||
652 | */ | 652 | */ |
653 | void | 653 | void |
654 | GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode, | 654 | GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode, |
655 | GNUNET_HashCode * result); | 655 | struct GNUNET_HashCode * result); |
656 | 656 | ||
657 | 657 | ||
658 | /** | 658 | /** |
@@ -663,9 +663,9 @@ GNUNET_CRYPTO_hash_create_random (enum GNUNET_CRYPTO_Quality mode, | |||
663 | * @param result set to b - a | 663 | * @param result set to b - a |
664 | */ | 664 | */ |
665 | void | 665 | void |
666 | GNUNET_CRYPTO_hash_difference (const GNUNET_HashCode * a, | 666 | GNUNET_CRYPTO_hash_difference (const struct GNUNET_HashCode * a, |
667 | const GNUNET_HashCode * b, | 667 | const struct GNUNET_HashCode * b, |
668 | GNUNET_HashCode * result); | 668 | struct GNUNET_HashCode * result); |
669 | 669 | ||
670 | 670 | ||
671 | /** | 671 | /** |
@@ -676,9 +676,9 @@ GNUNET_CRYPTO_hash_difference (const GNUNET_HashCode * a, | |||
676 | * @param result set to a + delta | 676 | * @param result set to a + delta |
677 | */ | 677 | */ |
678 | void | 678 | void |
679 | GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a, | 679 | GNUNET_CRYPTO_hash_sum (const struct GNUNET_HashCode * a, |
680 | const GNUNET_HashCode * delta, | 680 | const struct GNUNET_HashCode * delta, |
681 | GNUNET_HashCode * result); | 681 | struct GNUNET_HashCode * result); |
682 | 682 | ||
683 | 683 | ||
684 | /** | 684 | /** |
@@ -689,8 +689,8 @@ GNUNET_CRYPTO_hash_sum (const GNUNET_HashCode * a, | |||
689 | * @param result set to a ^ b | 689 | * @param result set to a ^ b |
690 | */ | 690 | */ |
691 | void | 691 | void |
692 | GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a, const GNUNET_HashCode * b, | 692 | GNUNET_CRYPTO_hash_xor (const struct GNUNET_HashCode * a, const struct GNUNET_HashCode * b, |
693 | GNUNET_HashCode * result); | 693 | struct GNUNET_HashCode * result); |
694 | 694 | ||
695 | 695 | ||
696 | /** | 696 | /** |
@@ -701,7 +701,7 @@ GNUNET_CRYPTO_hash_xor (const GNUNET_HashCode * a, const GNUNET_HashCode * b, | |||
701 | * @param iv set to a valid initialization vector | 701 | * @param iv set to a valid initialization vector |
702 | */ | 702 | */ |
703 | void | 703 | void |
704 | GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc, | 704 | GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode * hc, |
705 | struct GNUNET_CRYPTO_AesSessionKey *skey, | 705 | struct GNUNET_CRYPTO_AesSessionKey *skey, |
706 | struct GNUNET_CRYPTO_AesInitializationVector | 706 | struct GNUNET_CRYPTO_AesInitializationVector |
707 | *iv); | 707 | *iv); |
@@ -715,11 +715,11 @@ GNUNET_CRYPTO_hash_to_aes_key (const GNUNET_HashCode * hc, | |||
715 | * @return Bit \a bit from hashcode \a code, -1 for invalid index | 715 | * @return Bit \a bit from hashcode \a code, -1 for invalid index |
716 | */ | 716 | */ |
717 | int | 717 | int |
718 | GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit); | 718 | GNUNET_CRYPTO_hash_get_bit (const struct GNUNET_HashCode * code, unsigned int bit); |
719 | 719 | ||
720 | /** | 720 | /** |
721 | * Determine how many low order bits match in two | 721 | * Determine how many low order bits match in two |
722 | * GNUNET_HashCodes. i.e. - 010011 and 011111 share | 722 | * struct GNUNET_HashCodes. i.e. - 010011 and 011111 share |
723 | * the first two lowest order bits, and therefore the | 723 | * the first two lowest order bits, and therefore the |
724 | * return value is two (NOT XOR distance, nor how many | 724 | * return value is two (NOT XOR distance, nor how many |
725 | * bits match absolutely!). | 725 | * bits match absolutely!). |
@@ -730,8 +730,8 @@ GNUNET_CRYPTO_hash_get_bit (const GNUNET_HashCode * code, unsigned int bit); | |||
730 | * @return the number of bits that match | 730 | * @return the number of bits that match |
731 | */ | 731 | */ |
732 | unsigned int | 732 | unsigned int |
733 | GNUNET_CRYPTO_hash_matching_bits (const GNUNET_HashCode * first, | 733 | GNUNET_CRYPTO_hash_matching_bits (const struct GNUNET_HashCode * first, |
734 | const GNUNET_HashCode * second); | 734 | const struct GNUNET_HashCode * second); |
735 | 735 | ||
736 | 736 | ||
737 | /** | 737 | /** |
@@ -743,7 +743,7 @@ GNUNET_CRYPTO_hash_matching_bits (const GNUNET_HashCode * first, | |||
743 | * @return 1 if h1 > h2, -1 if h1 < h2 and 0 if h1 == h2. | 743 | * @return 1 if h1 > h2, -1 if h1 < h2 and 0 if h1 == h2. |
744 | */ | 744 | */ |
745 | int | 745 | int |
746 | GNUNET_CRYPTO_hash_cmp (const GNUNET_HashCode * h1, const GNUNET_HashCode * h2); | 746 | GNUNET_CRYPTO_hash_cmp (const struct GNUNET_HashCode * h1, const struct GNUNET_HashCode * h2); |
747 | 747 | ||
748 | 748 | ||
749 | /** | 749 | /** |
@@ -756,9 +756,9 @@ GNUNET_CRYPTO_hash_cmp (const GNUNET_HashCode * h1, const GNUNET_HashCode * h2); | |||
756 | * @return -1 if h1 is closer, 1 if h2 is closer and 0 if h1==h2. | 756 | * @return -1 if h1 is closer, 1 if h2 is closer and 0 if h1==h2. |
757 | */ | 757 | */ |
758 | int | 758 | int |
759 | GNUNET_CRYPTO_hash_xorcmp (const GNUNET_HashCode * h1, | 759 | GNUNET_CRYPTO_hash_xorcmp (const struct GNUNET_HashCode * h1, |
760 | const GNUNET_HashCode * h2, | 760 | const struct GNUNET_HashCode * h2, |
761 | const GNUNET_HashCode * target); | 761 | const struct GNUNET_HashCode * target); |
762 | 762 | ||
763 | 763 | ||
764 | /** | 764 | /** |
@@ -949,7 +949,7 @@ GNUNET_CRYPTO_setup_hostkey (const char *cfg_name); | |||
949 | * @return some private key purely dependent on input | 949 | * @return some private key purely dependent on input |
950 | */ | 950 | */ |
951 | struct GNUNET_CRYPTO_RsaPrivateKey * | 951 | struct GNUNET_CRYPTO_RsaPrivateKey * |
952 | GNUNET_CRYPTO_rsa_key_create_from_hash (const GNUNET_HashCode * hc); | 952 | GNUNET_CRYPTO_rsa_key_create_from_hash (const struct GNUNET_HashCode * hc); |
953 | 953 | ||
954 | 954 | ||
955 | /** | 955 | /** |
diff --git a/src/include/gnunet_datacache_lib.h b/src/include/gnunet_datacache_lib.h index 84cb4d600..071b304be 100644 --- a/src/include/gnunet_datacache_lib.h +++ b/src/include/gnunet_datacache_lib.h | |||
@@ -83,7 +83,7 @@ GNUNET_DATACACHE_destroy (struct GNUNET_DATACACHE_Handle *h); | |||
83 | */ | 83 | */ |
84 | typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, | 84 | typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, |
85 | struct GNUNET_TIME_Absolute exp, | 85 | struct GNUNET_TIME_Absolute exp, |
86 | const GNUNET_HashCode * key, | 86 | const struct GNUNET_HashCode * key, |
87 | size_t size, const char *data, | 87 | size_t size, const char *data, |
88 | enum GNUNET_BLOCK_Type type); | 88 | enum GNUNET_BLOCK_Type type); |
89 | 89 | ||
@@ -101,7 +101,7 @@ typedef int (*GNUNET_DATACACHE_Iterator) (void *cls, | |||
101 | */ | 101 | */ |
102 | int | 102 | int |
103 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, | 103 | GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, |
104 | const GNUNET_HashCode * key, size_t size, | 104 | const struct GNUNET_HashCode * key, size_t size, |
105 | const char *data, enum GNUNET_BLOCK_Type type, | 105 | const char *data, enum GNUNET_BLOCK_Type type, |
106 | struct GNUNET_TIME_Absolute discard_time); | 106 | struct GNUNET_TIME_Absolute discard_time); |
107 | 107 | ||
@@ -119,7 +119,7 @@ GNUNET_DATACACHE_put (struct GNUNET_DATACACHE_Handle *h, | |||
119 | */ | 119 | */ |
120 | unsigned int | 120 | unsigned int |
121 | GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h, | 121 | GNUNET_DATACACHE_get (struct GNUNET_DATACACHE_Handle *h, |
122 | const GNUNET_HashCode * key, enum GNUNET_BLOCK_Type type, | 122 | const struct GNUNET_HashCode * key, enum GNUNET_BLOCK_Type type, |
123 | GNUNET_DATACACHE_Iterator iter, void *iter_cls); | 123 | GNUNET_DATACACHE_Iterator iter, void *iter_cls); |
124 | 124 | ||
125 | 125 | ||
diff --git a/src/include/gnunet_datacache_plugin.h b/src/include/gnunet_datacache_plugin.h index fbfcdf1e8..18268efd7 100644 --- a/src/include/gnunet_datacache_plugin.h +++ b/src/include/gnunet_datacache_plugin.h | |||
@@ -46,7 +46,7 @@ extern "C" | |||
46 | * @param size number of bytes that were made available | 46 | * @param size number of bytes that were made available |
47 | */ | 47 | */ |
48 | typedef void (*GNUNET_DATACACHE_DeleteNotifyCallback) (void *cls, | 48 | typedef void (*GNUNET_DATACACHE_DeleteNotifyCallback) (void *cls, |
49 | const GNUNET_HashCode * | 49 | const struct GNUNET_HashCode * |
50 | key, size_t size); | 50 | key, size_t size); |
51 | 51 | ||
52 | 52 | ||
@@ -109,7 +109,7 @@ struct GNUNET_DATACACHE_PluginFunctions | |||
109 | * @param discard_time when to discard the value in any case | 109 | * @param discard_time when to discard the value in any case |
110 | * @return 0 on error, number of bytes used otherwise | 110 | * @return 0 on error, number of bytes used otherwise |
111 | */ | 111 | */ |
112 | size_t (*put) (void *cls, const GNUNET_HashCode * key, size_t size, | 112 | size_t (*put) (void *cls, const struct GNUNET_HashCode * key, size_t size, |
113 | const char *data, enum GNUNET_BLOCK_Type type, | 113 | const char *data, enum GNUNET_BLOCK_Type type, |
114 | struct GNUNET_TIME_Absolute discard_time); | 114 | struct GNUNET_TIME_Absolute discard_time); |
115 | 115 | ||
@@ -125,7 +125,7 @@ struct GNUNET_DATACACHE_PluginFunctions | |||
125 | * @param iter_cls closure for iter | 125 | * @param iter_cls closure for iter |
126 | * @return the number of results found | 126 | * @return the number of results found |
127 | */ | 127 | */ |
128 | unsigned int (*get) (void *cls, const GNUNET_HashCode * key, | 128 | unsigned int (*get) (void *cls, const struct GNUNET_HashCode * key, |
129 | enum GNUNET_BLOCK_Type type, | 129 | enum GNUNET_BLOCK_Type type, |
130 | GNUNET_DATACACHE_Iterator iter, void *iter_cls); | 130 | GNUNET_DATACACHE_Iterator iter, void *iter_cls); |
131 | 131 | ||
diff --git a/src/include/gnunet_datastore_plugin.h b/src/include/gnunet_datastore_plugin.h index bbf0ce2aa..efdcf8969 100644 --- a/src/include/gnunet_datastore_plugin.h +++ b/src/include/gnunet_datastore_plugin.h | |||
@@ -92,7 +92,7 @@ struct GNUNET_DATASTORE_PluginEnvironment | |||
92 | * @return GNUNET_OK to keep the item | 92 | * @return GNUNET_OK to keep the item |
93 | * GNUNET_NO to delete the item | 93 | * GNUNET_NO to delete the item |
94 | */ | 94 | */ |
95 | typedef int (*PluginDatumProcessor) (void *cls, const GNUNET_HashCode * key, | 95 | typedef int (*PluginDatumProcessor) (void *cls, const struct GNUNET_HashCode * key, |
96 | uint32_t size, const void *data, | 96 | uint32_t size, const void *data, |
97 | enum GNUNET_BLOCK_Type type, | 97 | enum GNUNET_BLOCK_Type type, |
98 | uint32_t priority, uint32_t anonymity, | 98 | uint32_t priority, uint32_t anonymity, |
@@ -127,7 +127,7 @@ typedef unsigned long long (*PluginEstimateSize) (void *cls); | |||
127 | * @return GNUNET_OK on success, | 127 | * @return GNUNET_OK on success, |
128 | * GNUNET_SYSERR on failure | 128 | * GNUNET_SYSERR on failure |
129 | */ | 129 | */ |
130 | typedef int (*PluginPut) (void *cls, const GNUNET_HashCode * key, uint32_t size, | 130 | typedef int (*PluginPut) (void *cls, const struct GNUNET_HashCode * key, uint32_t size, |
131 | const void *data, enum GNUNET_BLOCK_Type type, | 131 | const void *data, enum GNUNET_BLOCK_Type type, |
132 | uint32_t priority, uint32_t anonymity, | 132 | uint32_t priority, uint32_t anonymity, |
133 | uint32_t replication, | 133 | uint32_t replication, |
@@ -142,7 +142,7 @@ typedef int (*PluginPut) (void *cls, const GNUNET_HashCode * key, uint32_t size, | |||
142 | * @param count how many values are stored under this key in the datastore | 142 | * @param count how many values are stored under this key in the datastore |
143 | */ | 143 | */ |
144 | typedef void (*PluginKeyProcessor) (void *cls, | 144 | typedef void (*PluginKeyProcessor) (void *cls, |
145 | const GNUNET_HashCode *key, | 145 | const struct GNUNET_HashCode *key, |
146 | unsigned int count); | 146 | unsigned int count); |
147 | 147 | ||
148 | 148 | ||
@@ -178,8 +178,8 @@ typedef void (*PluginGetKeys) (void *cls, | |||
178 | * @param proc_cls closure for proc | 178 | * @param proc_cls closure for proc |
179 | */ | 179 | */ |
180 | typedef void (*PluginGetKey) (void *cls, uint64_t offset, | 180 | typedef void (*PluginGetKey) (void *cls, uint64_t offset, |
181 | const GNUNET_HashCode * key, | 181 | const struct GNUNET_HashCode * key, |
182 | const GNUNET_HashCode * vhash, | 182 | const struct GNUNET_HashCode * vhash, |
183 | enum GNUNET_BLOCK_Type type, | 183 | enum GNUNET_BLOCK_Type type, |
184 | PluginDatumProcessor proc, void *proc_cls); | 184 | PluginDatumProcessor proc, void *proc_cls); |
185 | 185 | ||
diff --git a/src/include/gnunet_datastore_service.h b/src/include/gnunet_datastore_service.h index 29508329d..721963bdd 100644 --- a/src/include/gnunet_datastore_service.h +++ b/src/include/gnunet_datastore_service.h | |||
@@ -153,7 +153,7 @@ GNUNET_DATASTORE_reserve (struct GNUNET_DATASTORE_Handle *h, uint64_t amount, | |||
153 | */ | 153 | */ |
154 | struct GNUNET_DATASTORE_QueueEntry * | 154 | struct GNUNET_DATASTORE_QueueEntry * |
155 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid, | 155 | GNUNET_DATASTORE_put (struct GNUNET_DATASTORE_Handle *h, uint32_t rid, |
156 | const GNUNET_HashCode * key, size_t size, | 156 | const struct GNUNET_HashCode * key, size_t size, |
157 | const void *data, enum GNUNET_BLOCK_Type type, | 157 | const void *data, enum GNUNET_BLOCK_Type type, |
158 | uint32_t priority, uint32_t anonymity, | 158 | uint32_t priority, uint32_t anonymity, |
159 | uint32_t replication, | 159 | uint32_t replication, |
@@ -245,7 +245,7 @@ GNUNET_DATASTORE_update (struct GNUNET_DATASTORE_Handle *h, uint64_t uid, | |||
245 | */ | 245 | */ |
246 | struct GNUNET_DATASTORE_QueueEntry * | 246 | struct GNUNET_DATASTORE_QueueEntry * |
247 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | 247 | GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, |
248 | const GNUNET_HashCode * key, size_t size, | 248 | const struct GNUNET_HashCode * key, size_t size, |
249 | const void *data, unsigned int queue_priority, | 249 | const void *data, unsigned int queue_priority, |
250 | unsigned int max_queue_size, | 250 | unsigned int max_queue_size, |
251 | struct GNUNET_TIME_Relative timeout, | 251 | struct GNUNET_TIME_Relative timeout, |
@@ -268,7 +268,7 @@ GNUNET_DATASTORE_remove (struct GNUNET_DATASTORE_Handle *h, | |||
268 | * maybe 0 if no unique identifier is available | 268 | * maybe 0 if no unique identifier is available |
269 | */ | 269 | */ |
270 | typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, | 270 | typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, |
271 | const GNUNET_HashCode * key, | 271 | const struct GNUNET_HashCode * key, |
272 | size_t size, const void *data, | 272 | size_t size, const void *data, |
273 | enum GNUNET_BLOCK_Type type, | 273 | enum GNUNET_BLOCK_Type type, |
274 | uint32_t priority, | 274 | uint32_t priority, |
@@ -300,7 +300,7 @@ typedef void (*GNUNET_DATASTORE_DatumProcessor) (void *cls, | |||
300 | */ | 300 | */ |
301 | struct GNUNET_DATASTORE_QueueEntry * | 301 | struct GNUNET_DATASTORE_QueueEntry * |
302 | GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h, uint64_t offset, | 302 | GNUNET_DATASTORE_get_key (struct GNUNET_DATASTORE_Handle *h, uint64_t offset, |
303 | const GNUNET_HashCode * key, | 303 | const struct GNUNET_HashCode * key, |
304 | enum GNUNET_BLOCK_Type type, | 304 | enum GNUNET_BLOCK_Type type, |
305 | unsigned int queue_priority, | 305 | unsigned int queue_priority, |
306 | unsigned int max_queue_size, | 306 | unsigned int max_queue_size, |
diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h index 6606acb7d..83774826e 100644 --- a/src/include/gnunet_dht_service.h +++ b/src/include/gnunet_dht_service.h | |||
@@ -163,7 +163,7 @@ typedef void (*GNUNET_DHT_PutContinuation)(void *cls, | |||
163 | * (size too big) | 163 | * (size too big) |
164 | */ | 164 | */ |
165 | struct GNUNET_DHT_PutHandle * | 165 | struct GNUNET_DHT_PutHandle * |
166 | GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, const GNUNET_HashCode * key, | 166 | GNUNET_DHT_put (struct GNUNET_DHT_Handle *handle, const struct GNUNET_HashCode * key, |
167 | uint32_t desired_replication_level, | 167 | uint32_t desired_replication_level, |
168 | enum GNUNET_DHT_RouteOption options, | 168 | enum GNUNET_DHT_RouteOption options, |
169 | enum GNUNET_BLOCK_Type type, size_t size, const char *data, | 169 | enum GNUNET_BLOCK_Type type, size_t size, const char *data, |
@@ -205,7 +205,7 @@ GNUNET_DHT_put_cancel (struct GNUNET_DHT_PutHandle *ph); | |||
205 | */ | 205 | */ |
206 | typedef void (*GNUNET_DHT_GetIterator) (void *cls, | 206 | typedef void (*GNUNET_DHT_GetIterator) (void *cls, |
207 | struct GNUNET_TIME_Absolute exp, | 207 | struct GNUNET_TIME_Absolute exp, |
208 | const GNUNET_HashCode * key, | 208 | const struct GNUNET_HashCode * key, |
209 | const struct GNUNET_PeerIdentity * | 209 | const struct GNUNET_PeerIdentity * |
210 | get_path, unsigned int get_path_length, | 210 | get_path, unsigned int get_path_length, |
211 | const struct GNUNET_PeerIdentity * | 211 | const struct GNUNET_PeerIdentity * |
@@ -234,7 +234,7 @@ typedef void (*GNUNET_DHT_GetIterator) (void *cls, | |||
234 | */ | 234 | */ |
235 | struct GNUNET_DHT_GetHandle * | 235 | struct GNUNET_DHT_GetHandle * |
236 | GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, | 236 | GNUNET_DHT_get_start (struct GNUNET_DHT_Handle *handle, |
237 | enum GNUNET_BLOCK_Type type, const GNUNET_HashCode * key, | 237 | enum GNUNET_BLOCK_Type type, const struct GNUNET_HashCode * key, |
238 | uint32_t desired_replication_level, | 238 | uint32_t desired_replication_level, |
239 | enum GNUNET_DHT_RouteOption options, const void *xquery, | 239 | enum GNUNET_DHT_RouteOption options, const void *xquery, |
240 | size_t xquery_size, GNUNET_DHT_GetIterator iter, | 240 | size_t xquery_size, GNUNET_DHT_GetIterator iter, |
@@ -279,7 +279,7 @@ typedef void (*GNUNET_DHT_MonitorGetCB) (void *cls, | |||
279 | uint32_t desired_replication_level, | 279 | uint32_t desired_replication_level, |
280 | unsigned int path_length, | 280 | unsigned int path_length, |
281 | const struct GNUNET_PeerIdentity *path, | 281 | const struct GNUNET_PeerIdentity *path, |
282 | const GNUNET_HashCode * key); | 282 | const struct GNUNET_HashCode * key); |
283 | 283 | ||
284 | /** | 284 | /** |
285 | * Callback called on each GET reply going through the DHT. | 285 | * Callback called on each GET reply going through the DHT. |
@@ -304,7 +304,7 @@ typedef void (*GNUNET_DHT_MonitorGetRespCB) (void *cls, | |||
304 | * put_path, | 304 | * put_path, |
305 | unsigned int put_path_length, | 305 | unsigned int put_path_length, |
306 | struct GNUNET_TIME_Absolute exp, | 306 | struct GNUNET_TIME_Absolute exp, |
307 | const GNUNET_HashCode * key, | 307 | const struct GNUNET_HashCode * key, |
308 | const void *data, | 308 | const void *data, |
309 | size_t size); | 309 | size_t size); |
310 | 310 | ||
@@ -331,7 +331,7 @@ typedef void (*GNUNET_DHT_MonitorPutCB) (void *cls, | |||
331 | unsigned int path_length, | 331 | unsigned int path_length, |
332 | const struct GNUNET_PeerIdentity *path, | 332 | const struct GNUNET_PeerIdentity *path, |
333 | struct GNUNET_TIME_Absolute exp, | 333 | struct GNUNET_TIME_Absolute exp, |
334 | const GNUNET_HashCode * key, | 334 | const struct GNUNET_HashCode * key, |
335 | const void *data, | 335 | const void *data, |
336 | size_t size); | 336 | size_t size); |
337 | 337 | ||
@@ -351,7 +351,7 @@ typedef void (*GNUNET_DHT_MonitorPutCB) (void *cls, | |||
351 | struct GNUNET_DHT_MonitorHandle * | 351 | struct GNUNET_DHT_MonitorHandle * |
352 | GNUNET_DHT_monitor_start (struct GNUNET_DHT_Handle *handle, | 352 | GNUNET_DHT_monitor_start (struct GNUNET_DHT_Handle *handle, |
353 | enum GNUNET_BLOCK_Type type, | 353 | enum GNUNET_BLOCK_Type type, |
354 | const GNUNET_HashCode *key, | 354 | const struct GNUNET_HashCode *key, |
355 | GNUNET_DHT_MonitorGetCB get_cb, | 355 | GNUNET_DHT_MonitorGetCB get_cb, |
356 | GNUNET_DHT_MonitorGetRespCB get_resp_cb, | 356 | GNUNET_DHT_MonitorGetRespCB get_resp_cb, |
357 | GNUNET_DHT_MonitorPutCB put_cb, | 357 | GNUNET_DHT_MonitorPutCB put_cb, |
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index 1f1e60f0f..eaff18320 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -91,7 +91,7 @@ typedef int (*GNUNET_FS_KeywordIterator) (void *cls, const char *keyword, | |||
91 | * @param key wherer to store the unique key | 91 | * @param key wherer to store the unique key |
92 | */ | 92 | */ |
93 | void | 93 | void |
94 | GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, GNUNET_HashCode * key); | 94 | GNUNET_FS_uri_to_key (const struct GNUNET_FS_Uri *uri, struct GNUNET_HashCode * key); |
95 | 95 | ||
96 | /** | 96 | /** |
97 | * Convert a URI to a UTF-8 String. | 97 | * Convert a URI to a UTF-8 String. |
@@ -341,7 +341,7 @@ GNUNET_FS_uri_sks_create (struct GNUNET_FS_Namespace *ns, const char *id, | |||
341 | * @return an FS URI for the given namespace and identifier | 341 | * @return an FS URI for the given namespace and identifier |
342 | */ | 342 | */ |
343 | struct GNUNET_FS_Uri * | 343 | struct GNUNET_FS_Uri * |
344 | GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id); | 344 | GNUNET_FS_uri_sks_create_from_nsid (struct GNUNET_HashCode * nsid, const char *id); |
345 | 345 | ||
346 | 346 | ||
347 | /** | 347 | /** |
@@ -354,7 +354,7 @@ GNUNET_FS_uri_sks_create_from_nsid (GNUNET_HashCode * nsid, const char *id); | |||
354 | */ | 354 | */ |
355 | int | 355 | int |
356 | GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri, | 356 | GNUNET_FS_uri_sks_get_namespace (const struct GNUNET_FS_Uri *uri, |
357 | GNUNET_HashCode * nsid); | 357 | struct GNUNET_HashCode * nsid); |
358 | 358 | ||
359 | 359 | ||
360 | /** | 360 | /** |
@@ -1383,7 +1383,7 @@ struct GNUNET_FS_ProgressInfo | |||
1383 | /** | 1383 | /** |
1384 | * Hash-identifier for the namespace. | 1384 | * Hash-identifier for the namespace. |
1385 | */ | 1385 | */ |
1386 | GNUNET_HashCode id; | 1386 | struct GNUNET_HashCode id; |
1387 | 1387 | ||
1388 | } namespace; | 1388 | } namespace; |
1389 | 1389 | ||
@@ -2112,7 +2112,7 @@ GNUNET_FS_publish_sks_cancel (struct GNUNET_FS_PublishSksContext *psc); | |||
2112 | * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort | 2112 | * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort |
2113 | */ | 2113 | */ |
2114 | typedef int (*GNUNET_FS_IndexedFileProcessor) (void *cls, const char *filename, | 2114 | typedef int (*GNUNET_FS_IndexedFileProcessor) (void *cls, const char *filename, |
2115 | const GNUNET_HashCode * file_id); | 2115 | const struct GNUNET_HashCode * file_id); |
2116 | 2116 | ||
2117 | 2117 | ||
2118 | /** | 2118 | /** |
@@ -2252,7 +2252,7 @@ GNUNET_FS_namespace_delete (struct GNUNET_FS_Namespace *namespace, int freeze); | |||
2252 | * @param id hash identifier for the namespace | 2252 | * @param id hash identifier for the namespace |
2253 | */ | 2253 | */ |
2254 | typedef void (*GNUNET_FS_NamespaceInfoProcessor) (void *cls, const char *name, | 2254 | typedef void (*GNUNET_FS_NamespaceInfoProcessor) (void *cls, const char *name, |
2255 | const GNUNET_HashCode * id); | 2255 | const struct GNUNET_HashCode * id); |
2256 | 2256 | ||
2257 | 2257 | ||
2258 | /** | 2258 | /** |
diff --git a/src/include/gnunet_pseudonym_lib.h b/src/include/gnunet_pseudonym_lib.h index 8fd938da8..6ec51b678 100644 --- a/src/include/gnunet_pseudonym_lib.h +++ b/src/include/gnunet_pseudonym_lib.h | |||
@@ -51,7 +51,7 @@ extern "C" | |||
51 | * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort | 51 | * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort |
52 | */ | 52 | */ |
53 | typedef int (*GNUNET_PSEUDONYM_Iterator) (void *cls, | 53 | typedef int (*GNUNET_PSEUDONYM_Iterator) (void *cls, |
54 | const GNUNET_HashCode * pseudonym, | 54 | const struct GNUNET_HashCode * pseudonym, |
55 | const char *name, | 55 | const char *name, |
56 | const char *unique_name, | 56 | const char *unique_name, |
57 | const struct GNUNET_CONTAINER_MetaData | 57 | const struct GNUNET_CONTAINER_MetaData |
@@ -67,7 +67,7 @@ typedef int (*GNUNET_PSEUDONYM_Iterator) (void *cls, | |||
67 | */ | 67 | */ |
68 | int | 68 | int |
69 | GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, | 69 | GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, |
70 | const GNUNET_HashCode * nsid, int delta); | 70 | const struct GNUNET_HashCode * nsid, int delta); |
71 | 71 | ||
72 | /** | 72 | /** |
73 | * Add a pseudonym to the set of known pseudonyms. | 73 | * Add a pseudonym to the set of known pseudonyms. |
@@ -80,7 +80,7 @@ GNUNET_PSEUDONYM_rank (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
80 | */ | 80 | */ |
81 | void | 81 | void |
82 | GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg, | 82 | GNUNET_PSEUDONYM_add (const struct GNUNET_CONFIGURATION_Handle *cfg, |
83 | const GNUNET_HashCode * id, | 83 | const struct GNUNET_HashCode * id, |
84 | const struct GNUNET_CONTAINER_MetaData *meta); | 84 | const struct GNUNET_CONTAINER_MetaData *meta); |
85 | 85 | ||
86 | 86 | ||
@@ -127,7 +127,7 @@ GNUNET_PSEUDONYM_discovery_callback_unregister (GNUNET_PSEUDONYM_Iterator | |||
127 | */ | 127 | */ |
128 | char * | 128 | char * |
129 | GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, | 129 | GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, |
130 | const GNUNET_HashCode * nsid, const char *name, unsigned int *suffix); | 130 | const struct GNUNET_HashCode * nsid, const char *name, unsigned int *suffix); |
131 | 131 | ||
132 | /** | 132 | /** |
133 | * Get namespace name, metadata and rank | 133 | * Get namespace name, metadata and rank |
@@ -152,7 +152,7 @@ GNUNET_PSEUDONYM_name_uniquify (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
152 | */ | 152 | */ |
153 | int | 153 | int |
154 | GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 154 | GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
155 | const GNUNET_HashCode * nsid, struct GNUNET_CONTAINER_MetaData **ret_meta, | 155 | const struct GNUNET_HashCode * nsid, struct GNUNET_CONTAINER_MetaData **ret_meta, |
156 | int32_t *ret_rank, char **ret_name, int *name_is_a_dup); | 156 | int32_t *ret_rank, char **ret_name, int *name_is_a_dup); |
157 | 157 | ||
158 | 158 | ||
@@ -166,7 +166,7 @@ GNUNET_PSEUDONYM_get_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
166 | */ | 166 | */ |
167 | int | 167 | int |
168 | GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | 168 | GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, |
169 | const char *ns_uname, GNUNET_HashCode * nsid); | 169 | const char *ns_uname, struct GNUNET_HashCode * nsid); |
170 | 170 | ||
171 | /** | 171 | /** |
172 | * Set the pseudonym metadata, rank and name. | 172 | * Set the pseudonym metadata, rank and name. |
@@ -182,7 +182,7 @@ GNUNET_PSEUDONYM_name_to_id (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
182 | */ | 182 | */ |
183 | int | 183 | int |
184 | GNUNET_PSEUDONYM_set_info (const struct GNUNET_CONFIGURATION_Handle *cfg, | 184 | GNUNET_PSEUDONYM_set_info (const struct GNUNET_CONFIGURATION_Handle *cfg, |
185 | const GNUNET_HashCode * nsid, const char *name, | 185 | const struct GNUNET_HashCode * nsid, const char *name, |
186 | const struct GNUNET_CONTAINER_MetaData *md, int rank); | 186 | const struct GNUNET_CONTAINER_MetaData *md, int rank); |
187 | 187 | ||
188 | 188 | ||
diff --git a/src/include/gnunet_regex_lib.h b/src/include/gnunet_regex_lib.h index 6e0a41275..c9b884291 100644 --- a/src/include/gnunet_regex_lib.h +++ b/src/include/gnunet_regex_lib.h | |||
@@ -55,7 +55,7 @@ struct GNUNET_REGEX_Edge | |||
55 | /** | 55 | /** |
56 | * Destionation of the edge. | 56 | * Destionation of the edge. |
57 | */ | 57 | */ |
58 | GNUNET_HashCode destination; | 58 | struct GNUNET_HashCode destination; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | /** | 61 | /** |
@@ -134,7 +134,7 @@ GNUNET_REGEX_get_computed_regex (struct GNUNET_REGEX_Automaton *a); | |||
134 | */ | 134 | */ |
135 | unsigned int | 135 | unsigned int |
136 | GNUNET_REGEX_get_first_key (const char *input_string, unsigned int string_len, | 136 | GNUNET_REGEX_get_first_key (const char *input_string, unsigned int string_len, |
137 | GNUNET_HashCode * key); | 137 | struct GNUNET_HashCode * key); |
138 | 138 | ||
139 | /** | 139 | /** |
140 | * Check if the given 'proof' matches the given 'key'. | 140 | * Check if the given 'proof' matches the given 'key'. |
@@ -146,7 +146,7 @@ GNUNET_REGEX_get_first_key (const char *input_string, unsigned int string_len, | |||
146 | */ | 146 | */ |
147 | int | 147 | int |
148 | GNUNET_REGEX_check_proof (const char *proof, | 148 | GNUNET_REGEX_check_proof (const char *proof, |
149 | const GNUNET_HashCode *key); | 149 | const struct GNUNET_HashCode *key); |
150 | 150 | ||
151 | /** | 151 | /** |
152 | * Iterator callback function. | 152 | * Iterator callback function. |
@@ -159,7 +159,7 @@ GNUNET_REGEX_check_proof (const char *proof, | |||
159 | * @param edges edges leaving current state. | 159 | * @param edges edges leaving current state. |
160 | */ | 160 | */ |
161 | typedef void (*GNUNET_REGEX_KeyIterator)(void *cls, | 161 | typedef void (*GNUNET_REGEX_KeyIterator)(void *cls, |
162 | const GNUNET_HashCode *key, | 162 | const struct GNUNET_HashCode *key, |
163 | const char *proof, | 163 | const char *proof, |
164 | int accepting, | 164 | int accepting, |
165 | unsigned int num_edges, | 165 | unsigned int num_edges, |
diff --git a/src/include/gnunet_vpn_service.h b/src/include/gnunet_vpn_service.h index ecf6cf5f0..77944c9c0 100644 --- a/src/include/gnunet_vpn_service.h +++ b/src/include/gnunet_vpn_service.h | |||
@@ -97,7 +97,7 @@ GNUNET_VPN_redirect_to_peer (struct GNUNET_VPN_Handle *vh, | |||
97 | int result_af, | 97 | int result_af, |
98 | uint8_t protocol, | 98 | uint8_t protocol, |
99 | const struct GNUNET_PeerIdentity *peer, | 99 | const struct GNUNET_PeerIdentity *peer, |
100 | const GNUNET_HashCode *serv, | 100 | const struct GNUNET_HashCode *serv, |
101 | int nac, | 101 | int nac, |
102 | struct GNUNET_TIME_Absolute expiration_time, | 102 | struct GNUNET_TIME_Absolute expiration_time, |
103 | GNUNET_VPN_AllocationCallback cb, | 103 | GNUNET_VPN_AllocationCallback cb, |