aboutsummaryrefslogtreecommitdiff
path: root/src/gns
diff options
context:
space:
mode:
Diffstat (limited to 'src/gns')
-rw-r--r--src/gns/gnunet-service-gns.c6
-rw-r--r--src/gns/gnunet-service-gns_resolver.c26
-rw-r--r--src/gns/plugin_block_gns.c18
-rw-r--r--src/gns/test_gns_dht_delegated_lookup.c6
-rw-r--r--src/gns/test_gns_pseu_shorten.c18
5 files changed, 37 insertions, 37 deletions
diff --git a/src/gns/gnunet-service-gns.c b/src/gns/gnunet-service-gns.c
index d0c401f69..8f8340207 100644
--- a/src/gns/gnunet-service-gns.c
+++ b/src/gns/gnunet-service-gns.c
@@ -259,9 +259,9 @@ put_gns_record(void *cls,
259 struct GNSNameRecordBlock *nrb; 259 struct GNSNameRecordBlock *nrb;
260 struct GNUNET_CRYPTO_ShortHashCode name_hash; 260 struct GNUNET_CRYPTO_ShortHashCode name_hash;
261 struct GNUNET_CRYPTO_ShortHashCode zhash; 261 struct GNUNET_CRYPTO_ShortHashCode zhash;
262 GNUNET_HashCode xor_hash; 262 struct GNUNET_HashCode xor_hash;
263 GNUNET_HashCode name_hash_double; 263 struct GNUNET_HashCode name_hash_double;
264 GNUNET_HashCode zone_hash_double; 264 struct GNUNET_HashCode zone_hash_double;
265 uint32_t rd_payload_length; 265 uint32_t rd_payload_length;
266 char* nrb_data = NULL; 266 char* nrb_data = NULL;
267 size_t namelen; 267 size_t namelen;
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 15b959fc0..965f995a5 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -242,7 +242,7 @@ handle_auth_discovery_timeout(void *cls,
242static void 242static void
243process_auth_discovery_dht_result(void* cls, 243process_auth_discovery_dht_result(void* cls,
244 struct GNUNET_TIME_Absolute exp, 244 struct GNUNET_TIME_Absolute exp,
245 const GNUNET_HashCode * key, 245 const struct GNUNET_HashCode * key,
246 const struct GNUNET_PeerIdentity *get_path, 246 const struct GNUNET_PeerIdentity *get_path,
247 unsigned int get_path_length, 247 unsigned int get_path_length,
248 const struct GNUNET_PeerIdentity *put_path, 248 const struct GNUNET_PeerIdentity *put_path,
@@ -327,10 +327,10 @@ process_auth_discovery_ns_result(void* cls,
327{ 327{
328 uint32_t xquery; 328 uint32_t xquery;
329 struct GNUNET_CRYPTO_ShortHashCode name_hash; 329 struct GNUNET_CRYPTO_ShortHashCode name_hash;
330 GNUNET_HashCode lookup_key; 330 struct GNUNET_HashCode lookup_key;
331 struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string; 331 struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
332 GNUNET_HashCode name_hash_double; 332 struct GNUNET_HashCode name_hash_double;
333 GNUNET_HashCode zone_hash_double; 333 struct GNUNET_HashCode zone_hash_double;
334 int i; 334 int i;
335 struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls; 335 struct GetPseuAuthorityHandle* gph = (struct GetPseuAuthorityHandle*)cls;
336 336
@@ -692,7 +692,7 @@ dht_lookup_timeout(void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
692static void 692static void
693process_record_result_dht(void* cls, 693process_record_result_dht(void* cls,
694 struct GNUNET_TIME_Absolute exp, 694 struct GNUNET_TIME_Absolute exp,
695 const GNUNET_HashCode * key, 695 const struct GNUNET_HashCode * key,
696 const struct GNUNET_PeerIdentity *get_path, 696 const struct GNUNET_PeerIdentity *get_path,
697 unsigned int get_path_length, 697 unsigned int get_path_length,
698 const struct GNUNET_PeerIdentity *put_path, 698 const struct GNUNET_PeerIdentity *put_path,
@@ -817,9 +817,9 @@ resolve_record_dht(struct ResolverHandle *rh)
817{ 817{
818 uint32_t xquery; 818 uint32_t xquery;
819 struct GNUNET_CRYPTO_ShortHashCode name_hash; 819 struct GNUNET_CRYPTO_ShortHashCode name_hash;
820 GNUNET_HashCode lookup_key; 820 struct GNUNET_HashCode lookup_key;
821 GNUNET_HashCode name_hash_double; 821 struct GNUNET_HashCode name_hash_double;
822 GNUNET_HashCode zone_hash_double; 822 struct GNUNET_HashCode zone_hash_double;
823 struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string; 823 struct GNUNET_CRYPTO_HashAsciiEncoded lookup_key_string;
824 struct RecordLookupHandle *rlh = (struct RecordLookupHandle *)rh->proc_cls; 824 struct RecordLookupHandle *rlh = (struct RecordLookupHandle *)rh->proc_cls;
825 struct ResolverHandle *rh_heap_root; 825 struct ResolverHandle *rh_heap_root;
@@ -1158,7 +1158,7 @@ handle_delegation_ns(void* cls, struct ResolverHandle *rh,
1158static void 1158static void
1159process_delegation_result_dht(void* cls, 1159process_delegation_result_dht(void* cls,
1160 struct GNUNET_TIME_Absolute exp, 1160 struct GNUNET_TIME_Absolute exp,
1161 const GNUNET_HashCode * key, 1161 const struct GNUNET_HashCode * key,
1162 const struct GNUNET_PeerIdentity *get_path, 1162 const struct GNUNET_PeerIdentity *get_path,
1163 unsigned int get_path_length, 1163 unsigned int get_path_length,
1164 const struct GNUNET_PeerIdentity *put_path, 1164 const struct GNUNET_PeerIdentity *put_path,
@@ -1174,7 +1174,7 @@ process_delegation_result_dht(void* cls,
1174 int i; 1174 int i;
1175 int rd_size; 1175 int rd_size;
1176 struct GNUNET_CRYPTO_ShortHashCode zone, name_hash; 1176 struct GNUNET_CRYPTO_ShortHashCode zone, name_hash;
1177 GNUNET_HashCode zone_hash_double, name_hash_double; 1177 struct GNUNET_HashCode zone_hash_double, name_hash_double;
1178 1178
1179 rh = (struct ResolverHandle *)cls; 1179 rh = (struct ResolverHandle *)cls;
1180 1180
@@ -1692,9 +1692,9 @@ resolve_delegation_dht(struct ResolverHandle *rh)
1692{ 1692{
1693 uint32_t xquery; 1693 uint32_t xquery;
1694 struct GNUNET_CRYPTO_ShortHashCode name_hash; 1694 struct GNUNET_CRYPTO_ShortHashCode name_hash;
1695 GNUNET_HashCode name_hash_double; 1695 struct GNUNET_HashCode name_hash_double;
1696 GNUNET_HashCode zone_hash_double; 1696 struct GNUNET_HashCode zone_hash_double;
1697 GNUNET_HashCode lookup_key; 1697 struct GNUNET_HashCode lookup_key;
1698 struct ResolverHandle *rh_heap_root; 1698 struct ResolverHandle *rh_heap_root;
1699 1699
1700 pop_tld(rh->name, rh->authority_name); 1700 pop_tld(rh->name, rh->authority_name);
diff --git a/src/gns/plugin_block_gns.c b/src/gns/plugin_block_gns.c
index 5d986ce98..ba1fd56e1 100644
--- a/src/gns/plugin_block_gns.c
+++ b/src/gns/plugin_block_gns.c
@@ -56,18 +56,18 @@
56 */ 56 */
57static enum GNUNET_BLOCK_EvaluationResult 57static enum GNUNET_BLOCK_EvaluationResult
58block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type, 58block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
59 const GNUNET_HashCode * query, 59 const struct GNUNET_HashCode * query,
60 struct GNUNET_CONTAINER_BloomFilter **bf, 60 struct GNUNET_CONTAINER_BloomFilter **bf,
61 int32_t bf_mutator, const void *xquery, 61 int32_t bf_mutator, const void *xquery,
62 size_t xquery_size, const void *reply_block, 62 size_t xquery_size, const void *reply_block,
63 size_t reply_block_size) 63 size_t reply_block_size)
64{ 64{
65 char* name; 65 char* name;
66 GNUNET_HashCode pkey_hash_double; 66 struct GNUNET_HashCode pkey_hash_double;
67 GNUNET_HashCode query_key; 67 struct GNUNET_HashCode query_key;
68 GNUNET_HashCode name_hash_double; 68 struct GNUNET_HashCode name_hash_double;
69 GNUNET_HashCode mhash; 69 struct GNUNET_HashCode mhash;
70 GNUNET_HashCode chash; 70 struct GNUNET_HashCode chash;
71 struct GNUNET_CRYPTO_ShortHashCode pkey_hash; 71 struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
72 struct GNUNET_CRYPTO_ShortHashCode name_hash; 72 struct GNUNET_CRYPTO_ShortHashCode name_hash;
73 struct GNSNameRecordBlock *nrb; 73 struct GNSNameRecordBlock *nrb;
@@ -218,14 +218,14 @@ block_plugin_gns_evaluate (void *cls, enum GNUNET_BLOCK_Type type,
218static int 218static int
219block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type, 219block_plugin_gns_get_key (void *cls, enum GNUNET_BLOCK_Type type,
220 const void *block, size_t block_size, 220 const void *block, size_t block_size,
221 GNUNET_HashCode * key) 221 struct GNUNET_HashCode * key)
222{ 222{
223 if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD) 223 if (type != GNUNET_BLOCK_TYPE_GNS_NAMERECORD)
224 return GNUNET_SYSERR; 224 return GNUNET_SYSERR;
225 struct GNUNET_CRYPTO_ShortHashCode name_hash; 225 struct GNUNET_CRYPTO_ShortHashCode name_hash;
226 struct GNUNET_CRYPTO_ShortHashCode pkey_hash; 226 struct GNUNET_CRYPTO_ShortHashCode pkey_hash;
227 GNUNET_HashCode name_hash_double; 227 struct GNUNET_HashCode name_hash_double;
228 GNUNET_HashCode pkey_hash_double; 228 struct GNUNET_HashCode pkey_hash_double;
229 229
230 struct GNSNameRecordBlock *nrb = (struct GNSNameRecordBlock *)block; 230 struct GNSNameRecordBlock *nrb = (struct GNSNameRecordBlock *)block;
231 231
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c
index 0ab1c1ecb..e444023c8 100644
--- a/src/gns/test_gns_dht_delegated_lookup.c
+++ b/src/gns/test_gns_dht_delegated_lookup.c
@@ -202,9 +202,9 @@ put_dht(void *cls, int32_t success, const char *emsg)
202 struct GNSNameRecordBlock *nrb; 202 struct GNSNameRecordBlock *nrb;
203 struct GNUNET_CRYPTO_ShortHashCode name_hash; 203 struct GNUNET_CRYPTO_ShortHashCode name_hash;
204 struct GNUNET_CRYPTO_ShortHashCode zone_hash; 204 struct GNUNET_CRYPTO_ShortHashCode zone_hash;
205 GNUNET_HashCode xor_hash; 205 struct GNUNET_HashCode xor_hash;
206 GNUNET_HashCode name_hash_double; 206 struct GNUNET_HashCode name_hash_double;
207 GNUNET_HashCode zone_hash_double; 207 struct GNUNET_HashCode zone_hash_double;
208 uint32_t rd_payload_length; 208 uint32_t rd_payload_length;
209 char* nrb_data = NULL; 209 char* nrb_data = NULL;
210 struct GNUNET_CRYPTO_RsaSignature *sig; 210 struct GNUNET_CRYPTO_RsaSignature *sig;
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index d5e0cee78..88fe17c29 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -270,9 +270,9 @@ put_pseu_dht(void *cls, int success)
270 struct GNSNameRecordBlock *nrb; 270 struct GNSNameRecordBlock *nrb;
271 struct GNUNET_CRYPTO_ShortHashCode name_hash; 271 struct GNUNET_CRYPTO_ShortHashCode name_hash;
272 struct GNUNET_CRYPTO_ShortHashCode zone_hash; 272 struct GNUNET_CRYPTO_ShortHashCode zone_hash;
273 GNUNET_HashCode xor_hash; 273 struct GNUNET_HashCode xor_hash;
274 GNUNET_HashCode name_hash_double; 274 struct GNUNET_HashCode name_hash_double;
275 GNUNET_HashCode zone_hash_double; 275 struct GNUNET_HashCode zone_hash_double;
276 uint32_t rd_payload_length; 276 uint32_t rd_payload_length;
277 char* nrb_data = NULL; 277 char* nrb_data = NULL;
278 struct GNUNET_CRYPTO_RsaSignature *sig; 278 struct GNUNET_CRYPTO_RsaSignature *sig;
@@ -348,9 +348,9 @@ put_www_dht(void *cls, int success)
348 struct GNSNameRecordBlock *nrb; 348 struct GNSNameRecordBlock *nrb;
349 struct GNUNET_CRYPTO_ShortHashCode name_hash; 349 struct GNUNET_CRYPTO_ShortHashCode name_hash;
350 struct GNUNET_CRYPTO_ShortHashCode zone_hash; 350 struct GNUNET_CRYPTO_ShortHashCode zone_hash;
351 GNUNET_HashCode xor_hash; 351 struct GNUNET_HashCode xor_hash;
352 GNUNET_HashCode name_hash_double; 352 struct GNUNET_HashCode name_hash_double;
353 GNUNET_HashCode zone_hash_double; 353 struct GNUNET_HashCode zone_hash_double;
354 uint32_t rd_payload_length; 354 uint32_t rd_payload_length;
355 char* nrb_data = NULL; 355 char* nrb_data = NULL;
356 struct GNUNET_CRYPTO_RsaSignature *sig; 356 struct GNUNET_CRYPTO_RsaSignature *sig;
@@ -428,9 +428,9 @@ put_pkey_dht(void *cls, int32_t success, const char *emsg)
428 struct GNSNameRecordBlock *nrb; 428 struct GNSNameRecordBlock *nrb;
429 struct GNUNET_CRYPTO_ShortHashCode name_hash; 429 struct GNUNET_CRYPTO_ShortHashCode name_hash;
430 struct GNUNET_CRYPTO_ShortHashCode zone_hash; 430 struct GNUNET_CRYPTO_ShortHashCode zone_hash;
431 GNUNET_HashCode xor_hash; 431 struct GNUNET_HashCode xor_hash;
432 GNUNET_HashCode name_hash_double; 432 struct GNUNET_HashCode name_hash_double;
433 GNUNET_HashCode zone_hash_double; 433 struct GNUNET_HashCode zone_hash_double;
434 uint32_t rd_payload_length; 434 uint32_t rd_payload_length;
435 char* nrb_data = NULL; 435 char* nrb_data = NULL;
436 struct GNUNET_CRYPTO_RsaSignature *sig; 436 struct GNUNET_CRYPTO_RsaSignature *sig;