diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-16 11:39:55 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-16 11:39:55 +0000 |
commit | b3db33d5679f3d4f05802d360da3d8a2fd7192f1 (patch) | |
tree | b1ad38add710bceba3b13261174cfb0507bcf0c2 | |
parent | b6bfed8309e6b9b3286b8f608ad899bfb0a97205 (diff) | |
download | gnunet-b3db33d5679f3d4f05802d360da3d8a2fd7192f1.tar.gz gnunet-b3db33d5679f3d4f05802d360da3d8a2fd7192f1.zip |
-rename fest for symbols moved from GNUNET_NAMESTORE_ to new GNUNET_GNSRECORD_ library
-rw-r--r-- | src/conversation/conversation_api.c | 6 | ||||
-rw-r--r-- | src/conversation/gnunet-conversation.c | 2 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-gns.c | 8 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 12 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_shorten.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_pseu_shorten.c | 10 | ||||
-rw-r--r-- | src/gns/test_gns_revocation.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_shorten.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_srv_lookup.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_simple_zkey_lookup.c | 2 | ||||
-rw-r--r-- | src/gnsrecord/gnsrecord.c | 44 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore-fcfsd.c | 6 | ||||
-rw-r--r-- | src/namestore/gnunet-namestore.c | 14 | ||||
-rw-r--r-- | src/namestore/plugin_namestore_postgres.c | 2 | ||||
-rw-r--r-- | src/namestore/plugin_namestore_sqlite.c | 2 | ||||
-rw-r--r-- | src/namestore/test_namestore_api_zone_to_name.c | 2 | ||||
-rw-r--r-- | src/pt/test_gns_vpn.c | 4 |
19 files changed, 67 insertions, 67 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index aca0155c8..7ee303866 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -457,7 +457,7 @@ GNUNET_CONVERSATION_phone_get_record (struct GNUNET_CONVERSATION_Phone *phone, | |||
457 | rd->data = &phone->my_record; | 457 | rd->data = &phone->my_record; |
458 | rd->expiration_time = 0; | 458 | rd->expiration_time = 0; |
459 | rd->data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord); | 459 | rd->data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord); |
460 | rd->record_type = GNUNET_NAMESTORE_TYPE_PHONE; | 460 | rd->record_type = GNUNET_GNSRECORD_TYPE_PHONE; |
461 | rd->flags = GNUNET_NAMESTORE_RF_NONE; | 461 | rd->flags = GNUNET_NAMESTORE_RF_NONE; |
462 | } | 462 | } |
463 | 463 | ||
@@ -914,7 +914,7 @@ handle_gns_response (void *cls, | |||
914 | call->gns_lookup = NULL; | 914 | call->gns_lookup = NULL; |
915 | for (i=0;i<rd_count;i++) | 915 | for (i=0;i<rd_count;i++) |
916 | { | 916 | { |
917 | if (GNUNET_NAMESTORE_TYPE_PHONE == rd[i].record_type) | 917 | if (GNUNET_GNSRECORD_TYPE_PHONE == rd[i].record_type) |
918 | { | 918 | { |
919 | if (rd[i].data_size != sizeof (struct GNUNET_CONVERSATION_PhoneRecord)) | 919 | if (rd[i].data_size != sizeof (struct GNUNET_CONVERSATION_PhoneRecord)) |
920 | { | 920 | { |
@@ -1017,7 +1017,7 @@ reconnect_call (struct GNUNET_CONVERSATION_Call *call) | |||
1017 | call->gns_lookup = GNUNET_GNS_lookup (call->gns, | 1017 | call->gns_lookup = GNUNET_GNS_lookup (call->gns, |
1018 | call->callee, | 1018 | call->callee, |
1019 | &my_zone, | 1019 | &my_zone, |
1020 | GNUNET_NAMESTORE_TYPE_PHONE, | 1020 | GNUNET_GNSRECORD_TYPE_PHONE, |
1021 | GNUNET_NO, | 1021 | GNUNET_NO, |
1022 | NULL /* FIXME: add shortening support */, | 1022 | NULL /* FIXME: add shortening support */, |
1023 | &handle_gns_response, call); | 1023 | &handle_gns_response, call); |
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index d2122d104..5acdb3812 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -244,7 +244,7 @@ start_phone () | |||
244 | GNUNET_CONVERSATION_phone_get_record (phone, | 244 | GNUNET_CONVERSATION_phone_get_record (phone, |
245 | &rd); | 245 | &rd); |
246 | GNUNET_free_non_null (address); | 246 | GNUNET_free_non_null (address); |
247 | address = GNUNET_NAMESTORE_value_to_string (rd.record_type, | 247 | address = GNUNET_GNSRECORD_value_to_string (rd.record_type, |
248 | rd.data, | 248 | rd.data, |
249 | rd.data_size); | 249 | rd.data_size); |
250 | if (verbose) | 250 | if (verbose) |
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index 7265b9621..93f33218b 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2275,10 +2275,10 @@ handle_gns_result (void *cls, | |||
2275 | #endif | 2275 | #endif |
2276 | } | 2276 | } |
2277 | break; | 2277 | break; |
2278 | case GNUNET_NAMESTORE_TYPE_VPN: | 2278 | case GNUNET_GNSRECORD_TYPE_VPN: |
2279 | GNUNET_break (0); /* should have been translated within GNS */ | 2279 | GNUNET_break (0); /* should have been translated within GNS */ |
2280 | break; | 2280 | break; |
2281 | case GNUNET_NAMESTORE_TYPE_LEHO: | 2281 | case GNUNET_GNSRECORD_TYPE_LEHO: |
2282 | GNUNET_free_non_null (s5r->leho); | 2282 | GNUNET_free_non_null (s5r->leho); |
2283 | s5r->leho = GNUNET_strndup (r->data, | 2283 | s5r->leho = GNUNET_strndup (r->data, |
2284 | r->data_size); | 2284 | r->data_size); |
diff --git a/src/gns/gnunet-gns.c b/src/gns/gnunet-gns.c index 6772844b8..736fb8af2 100644 --- a/src/gns/gnunet-gns.c +++ b/src/gns/gnunet-gns.c | |||
@@ -157,10 +157,10 @@ process_lookup_result (void *cls, uint32_t rd_count, | |||
157 | for (i=0; i<rd_count; i++) | 157 | for (i=0; i<rd_count; i++) |
158 | { | 158 | { |
159 | if ( (rd[i].record_type != rtype) && | 159 | if ( (rd[i].record_type != rtype) && |
160 | (GNUNET_NAMESTORE_TYPE_ANY != rtype) ) | 160 | (GNUNET_GNSRECORD_TYPE_ANY != rtype) ) |
161 | continue; | 161 | continue; |
162 | typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type); | 162 | typename = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type); |
163 | string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type, | 163 | string_val = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, |
164 | rd[i].data, | 164 | rd[i].data, |
165 | rd[i].data_size); | 165 | rd[i].data_size); |
166 | if (NULL == string_val) | 166 | if (NULL == string_val) |
@@ -196,7 +196,7 @@ lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey, | |||
196 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key) | 196 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key) |
197 | { | 197 | { |
198 | if (NULL != lookup_type) | 198 | if (NULL != lookup_type) |
199 | rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type); | 199 | rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type); |
200 | else | 200 | else |
201 | rtype = GNUNET_DNSPARSER_TYPE_A; | 201 | rtype = GNUNET_DNSPARSER_TYPE_A; |
202 | 202 | ||
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index f8b7e1a42..9b55dfcfc 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -1100,7 +1100,7 @@ vpn_allocation_cb (void *cls, | |||
1100 | rd)); | 1100 | rd)); |
1101 | for (i=0;i<vpn_ctx->rd_count;i++) | 1101 | for (i=0;i<vpn_ctx->rd_count;i++) |
1102 | { | 1102 | { |
1103 | if (GNUNET_NAMESTORE_TYPE_VPN == rd[i].record_type) | 1103 | if (GNUNET_GNSRECORD_TYPE_VPN == rd[i].record_type) |
1104 | { | 1104 | { |
1105 | switch (af) | 1105 | switch (af) |
1106 | { | 1106 | { |
@@ -1204,7 +1204,7 @@ handle_gns_resolution_result (void *cls, | |||
1204 | { | 1204 | { |
1205 | switch (rd[i].record_type) | 1205 | switch (rd[i].record_type) |
1206 | { | 1206 | { |
1207 | case GNUNET_NAMESTORE_TYPE_VPN: | 1207 | case GNUNET_GNSRECORD_TYPE_VPN: |
1208 | { | 1208 | { |
1209 | af = (GNUNET_DNSPARSER_TYPE_A == rh->record_type) ? AF_INET : AF_INET6; | 1209 | af = (GNUNET_DNSPARSER_TYPE_A == rh->record_type) ? AF_INET : AF_INET6; |
1210 | if (sizeof (struct GNUNET_TUN_GnsVpnRecord) < | 1210 | if (sizeof (struct GNUNET_TUN_GnsVpnRecord) < |
@@ -1247,7 +1247,7 @@ handle_gns_resolution_result (void *cls, | |||
1247 | rh); | 1247 | rh); |
1248 | return; | 1248 | return; |
1249 | } | 1249 | } |
1250 | case GNUNET_NAMESTORE_TYPE_GNS2DNS: | 1250 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
1251 | { | 1251 | { |
1252 | /* delegation to DNS */ | 1252 | /* delegation to DNS */ |
1253 | goto do_recurse; | 1253 | goto do_recurse; |
@@ -1418,7 +1418,7 @@ handle_gns_resolution_result (void *cls, | |||
1418 | GNUNET_DNSPARSER_free_srv (srv); | 1418 | GNUNET_DNSPARSER_free_srv (srv); |
1419 | } | 1419 | } |
1420 | break; | 1420 | break; |
1421 | case GNUNET_NAMESTORE_TYPE_PKEY: | 1421 | case GNUNET_GNSRECORD_TYPE_PKEY: |
1422 | /* tigger shortening */ | 1422 | /* tigger shortening */ |
1423 | if (NULL != rh->shorten_key) | 1423 | if (NULL != rh->shorten_key) |
1424 | { | 1424 | { |
@@ -1453,7 +1453,7 @@ handle_gns_resolution_result (void *cls, | |||
1453 | { | 1453 | { |
1454 | switch (rd[i].record_type) | 1454 | switch (rd[i].record_type) |
1455 | { | 1455 | { |
1456 | case GNUNET_NAMESTORE_TYPE_PKEY: | 1456 | case GNUNET_GNSRECORD_TYPE_PKEY: |
1457 | /* delegation to another zone */ | 1457 | /* delegation to another zone */ |
1458 | if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != | 1458 | if (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) != |
1459 | rd[i].data_size) | 1459 | rd[i].data_size) |
@@ -1484,7 +1484,7 @@ handle_gns_resolution_result (void *cls, | |||
1484 | rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution, | 1484 | rh->task_id = GNUNET_SCHEDULER_add_now (&recursive_resolution, |
1485 | rh); | 1485 | rh); |
1486 | return; | 1486 | return; |
1487 | case GNUNET_NAMESTORE_TYPE_GNS2DNS: | 1487 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
1488 | { | 1488 | { |
1489 | char *ns; | 1489 | char *ns; |
1490 | /* resolution continues within DNS */ | 1490 | /* resolution continues within DNS */ |
diff --git a/src/gns/gnunet-service-gns_shorten.c b/src/gns/gnunet-service-gns_shorten.c index 3d3ac0094..3ec03a5ef 100644 --- a/src/gns/gnunet-service-gns_shorten.c +++ b/src/gns/gnunet-service-gns_shorten.c | |||
@@ -290,7 +290,7 @@ process_pseu_lookup_ns (void *cls, | |||
290 | new_pkey.expiration_time = UINT64_MAX; | 290 | new_pkey.expiration_time = UINT64_MAX; |
291 | new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); | 291 | new_pkey.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); |
292 | new_pkey.data = &gph->target_zone; | 292 | new_pkey.data = &gph->target_zone; |
293 | new_pkey.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 293 | new_pkey.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
294 | new_pkey.flags = GNUNET_NAMESTORE_RF_NONE | 294 | new_pkey.flags = GNUNET_NAMESTORE_RF_NONE |
295 | | GNUNET_NAMESTORE_RF_PRIVATE | 295 | | GNUNET_NAMESTORE_RF_PRIVATE |
296 | | GNUNET_NAMESTORE_RF_PENDING; | 296 | | GNUNET_NAMESTORE_RF_PENDING; |
@@ -365,7 +365,7 @@ process_auth_records (void *cls, | |||
365 | 365 | ||
366 | for (i=0; i < rd_count; i++) | 366 | for (i=0; i < rd_count; i++) |
367 | { | 367 | { |
368 | if (GNUNET_NAMESTORE_TYPE_PSEU == rd[i].record_type) | 368 | if (GNUNET_GNSRECORD_TYPE_PSEU == rd[i].record_type) |
369 | { | 369 | { |
370 | char pseu[rd[i].data_size + 1]; | 370 | char pseu[rd[i].data_size + 1]; |
371 | 371 | ||
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 66a2eb091..25127d747 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -423,7 +423,7 @@ run (void *cls, | |||
423 | 423 | ||
424 | host_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (zone_keyfile); | 424 | host_key = GNUNET_CRYPTO_ecdsa_key_create_from_file (zone_keyfile); |
425 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; | 425 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; |
426 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_DNSPARSER_TYPE_A, | 426 | GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_DNSPARSER_TYPE_A, |
427 | "127.0.0.1", | 427 | "127.0.0.1", |
428 | (void**)&rd.data, | 428 | (void**)&rd.data, |
429 | &rd.data_size)); | 429 | &rd.data_size)); |
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index f4c628cb0..6bcc18999 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c | |||
@@ -272,7 +272,7 @@ put_pseu_dht (void *cls, int success) | |||
272 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; | 272 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; |
273 | rd.data_size = strlen(TEST_PSEU_ALICE)+1; | 273 | rd.data_size = strlen(TEST_PSEU_ALICE)+1; |
274 | rd.data = TEST_PSEU_ALICE; | 274 | rd.data = TEST_PSEU_ALICE; |
275 | rd.record_type = GNUNET_NAMESTORE_TYPE_PSEU; | 275 | rd.record_type = GNUNET_GNSRECORD_TYPE_PSEU; |
276 | rd.flags = 0; | 276 | rd.flags = 0; |
277 | 277 | ||
278 | sig = GNUNET_NAMESTORE_create_signature(alice_key, | 278 | sig = GNUNET_NAMESTORE_create_signature(alice_key, |
@@ -447,7 +447,7 @@ put_pkey_dht (void *cls, int32_t success, const char *emsg) | |||
447 | rd.expiration_time = UINT64_MAX; | 447 | rd.expiration_time = UINT64_MAX; |
448 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 448 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
449 | rd.data = &alice_hash; | 449 | rd.data = &alice_hash; |
450 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 450 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
451 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 451 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
452 | 452 | ||
453 | sig = GNUNET_NAMESTORE_create_signature (bob_key, | 453 | sig = GNUNET_NAMESTORE_create_signature (bob_key, |
@@ -518,7 +518,7 @@ fin_init_zone (void *cls, int32_t success, const char *emsg) | |||
518 | rd.expiration_time = UINT64_MAX; | 518 | rd.expiration_time = UINT64_MAX; |
519 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 519 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
520 | rd.data = &bob_hash; | 520 | rd.data = &bob_hash; |
521 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 521 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
522 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 522 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
523 | 523 | ||
524 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 524 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
@@ -539,7 +539,7 @@ cont_init_zone (void *cls, int32_t success, const char *emsg) | |||
539 | rd.expiration_time = UINT64_MAX; | 539 | rd.expiration_time = UINT64_MAX; |
540 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 540 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
541 | rd.data = &short_zone; | 541 | rd.data = &short_zone; |
542 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 542 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
543 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 543 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
544 | 544 | ||
545 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 545 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
@@ -640,7 +640,7 @@ do_check (void *cls, | |||
640 | rd.expiration_time = UINT64_MAX; | 640 | rd.expiration_time = UINT64_MAX; |
641 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 641 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
642 | rd.data = &priv_zone; | 642 | rd.data = &priv_zone; |
643 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 643 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
644 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 644 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
645 | 645 | ||
646 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 646 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c index 5be15759a..555e44a20 100644 --- a/src/gns/test_gns_revocation.c +++ b/src/gns/test_gns_revocation.c | |||
@@ -226,7 +226,7 @@ do_check (void *cls, | |||
226 | 226 | ||
227 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 227 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
228 | rd.data = &bob_hash; | 228 | rd.data = &bob_hash; |
229 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 229 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
230 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 230 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
231 | 231 | ||
232 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 232 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
@@ -254,7 +254,7 @@ do_check (void *cls, | |||
254 | NULL, | 254 | NULL, |
255 | NULL); | 255 | NULL); |
256 | rd.data_size = 0; | 256 | rd.data_size = 0; |
257 | rd.record_type = GNUNET_NAMESTORE_TYPE_REV; | 257 | rd.record_type = GNUNET_GNSRECORD_TYPE_REV; |
258 | 258 | ||
259 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 259 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
260 | bob_key, | 260 | bob_key, |
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index a4cfa26dc..2b4543f4e 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c | |||
@@ -256,7 +256,7 @@ void do_check (void *cls, | |||
256 | 256 | ||
257 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 257 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
258 | rd.data = &bob_hash; | 258 | rd.data = &bob_hash; |
259 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 259 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
260 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 260 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
261 | 261 | ||
262 | /* put bob into our zone */ | 262 | /* put bob into our zone */ |
@@ -308,7 +308,7 @@ void do_check (void *cls, | |||
308 | 308 | ||
309 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 309 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
310 | rd.data = &alice_hash; | 310 | rd.data = &alice_hash; |
311 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 311 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
312 | GNUNET_free(sig); | 312 | GNUNET_free(sig); |
313 | 313 | ||
314 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 314 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c index f31ae6daa..162e9dc93 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c | |||
@@ -234,7 +234,7 @@ do_check (void *cls, | |||
234 | 234 | ||
235 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 235 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
236 | rd.data = &bob_hash; | 236 | rd.data = &bob_hash; |
237 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 237 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
238 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 238 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
239 | 239 | ||
240 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 240 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
diff --git a/src/gns/test_gns_simple_zkey_lookup.c b/src/gns/test_gns_simple_zkey_lookup.c index a808d2d9d..6e8ec9ff4 100644 --- a/src/gns/test_gns_simple_zkey_lookup.c +++ b/src/gns/test_gns_simple_zkey_lookup.c | |||
@@ -243,7 +243,7 @@ do_check (void *cls, | |||
243 | 243 | ||
244 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); | 244 | rd.data_size = sizeof(struct GNUNET_CRYPTO_ShortHashCode); |
245 | rd.data = &bob_hash; | 245 | rd.data = &bob_hash; |
246 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 246 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
247 | rd.flags = GNUNET_NAMESTORE_RF_NONE; | 247 | rd.flags = GNUNET_NAMESTORE_RF_NONE; |
248 | 248 | ||
249 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, | 249 | GNUNET_NAMESTORE_record_put_by_authority (namestore_handle, |
diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c index da098ab66..68e4f23ba 100644 --- a/src/gnsrecord/gnsrecord.c +++ b/src/gnsrecord/gnsrecord.c | |||
@@ -47,7 +47,7 @@ | |||
47 | * @return NULL on error, otherwise human-readable representation of the value | 47 | * @return NULL on error, otherwise human-readable representation of the value |
48 | */ | 48 | */ |
49 | char * | 49 | char * |
50 | GNUNET_NAMESTORE_value_to_string (uint32_t type, | 50 | GNUNET_GNSRECORD_value_to_string (uint32_t type, |
51 | const void *data, | 51 | const void *data, |
52 | size_t data_size) | 52 | size_t data_size) |
53 | { | 53 | { |
@@ -176,11 +176,11 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, | |||
176 | if (NULL == inet_ntop (AF_INET6, data, tmp, sizeof (tmp))) | 176 | if (NULL == inet_ntop (AF_INET6, data, tmp, sizeof (tmp))) |
177 | return NULL; | 177 | return NULL; |
178 | return GNUNET_strdup (tmp); | 178 | return GNUNET_strdup (tmp); |
179 | case GNUNET_NAMESTORE_TYPE_PKEY: | 179 | case GNUNET_GNSRECORD_TYPE_PKEY: |
180 | if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) | 180 | if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)) |
181 | return NULL; | 181 | return NULL; |
182 | return GNUNET_CRYPTO_ecdsa_public_key_to_string (data); | 182 | return GNUNET_CRYPTO_ecdsa_public_key_to_string (data); |
183 | case GNUNET_NAMESTORE_TYPE_PHONE: | 183 | case GNUNET_GNSRECORD_TYPE_PHONE: |
184 | { | 184 | { |
185 | const struct GNUNET_CONVERSATION_PhoneRecord *pr; | 185 | const struct GNUNET_CONVERSATION_PhoneRecord *pr; |
186 | char *ret; | 186 | char *ret; |
@@ -199,11 +199,11 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, | |||
199 | GNUNET_free (pkey); | 199 | GNUNET_free (pkey); |
200 | return ret; | 200 | return ret; |
201 | } | 201 | } |
202 | case GNUNET_NAMESTORE_TYPE_PSEU: | 202 | case GNUNET_GNSRECORD_TYPE_PSEU: |
203 | return GNUNET_strndup (data, data_size); | 203 | return GNUNET_strndup (data, data_size); |
204 | case GNUNET_NAMESTORE_TYPE_LEHO: | 204 | case GNUNET_GNSRECORD_TYPE_LEHO: |
205 | return GNUNET_strndup (data, data_size); | 205 | return GNUNET_strndup (data, data_size); |
206 | case GNUNET_NAMESTORE_TYPE_VPN: | 206 | case GNUNET_GNSRECORD_TYPE_VPN: |
207 | { | 207 | { |
208 | const struct GNUNET_TUN_GnsVpnRecord *vpn; | 208 | const struct GNUNET_TUN_GnsVpnRecord *vpn; |
209 | char* vpn_str; | 209 | char* vpn_str; |
@@ -223,7 +223,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, | |||
223 | } | 223 | } |
224 | return vpn_str; | 224 | return vpn_str; |
225 | } | 225 | } |
226 | case GNUNET_NAMESTORE_TYPE_GNS2DNS: | 226 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
227 | { | 227 | { |
228 | char *ns; | 228 | char *ns; |
229 | size_t off; | 229 | size_t off; |
@@ -309,7 +309,7 @@ GNUNET_NAMESTORE_value_to_string (uint32_t type, | |||
309 | * @return #GNUNET_OK on success | 309 | * @return #GNUNET_OK on success |
310 | */ | 310 | */ |
311 | int | 311 | int |
312 | GNUNET_NAMESTORE_string_to_value (uint32_t type, | 312 | GNUNET_GNSRECORD_string_to_value (uint32_t type, |
313 | const char *s, | 313 | const char *s, |
314 | void **data, | 314 | void **data, |
315 | size_t *data_size) | 315 | size_t *data_size) |
@@ -509,7 +509,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type, | |||
509 | *data_size = sizeof (struct in6_addr); | 509 | *data_size = sizeof (struct in6_addr); |
510 | memcpy (*data, &value_aaaa, sizeof (value_aaaa)); | 510 | memcpy (*data, &value_aaaa, sizeof (value_aaaa)); |
511 | return GNUNET_OK; | 511 | return GNUNET_OK; |
512 | case GNUNET_NAMESTORE_TYPE_PKEY: | 512 | case GNUNET_GNSRECORD_TYPE_PKEY: |
513 | if (GNUNET_OK != | 513 | if (GNUNET_OK != |
514 | GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey)) | 514 | GNUNET_CRYPTO_ecdsa_public_key_from_string (s, strlen (s), &pkey)) |
515 | { | 515 | { |
@@ -522,7 +522,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type, | |||
522 | memcpy (*data, &pkey, sizeof (pkey)); | 522 | memcpy (*data, &pkey, sizeof (pkey)); |
523 | *data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); | 523 | *data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); |
524 | return GNUNET_OK; | 524 | return GNUNET_OK; |
525 | case GNUNET_NAMESTORE_TYPE_PHONE: | 525 | case GNUNET_GNSRECORD_TYPE_PHONE: |
526 | { | 526 | { |
527 | struct GNUNET_CONVERSATION_PhoneRecord *pr; | 527 | struct GNUNET_CONVERSATION_PhoneRecord *pr; |
528 | unsigned int line; | 528 | unsigned int line; |
@@ -549,15 +549,15 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type, | |||
549 | *data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord); | 549 | *data_size = sizeof (struct GNUNET_CONVERSATION_PhoneRecord); |
550 | return GNUNET_OK; | 550 | return GNUNET_OK; |
551 | } | 551 | } |
552 | case GNUNET_NAMESTORE_TYPE_PSEU: | 552 | case GNUNET_GNSRECORD_TYPE_PSEU: |
553 | *data = GNUNET_strdup (s); | 553 | *data = GNUNET_strdup (s); |
554 | *data_size = strlen (s); | 554 | *data_size = strlen (s); |
555 | return GNUNET_OK; | 555 | return GNUNET_OK; |
556 | case GNUNET_NAMESTORE_TYPE_LEHO: | 556 | case GNUNET_GNSRECORD_TYPE_LEHO: |
557 | *data = GNUNET_strdup (s); | 557 | *data = GNUNET_strdup (s); |
558 | *data_size = strlen (s); | 558 | *data_size = strlen (s); |
559 | return GNUNET_OK; | 559 | return GNUNET_OK; |
560 | case GNUNET_NAMESTORE_TYPE_VPN: | 560 | case GNUNET_GNSRECORD_TYPE_VPN: |
561 | if (3 != SSCANF (s,"%u %103s %253s", | 561 | if (3 != SSCANF (s,"%u %103s %253s", |
562 | &proto, s_peer, s_serv)) | 562 | &proto, s_peer, s_serv)) |
563 | { | 563 | { |
@@ -579,7 +579,7 @@ GNUNET_NAMESTORE_string_to_value (uint32_t type, | |||
579 | vpn->proto = htons ((uint16_t) proto); | 579 | vpn->proto = htons ((uint16_t) proto); |
580 | strcpy ((char*)&vpn[1], s_serv); | 580 | strcpy ((char*)&vpn[1], s_serv); |
581 | return GNUNET_OK; | 581 | return GNUNET_OK; |
582 | case GNUNET_NAMESTORE_TYPE_GNS2DNS: | 582 | case GNUNET_GNSRECORD_TYPE_GNS2DNS: |
583 | { | 583 | { |
584 | char nsbuf[256]; | 584 | char nsbuf[256]; |
585 | size_t off; | 585 | size_t off; |
@@ -643,12 +643,12 @@ static struct { | |||
643 | { "MX", GNUNET_DNSPARSER_TYPE_MX }, | 643 | { "MX", GNUNET_DNSPARSER_TYPE_MX }, |
644 | { "TXT", GNUNET_DNSPARSER_TYPE_TXT }, | 644 | { "TXT", GNUNET_DNSPARSER_TYPE_TXT }, |
645 | { "AAAA", GNUNET_DNSPARSER_TYPE_AAAA }, | 645 | { "AAAA", GNUNET_DNSPARSER_TYPE_AAAA }, |
646 | { "PKEY", GNUNET_NAMESTORE_TYPE_PKEY }, | 646 | { "PKEY", GNUNET_GNSRECORD_TYPE_PKEY }, |
647 | { "PSEU", GNUNET_NAMESTORE_TYPE_PSEU }, | 647 | { "PSEU", GNUNET_GNSRECORD_TYPE_PSEU }, |
648 | { "LEHO", GNUNET_NAMESTORE_TYPE_LEHO }, | 648 | { "LEHO", GNUNET_GNSRECORD_TYPE_LEHO }, |
649 | { "VPN", GNUNET_NAMESTORE_TYPE_VPN }, | 649 | { "VPN", GNUNET_GNSRECORD_TYPE_VPN }, |
650 | { "GNS2DNS", GNUNET_NAMESTORE_TYPE_GNS2DNS }, | 650 | { "GNS2DNS", GNUNET_GNSRECORD_TYPE_GNS2DNS }, |
651 | { "PHONE", GNUNET_NAMESTORE_TYPE_PHONE }, | 651 | { "PHONE", GNUNET_GNSRECORD_TYPE_PHONE }, |
652 | { "TLSA", GNUNET_DNSPARSER_TYPE_TLSA }, | 652 | { "TLSA", GNUNET_DNSPARSER_TYPE_TLSA }, |
653 | { NULL, UINT32_MAX } | 653 | { NULL, UINT32_MAX } |
654 | }; | 654 | }; |
@@ -661,7 +661,7 @@ static struct { | |||
661 | * @return corresponding number, UINT32_MAX on error | 661 | * @return corresponding number, UINT32_MAX on error |
662 | */ | 662 | */ |
663 | uint32_t | 663 | uint32_t |
664 | GNUNET_NAMESTORE_typename_to_number (const char *dns_typename) | 664 | GNUNET_GNSRECORD_typename_to_number (const char *dns_typename) |
665 | { | 665 | { |
666 | unsigned int i; | 666 | unsigned int i; |
667 | 667 | ||
@@ -680,7 +680,7 @@ GNUNET_NAMESTORE_typename_to_number (const char *dns_typename) | |||
680 | * @return corresponding typestring, NULL on error | 680 | * @return corresponding typestring, NULL on error |
681 | */ | 681 | */ |
682 | const char * | 682 | const char * |
683 | GNUNET_NAMESTORE_number_to_typename (uint32_t type) | 683 | GNUNET_GNSRECORD_number_to_typename (uint32_t type) |
684 | { | 684 | { |
685 | unsigned int i; | 685 | unsigned int i; |
686 | 686 | ||
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c index 14f95c911..701cdd558 100644 --- a/src/namestore/gnunet-namestore-fcfsd.c +++ b/src/namestore/gnunet-namestore-fcfsd.c | |||
@@ -287,14 +287,14 @@ iterate_cb (void *cls, | |||
287 | return; | 287 | return; |
288 | } | 288 | } |
289 | 289 | ||
290 | if (GNUNET_NAMESTORE_TYPE_PKEY != rd->record_type) | 290 | if (GNUNET_GNSRECORD_TYPE_PKEY != rd->record_type) |
291 | { | 291 | { |
292 | GNUNET_NAMESTORE_zone_iterator_next (zr->list_it); | 292 | GNUNET_NAMESTORE_zone_iterator_next (zr->list_it); |
293 | return; | 293 | return; |
294 | } | 294 | } |
295 | 295 | ||
296 | bytes_free = zr->buf_len - zr->write_offset; | 296 | bytes_free = zr->buf_len - zr->write_offset; |
297 | pkey = GNUNET_NAMESTORE_value_to_string (rd->record_type, | 297 | pkey = GNUNET_GNSRECORD_value_to_string (rd->record_type, |
298 | rd->data, | 298 | rd->data, |
299 | rd->data_size); | 299 | rd->data_size); |
300 | 300 | ||
@@ -529,7 +529,7 @@ zone_to_name_cb (void *cls, | |||
529 | r.data = &pub; | 529 | r.data = &pub; |
530 | r.data_size = sizeof (pub); | 530 | r.data_size = sizeof (pub); |
531 | r.expiration_time = UINT64_MAX; | 531 | r.expiration_time = UINT64_MAX; |
532 | r.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 532 | r.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
533 | r.flags = GNUNET_NAMESTORE_RF_NONE; | 533 | r.flags = GNUNET_NAMESTORE_RF_NONE; |
534 | request->qe = GNUNET_NAMESTORE_records_store (ns, | 534 | request->qe = GNUNET_NAMESTORE_records_store (ns, |
535 | &fcfs_zone_pkey, | 535 | &fcfs_zone_pkey, |
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index e4cd856d0..1ed203f1d 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -358,8 +358,8 @@ display_record (void *cls, | |||
358 | name); | 358 | name); |
359 | for (i=0;i<rd_len;i++) | 359 | for (i=0;i<rd_len;i++) |
360 | { | 360 | { |
361 | typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type); | 361 | typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type); |
362 | s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type, | 362 | s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, |
363 | rd[i].data, | 363 | rd[i].data, |
364 | rd[i].data_size); | 364 | rd[i].data_size); |
365 | if (NULL == s) | 365 | if (NULL == s) |
@@ -495,8 +495,8 @@ display_records_from_block (void *cls, | |||
495 | name); | 495 | name); |
496 | for (i=0;i<rd_len;i++) | 496 | for (i=0;i<rd_len;i++) |
497 | { | 497 | { |
498 | typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type); | 498 | typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type); |
499 | s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type, | 499 | s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type, |
500 | rd[i].data, | 500 | rd[i].data, |
501 | rd[i].data_size); | 501 | rd[i].data_size); |
502 | if (NULL == s) | 502 | if (NULL == s) |
@@ -639,7 +639,7 @@ testservice_task (void *cls, | |||
639 | ret = 1; | 639 | ret = 1; |
640 | return; | 640 | return; |
641 | } | 641 | } |
642 | type = GNUNET_NAMESTORE_typename_to_number (typestring); | 642 | type = GNUNET_GNSRECORD_typename_to_number (typestring); |
643 | if (UINT32_MAX == type) | 643 | if (UINT32_MAX == type) |
644 | { | 644 | { |
645 | fprintf (stderr, _("Unsupported type `%s'\n"), typestring); | 645 | fprintf (stderr, _("Unsupported type `%s'\n"), typestring); |
@@ -657,7 +657,7 @@ testservice_task (void *cls, | |||
657 | return; | 657 | return; |
658 | } | 658 | } |
659 | if (GNUNET_OK != | 659 | if (GNUNET_OK != |
660 | GNUNET_NAMESTORE_string_to_value (type, | 660 | GNUNET_GNSRECORD_string_to_value (type, |
661 | value, | 661 | value, |
662 | &data, | 662 | &data, |
663 | &data_size)) | 663 | &data_size)) |
@@ -795,7 +795,7 @@ testservice_task (void *cls, | |||
795 | memset (&rd, 0, sizeof (rd)); | 795 | memset (&rd, 0, sizeof (rd)); |
796 | rd.data = &pkey; | 796 | rd.data = &pkey; |
797 | rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); | 797 | rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey); |
798 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 798 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
799 | if (GNUNET_YES == etime_is_rel) | 799 | if (GNUNET_YES == etime_is_rel) |
800 | { | 800 | { |
801 | rd.expiration_time = etime_rel.rel_value_us; | 801 | rd.expiration_time = etime_rel.rel_value_us; |
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c index 0f2721771..0a8f0fbe8 100644 --- a/src/namestore/plugin_namestore_postgres.c +++ b/src/namestore/plugin_namestore_postgres.c | |||
@@ -476,7 +476,7 @@ namestore_postgres_store_records (void *cls, | |||
476 | 476 | ||
477 | memset (&pkey, 0, sizeof (pkey)); | 477 | memset (&pkey, 0, sizeof (pkey)); |
478 | for (i=0;i<rd_count;i++) | 478 | for (i=0;i<rd_count;i++) |
479 | if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type) | 479 | if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type) |
480 | { | 480 | { |
481 | GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size); | 481 | GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size); |
482 | memcpy (&pkey, | 482 | memcpy (&pkey, |
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c index 9e303a427..06c2a7639 100644 --- a/src/namestore/plugin_namestore_sqlite.c +++ b/src/namestore/plugin_namestore_sqlite.c | |||
@@ -671,7 +671,7 @@ namestore_sqlite_store_records (void *cls, | |||
671 | 671 | ||
672 | memset (&pkey, 0, sizeof (pkey)); | 672 | memset (&pkey, 0, sizeof (pkey)); |
673 | for (i=0;i<rd_count;i++) | 673 | for (i=0;i<rd_count;i++) |
674 | if (GNUNET_NAMESTORE_TYPE_PKEY == rd[i].record_type) | 674 | if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type) |
675 | { | 675 | { |
676 | GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size); | 676 | GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size); |
677 | memcpy (&pkey, | 677 | memcpy (&pkey, |
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c index 973cc18a0..177c6479b 100644 --- a/src/namestore/test_namestore_api_zone_to_name.c +++ b/src/namestore/test_namestore_api_zone_to_name.c | |||
@@ -186,7 +186,7 @@ run (void *cls, | |||
186 | 186 | ||
187 | struct GNUNET_NAMESTORE_RecordData rd; | 187 | struct GNUNET_NAMESTORE_RecordData rd; |
188 | rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; | 188 | rd.expiration_time = GNUNET_TIME_absolute_get().abs_value_us; |
189 | rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY; | 189 | rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY; |
190 | rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode); | 190 | rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode); |
191 | rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode)); | 191 | rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode)); |
192 | memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode)); | 192 | memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode)); |
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c index c98f97933..3f10819ab 100644 --- a/src/pt/test_gns_vpn.c +++ b/src/pt/test_gns_vpn.c | |||
@@ -395,11 +395,11 @@ run (void *cls, | |||
395 | host_key = GNUNET_CRYPTO_eddsa_key_create_from_file (zone_keyfile); | 395 | host_key = GNUNET_CRYPTO_eddsa_key_create_from_file (zone_keyfile); |
396 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; | 396 | rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us; |
397 | GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnu."); | 397 | GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnu."); |
398 | GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_NAMESTORE_TYPE_VPN, | 398 | GNUNET_assert (GNUNET_OK == GNUNET_GNSRECORD_string_to_value (GNUNET_GNSRECORD_TYPE_VPN, |
399 | rd_string, | 399 | rd_string, |
400 | (void**)&rd.data, | 400 | (void**)&rd.data, |
401 | &rd.data_size)); | 401 | &rd.data_size)); |
402 | rd.record_type = GNUNET_NAMESTORE_TYPE_VPN; | 402 | rd.record_type = GNUNET_GNSRECORD_TYPE_VPN; |
403 | 403 | ||
404 | GNUNET_NAMESTORE_records_store (namestore, | 404 | GNUNET_NAMESTORE_records_store (namestore, |
405 | host_key, | 405 | host_key, |