diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-09-14 11:24:58 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2012-09-14 11:24:58 +0000 |
commit | 9784a9d890a8ed194059d67494f24b8f327ef2b5 (patch) | |
tree | bc74b5dba1a378c6510f45fed2ea31c13c25f1da /src | |
parent | 5cd01bc84cf0809af357d9fc2ee7b3b4e88178c5 (diff) | |
download | gnunet-9784a9d890a8ed194059d67494f24b8f327ef2b5.tar.gz gnunet-9784a9d890a8ed194059d67494f24b8f327ef2b5.zip |
-towards .gads
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/gns.h | 2 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca | 7 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy.c | 2 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_interceptor.c | 4 | ||||
-rw-r--r-- | src/gns/gnunet-service-gns_resolver.c | 16 | ||||
-rw-r--r-- | src/gns/test_gns_cname_lookup.c | 8 | ||||
-rw-r--r-- | src/gns/test_gns_dht_delegated_lookup.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_dht_three_peers.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_max_queries.c | 6 | ||||
-rw-r--r-- | src/gns/test_gns_ns_lookup.c | 6 | ||||
-rw-r--r-- | src/gns/test_gns_proxy.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_pseu_shorten.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_revocation.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_simple_delegated_lookup.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_simple_get_authority.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_lookup.c | 2 | ||||
-rw-r--r-- | src/gns/test_gns_simple_mx_lookup.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_shorten.c | 4 | ||||
-rw-r--r-- | src/gns/test_gns_simple_srv_lookup.c | 4 |
19 files changed, 43 insertions, 42 deletions
diff --git a/src/gns/gns.h b/src/gns/gns.h index 49bfd9093..1dbb8b8f3 100644 --- a/src/gns/gns.h +++ b/src/gns/gns.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #ifndef GNS_H | 28 | #ifndef GNS_H |
29 | #define GNS_H | 29 | #define GNS_H |
30 | 30 | ||
31 | #define GNUNET_GNS_TLD "gnunet" | 31 | #define GNUNET_GNS_TLD "gads" |
32 | #define GNUNET_GNS_TLD_ZKEY "zkey" | 32 | #define GNUNET_GNS_TLD_ZKEY "zkey" |
33 | #define GNUNET_GNS_TLD_PLUS "+" | 33 | #define GNUNET_GNS_TLD_PLUS "+" |
34 | #define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600 | 34 | #define GNUNET_GNS_DHT_MAX_UPDATE_INTERVAL 3600 |
diff --git a/src/gns/gnunet-gns-proxy-setup-ca b/src/gns/gnunet-gns-proxy-setup-ca index 48fae94f7..3d9184563 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca +++ b/src/gns/gnunet-gns-proxy-setup-ca | |||
@@ -1,6 +1,7 @@ | |||
1 | echo "Generating CA" | 1 | echo "Generating CA" |
2 | 2 | ||
3 | openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out gnscacert.pem -subj "/C=DE/ST=Bavaria/L=Munich/O=GNUnet Naming System/OU=GNUnet/CN=GNS Proxy CA/emailAddress=bounce@gnunet.org" -passout pass:"GNUnet Naming System" | 3 | openssl req -new -x509 -days 3650 -extensions v3_ca -keyout gnscakey.pem -out |
4 | gnscacert.pem -subj "/C=DE/ST=Bavaria/L=Munich/O=GADS/OU=GNUnet/CN=GADS Proxy CA/emailAddress=bounce@gnunet.org" -passout pass:"GNUnet Naming System" | ||
4 | 5 | ||
5 | echo "Removing passphrase from key" | 6 | echo "Removing passphrase from key" |
6 | openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out gnscakeynoenc.pem | 7 | openssl rsa -passin pass:"GNUnet Naming System" -in gnscakey.pem -out gnscakeynoenc.pem |
@@ -21,8 +22,8 @@ done | |||
21 | 22 | ||
22 | if [ -d ~/.pki/nssdb ]; then | 23 | if [ -d ~/.pki/nssdb ]; then |
23 | echo "Importing CA into chrome" | 24 | echo "Importing CA into chrome" |
24 | certutil -D -n "GNS Proxy CA" -d ~/.pki/nssdb >/dev/null 2&>1 | 25 | certutil -D -n "GADS Proxy CA" -d ~/.pki/nssdb >/dev/null 2&>1 |
25 | certutil -A -n "GNS Proxy CA" -t CT,, -d ~/.pki/nssdb < gnscacert.pem | 26 | certutil -A -n "GADS Proxy CA" -t CT,, -d ~/.pki/nssdb < gnscacert.pem |
26 | fi | 27 | fi |
27 | 28 | ||
28 | 29 | ||
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c index cdc18e3f6..b20010969 100644 --- a/src/gns/gnunet-gns-proxy.c +++ b/src/gns/gnunet-gns-proxy.c | |||
@@ -2610,7 +2610,7 @@ generate_gns_certificate (const char *name) | |||
2610 | 0, "DE", 2); | 2610 | 0, "DE", 2); |
2611 | 2611 | ||
2612 | gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_ORGANIZATION_NAME, | 2612 | gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_ORGANIZATION_NAME, |
2613 | 0, "GNUnet", 6); | 2613 | 0, "GNS", 6); |
2614 | 2614 | ||
2615 | gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_COMMON_NAME, | 2615 | gnutls_x509_crt_set_dn_by_oid (request, GNUTLS_OID_X520_COMMON_NAME, |
2616 | 0, name, strlen (name)); | 2616 | 0, name, strlen (name)); |
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c index 34f1f2eb3..0081bc833 100644 --- a/src/gns/gnunet-service-gns_interceptor.c +++ b/src/gns/gnunet-service-gns_interceptor.c | |||
@@ -313,14 +313,14 @@ handle_dns_request(void *cls, | |||
313 | 313 | ||
314 | if (p->num_queries > 1) | 314 | if (p->num_queries > 1) |
315 | { | 315 | { |
316 | /* Note: We could also look for .gnunet */ | 316 | /* Note: We could also look for .gads */ |
317 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 317 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
318 | ">1 queriy in DNS packet... odd. We only process #1\n"); | 318 | ">1 queriy in DNS packet... odd. We only process #1\n"); |
319 | } | 319 | } |
320 | 320 | ||
321 | 321 | ||
322 | /** | 322 | /** |
323 | * Check for .gnunet/.zkey | 323 | * Check for .gads/.zkey |
324 | */ | 324 | */ |
325 | 325 | ||
326 | if ((is_gnunet_tld(p->queries[0].name) == GNUNET_YES) || | 326 | if ((is_gnunet_tld(p->queries[0].name) == GNUNET_YES) || |
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c index 846b4db5b..17e45bbf8 100644 --- a/src/gns/gnunet-service-gns_resolver.c +++ b/src/gns/gnunet-service-gns_resolver.c | |||
@@ -178,7 +178,7 @@ is_srv (char* name) | |||
178 | /** | 178 | /** |
179 | * Determine if this name is canonical. | 179 | * Determine if this name is canonical. |
180 | * i.e. | 180 | * i.e. |
181 | * a.b.gnunet = not canonical | 181 | * a.b.gads = not canonical |
182 | * a = canonical | 182 | * a = canonical |
183 | * | 183 | * |
184 | * @param name the name to test | 184 | * @param name the name to test |
@@ -2121,7 +2121,7 @@ process_pkey_revocation_result_ns (void *cls, | |||
2121 | { | 2121 | { |
2122 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, | 2122 | GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, |
2123 | "GNS_PHASE_DELEGATE_REV-%llu: Starting background lookup for %s type %d\n", | 2123 | "GNS_PHASE_DELEGATE_REV-%llu: Starting background lookup for %s type %d\n", |
2124 | rh->id, "+.gnunet", GNUNET_GNS_RECORD_REV); | 2124 | rh->id, "+.gads", GNUNET_GNS_RECORD_REV); |
2125 | 2125 | ||
2126 | gns_resolver_lookup_record(rh->authority, | 2126 | gns_resolver_lookup_record(rh->authority, |
2127 | rh->private_local_zone, | 2127 | rh->private_local_zone, |
@@ -3645,7 +3645,7 @@ process_zone_to_name_shorten_shorten (void *cls, | |||
3645 | nsh->shorten_zone) == 0) | 3645 | nsh->shorten_zone) == 0) |
3646 | { | 3646 | { |
3647 | /** | 3647 | /** |
3648 | * This is our zone append .gnunet unless name is empty | 3648 | * This is our zone append .gads unless name is empty |
3649 | * (it shouldn't be, usually FIXME what happens if we | 3649 | * (it shouldn't be, usually FIXME what happens if we |
3650 | * shorten to our zone to a "" record??) | 3650 | * shorten to our zone to a "" record??) |
3651 | */ | 3651 | */ |
@@ -3752,7 +3752,7 @@ process_zone_to_name_shorten_private (void *cls, | |||
3752 | nsh->private_zone) == 0) | 3752 | nsh->private_zone) == 0) |
3753 | { | 3753 | { |
3754 | /** | 3754 | /** |
3755 | * This is our zone append .gnunet unless name is empty | 3755 | * This is our zone append .gads unless name is empty |
3756 | * (it shouldn't be, usually FIXME what happens if we | 3756 | * (it shouldn't be, usually FIXME what happens if we |
3757 | * shorten to our zone to a "" record??) | 3757 | * shorten to our zone to a "" record??) |
3758 | */ | 3758 | */ |
@@ -3863,7 +3863,7 @@ process_zone_to_name_shorten_root (void *cls, | |||
3863 | nsh->root_zone) == 0) | 3863 | nsh->root_zone) == 0) |
3864 | { | 3864 | { |
3865 | /** | 3865 | /** |
3866 | * This is our zone append .gnunet unless name is empty | 3866 | * This is our zone append .gads unless name is empty |
3867 | * (it shouldn't be, usually FIXME what happens if we | 3867 | * (it shouldn't be, usually FIXME what happens if we |
3868 | * shorten to our zone to a "" record??) | 3868 | * shorten to our zone to a "" record??) |
3869 | */ | 3869 | */ |
@@ -3964,7 +3964,7 @@ handle_delegation_ns_shorten (void* cls, | |||
3964 | nsh->root_zone) == 0) | 3964 | nsh->root_zone) == 0) |
3965 | { | 3965 | { |
3966 | /** | 3966 | /** |
3967 | * This is our zone append .gnunet unless name is empty | 3967 | * This is our zone append .gads unless name is empty |
3968 | * (it shouldn't be, usually FIXME what happens if we | 3968 | * (it shouldn't be, usually FIXME what happens if we |
3969 | * shorten to our zone to a "" record??) | 3969 | * shorten to our zone to a "" record??) |
3970 | */ | 3970 | */ |
@@ -3980,7 +3980,7 @@ handle_delegation_ns_shorten (void* cls, | |||
3980 | else if (NULL != nsh->private_zone) | 3980 | else if (NULL != nsh->private_zone) |
3981 | { | 3981 | { |
3982 | /** | 3982 | /** |
3983 | * This is our zone append .gnunet unless name is empty | 3983 | * This is our zone append .gads unless name is empty |
3984 | * (it shouldn't be, usually FIXME what happens if we | 3984 | * (it shouldn't be, usually FIXME what happens if we |
3985 | * shorten to our zone to a "" record??) | 3985 | * shorten to our zone to a "" record??) |
3986 | */ | 3986 | */ |
@@ -4001,7 +4001,7 @@ handle_delegation_ns_shorten (void* cls, | |||
4001 | else if (NULL != nsh->shorten_zone) | 4001 | else if (NULL != nsh->shorten_zone) |
4002 | { | 4002 | { |
4003 | /** | 4003 | /** |
4004 | * This is our zone append .gnunet unless name is empty | 4004 | * This is our zone append .gads unless name is empty |
4005 | * (it shouldn't be, usually FIXME what happens if we | 4005 | * (it shouldn't be, usually FIXME what happens if we |
4006 | * shorten to our zone to a "" record??) | 4006 | * shorten to our zone to a "" record??) |
4007 | */ | 4007 | */ |
diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c index 95aa0660b..2c384cfa2 100644 --- a/src/gns/test_gns_cname_lookup.c +++ b/src/gns/test_gns_cname_lookup.c | |||
@@ -41,13 +41,13 @@ | |||
41 | #define DEFAULT_NUM_PEERS 2 | 41 | #define DEFAULT_NUM_PEERS 2 |
42 | 42 | ||
43 | /* test records to resolve */ | 43 | /* test records to resolve */ |
44 | #define TEST_DOMAIN_PLUS "www.gnunet" | 44 | #define TEST_DOMAIN_PLUS "www.gads" |
45 | #define TEST_DOMAIN_ZKEY "www2.gnunet" | 45 | #define TEST_DOMAIN_ZKEY "www2.gads" |
46 | #define TEST_DOMAIN_DNS "www3.gnunet" | 46 | #define TEST_DOMAIN_DNS "www3.gads" |
47 | #define TEST_IP_PLUS "127.0.0.1" | 47 | #define TEST_IP_PLUS "127.0.0.1" |
48 | #define TEST_IP_ZKEY "127.0.0.2" | 48 | #define TEST_IP_ZKEY "127.0.0.2" |
49 | #define TEST_IP_DNS "131.159.74.67" | 49 | #define TEST_IP_DNS "131.159.74.67" |
50 | #define TEST_RECORD_CNAME_SERVER "server.gnunet" | 50 | #define TEST_RECORD_CNAME_SERVER "server.gads" |
51 | #define TEST_RECORD_CNAME_PLUS "server.+" | 51 | #define TEST_RECORD_CNAME_PLUS "server.+" |
52 | #define TEST_RECORD_CNAME_ZKEY "www.188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey" | 52 | #define TEST_RECORD_CNAME_ZKEY "www.188JSUMKEF25GVU8TTV0PBNNN8JVCPUEDFV1UHJJU884JD25V0T0.zkey" |
53 | #define TEST_RECORD_CNAME_DNS "gnunet.org" | 53 | #define TEST_RECORD_CNAME_DNS "gnunet.org" |
diff --git a/src/gns/test_gns_dht_delegated_lookup.c b/src/gns/test_gns_dht_delegated_lookup.c index f7d7e27a9..0b5382fc8 100644 --- a/src/gns/test_gns_dht_delegated_lookup.c +++ b/src/gns/test_gns_dht_delegated_lookup.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #define DEFAULT_NUM_PEERS 2 | 46 | #define DEFAULT_NUM_PEERS 2 |
47 | 47 | ||
48 | /* test records to resolve */ | 48 | /* test records to resolve */ |
49 | #define TEST_DOMAIN "www.bob.gnunet" | 49 | #define TEST_DOMAIN "www.bob.gads" |
50 | #define TEST_IP "127.0.0.1" | 50 | #define TEST_IP "127.0.0.1" |
51 | #define TEST_RECORD_NAME "www" | 51 | #define TEST_RECORD_NAME "www" |
52 | 52 | ||
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c index 6f710646d..7f5012311 100644 --- a/src/gns/test_gns_dht_three_peers.c +++ b/src/gns/test_gns_dht_three_peers.c | |||
@@ -24,7 +24,7 @@ | |||
24 | * topology: | 24 | * topology: |
25 | * alice <----> bob <-----> dave | 25 | * alice <----> bob <-----> dave |
26 | * | 26 | * |
27 | * alice queries for www.buddy.bob.gnunet | 27 | * alice queries for www.buddy.bob.gads |
28 | * | 28 | * |
29 | */ | 29 | */ |
30 | #include "platform.h" | 30 | #include "platform.h" |
@@ -45,7 +45,7 @@ | |||
45 | /* If number of peers not in config file, use this number */ | 45 | /* If number of peers not in config file, use this number */ |
46 | #define DEFAULT_NUM_PEERS 2 | 46 | #define DEFAULT_NUM_PEERS 2 |
47 | 47 | ||
48 | #define TEST_DOMAIN "www.buddy.bob.gnunet" | 48 | #define TEST_DOMAIN "www.buddy.bob.gads" |
49 | #define TEST_IP "1.1.1.1" | 49 | #define TEST_IP "1.1.1.1" |
50 | #define TEST_DAVE_PSEU "hagbard" | 50 | #define TEST_DAVE_PSEU "hagbard" |
51 | #define TEST_NUM_PEERS 3 | 51 | #define TEST_NUM_PEERS 3 |
diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c index ac36873b0..0d3cf931f 100644 --- a/src/gns/test_gns_max_queries.c +++ b/src/gns/test_gns_max_queries.c | |||
@@ -42,8 +42,8 @@ | |||
42 | #define DEFAULT_NUM_PEERS 2 | 42 | #define DEFAULT_NUM_PEERS 2 |
43 | 43 | ||
44 | /* test records to resolve */ | 44 | /* test records to resolve */ |
45 | #define TEST_DOMAIN "www.gnunet" | 45 | #define TEST_DOMAIN "www.gads" |
46 | #define TEST_DOMAIN_NACK "doesnotexist.bob.gnunet" | 46 | #define TEST_DOMAIN_NACK "doesnotexist.bob.gads" |
47 | #define TEST_IP "127.0.0.1" | 47 | #define TEST_IP "127.0.0.1" |
48 | #define TEST_RECORD_NAME "www" | 48 | #define TEST_RECORD_NAME "www" |
49 | #define TEST_ADDITIONAL_LOOKUPS 5 | 49 | #define TEST_ADDITIONAL_LOOKUPS 5 |
@@ -201,7 +201,7 @@ commence_testing (void *cls, int32_t success, const char *emsg) | |||
201 | { | 201 | { |
202 | GNUNET_snprintf(lookup_name, | 202 | GNUNET_snprintf(lookup_name, |
203 | MAX_DNS_NAME_LENGTH, | 203 | MAX_DNS_NAME_LENGTH, |
204 | "www.doesnotexist-%d.bob.gnunet", i); | 204 | "www.doesnotexist-%d.bob.gads", i); |
205 | GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_A, | 205 | GNUNET_GNS_lookup(gns_handle, lookup_name, GNUNET_GNS_RECORD_A, |
206 | GNUNET_NO, | 206 | GNUNET_NO, |
207 | NULL, | 207 | NULL, |
diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c index 015d0d50d..45893a760 100644 --- a/src/gns/test_gns_ns_lookup.c +++ b/src/gns/test_gns_ns_lookup.c | |||
@@ -39,9 +39,9 @@ | |||
39 | #define DEFAULT_NUM_PEERS 2 | 39 | #define DEFAULT_NUM_PEERS 2 |
40 | 40 | ||
41 | /* test records to resolve */ | 41 | /* test records to resolve */ |
42 | #define TEST_DOMAIN "www.homepage.gnunet" | 42 | #define TEST_DOMAIN "www.homepage.gads" |
43 | #define TEST_DOMAIN_ALT "homepage.gnunet" | 43 | #define TEST_DOMAIN_ALT "homepage.gads" |
44 | #define TEST_DOMAIN_ALT2 "uk.homepage.gnunet" | 44 | #define TEST_DOMAIN_ALT2 "uk.homepage.gads" |
45 | #define TEST_IP_ALT2 "81.187.252.184" | 45 | #define TEST_IP_ALT2 "81.187.252.184" |
46 | #define TEST_IP "131.159.74.67" | 46 | #define TEST_IP "131.159.74.67" |
47 | #define TEST_IP_NS "216.69.185.1" //ns01.domaincontrol.com | 47 | #define TEST_IP_NS "216.69.185.1" //ns01.domaincontrol.com |
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c index 5f5491b7a..5e3d09d68 100644 --- a/src/gns/test_gns_proxy.c +++ b/src/gns/test_gns_proxy.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "gnunet_os_lib.h" | 32 | #include "gnunet_os_lib.h" |
33 | 33 | ||
34 | #define PORT 8080 | 34 | #define PORT 8080 |
35 | #define TEST_DOMAIN "www.gnunet" | 35 | #define TEST_DOMAIN "www.gads" |
36 | 36 | ||
37 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) | 37 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) |
38 | 38 | ||
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c index e45e4d01e..cae454047 100644 --- a/src/gns/test_gns_pseu_shorten.c +++ b/src/gns/test_gns_pseu_shorten.c | |||
@@ -43,7 +43,7 @@ | |||
43 | #define DEFAULT_NUM_PEERS 2 | 43 | #define DEFAULT_NUM_PEERS 2 |
44 | 44 | ||
45 | /* test records to resolve */ | 45 | /* test records to resolve */ |
46 | #define TEST_DOMAIN "www.alicewonderland.bobbuilder.gnunet" | 46 | #define TEST_DOMAIN "www.alicewonderland.bobbuilder.gads" |
47 | #define TEST_IP "127.0.0.1" | 47 | #define TEST_IP "127.0.0.1" |
48 | #define TEST_RECORD_NAME "www" | 48 | #define TEST_RECORD_NAME "www" |
49 | 49 | ||
@@ -52,7 +52,7 @@ | |||
52 | #define TEST_AUTHORITY_BOB "bobbuilder" | 52 | #define TEST_AUTHORITY_BOB "bobbuilder" |
53 | #define TEST_AUTHORITY_ALICE "alicewonderland" | 53 | #define TEST_AUTHORITY_ALICE "alicewonderland" |
54 | #define TEST_PSEU_ALICE "carol" | 54 | #define TEST_PSEU_ALICE "carol" |
55 | #define TEST_EXPECTED_RESULT "www.carol.short.private.gnunet" | 55 | #define TEST_EXPECTED_RESULT "www.carol.short.private.gads" |
56 | 56 | ||
57 | #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) | 57 | #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30) |
58 | 58 | ||
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c index 74b4be5d9..bc31d943d 100644 --- a/src/gns/test_gns_revocation.c +++ b/src/gns/test_gns_revocation.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #define DEFAULT_NUM_PEERS 2 | 42 | #define DEFAULT_NUM_PEERS 2 |
43 | 43 | ||
44 | /* test records to resolve */ | 44 | /* test records to resolve */ |
45 | #define TEST_DOMAIN "www.bob.gnunet" | 45 | #define TEST_DOMAIN "www.bob.gads" |
46 | #define TEST_IP "127.0.0.1" | 46 | #define TEST_IP "127.0.0.1" |
47 | #define TEST_RECORD_NAME "www" | 47 | #define TEST_RECORD_NAME "www" |
48 | 48 | ||
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c index b69255791..ab0395e62 100644 --- a/src/gns/test_gns_simple_delegated_lookup.c +++ b/src/gns/test_gns_simple_delegated_lookup.c | |||
@@ -56,7 +56,7 @@ | |||
56 | #define DEFAULT_NUM_PEERS 2 | 56 | #define DEFAULT_NUM_PEERS 2 |
57 | 57 | ||
58 | /* test records to resolve */ | 58 | /* test records to resolve */ |
59 | #define TEST_DOMAIN "www.bob.gnunet" | 59 | #define TEST_DOMAIN "www.bob.gads" |
60 | #define TEST_IP "127.0.0.1" | 60 | #define TEST_IP "127.0.0.1" |
61 | #define TEST_RECORD_NAME "www" | 61 | #define TEST_RECORD_NAME "www" |
62 | 62 | ||
diff --git a/src/gns/test_gns_simple_get_authority.c b/src/gns/test_gns_simple_get_authority.c index 9f16265b2..a2605fbae 100644 --- a/src/gns/test_gns_simple_get_authority.c +++ b/src/gns/test_gns_simple_get_authority.c | |||
@@ -42,14 +42,14 @@ | |||
42 | #define DEFAULT_NUM_PEERS 2 | 42 | #define DEFAULT_NUM_PEERS 2 |
43 | 43 | ||
44 | /* test records to resolve */ | 44 | /* test records to resolve */ |
45 | #define TEST_DOMAIN "www.alice.bob.gnunet" | 45 | #define TEST_DOMAIN "www.alice.bob.gads" |
46 | #define TEST_IP "127.0.0.1" | 46 | #define TEST_IP "127.0.0.1" |
47 | #define TEST_RECORD_NAME "www" | 47 | #define TEST_RECORD_NAME "www" |
48 | 48 | ||
49 | #define TEST_AUTHORITY_BOB "bob" | 49 | #define TEST_AUTHORITY_BOB "bob" |
50 | #define TEST_AUTHORITY_ALICE "alice" | 50 | #define TEST_AUTHORITY_ALICE "alice" |
51 | #define TEST_ALICE_PSEU "carol" | 51 | #define TEST_ALICE_PSEU "carol" |
52 | #define TEST_EXPECTED_RESULT "alice.bob.gnunet" | 52 | #define TEST_EXPECTED_RESULT "alice.bob.gads" |
53 | 53 | ||
54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | 54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" |
55 | #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" | 55 | #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" |
diff --git a/src/gns/test_gns_simple_lookup.c b/src/gns/test_gns_simple_lookup.c index 1e0326328..97cb2b3f5 100644 --- a/src/gns/test_gns_simple_lookup.c +++ b/src/gns/test_gns_simple_lookup.c | |||
@@ -41,7 +41,7 @@ | |||
41 | #define DEFAULT_NUM_PEERS 2 | 41 | #define DEFAULT_NUM_PEERS 2 |
42 | 42 | ||
43 | /* test records to resolve */ | 43 | /* test records to resolve */ |
44 | #define TEST_DOMAIN "www.gnunet" | 44 | #define TEST_DOMAIN "www.gads" |
45 | #define TEST_IP "127.0.0.1" | 45 | #define TEST_IP "127.0.0.1" |
46 | #define TEST_RECORD_NAME "www" | 46 | #define TEST_RECORD_NAME "www" |
47 | 47 | ||
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c index d0c5b5d7d..03e4f867f 100644 --- a/src/gns/test_gns_simple_mx_lookup.c +++ b/src/gns/test_gns_simple_mx_lookup.c | |||
@@ -42,11 +42,11 @@ | |||
42 | #define DEFAULT_NUM_PEERS 2 | 42 | #define DEFAULT_NUM_PEERS 2 |
43 | 43 | ||
44 | /* test records to resolve */ | 44 | /* test records to resolve */ |
45 | #define TEST_DOMAIN "bob.gnunet" | 45 | #define TEST_DOMAIN "bob.gads" |
46 | #define TEST_IP "127.0.0.1" | 46 | #define TEST_IP "127.0.0.1" |
47 | #define TEST_RECORD_NAME "mail" | 47 | #define TEST_RECORD_NAME "mail" |
48 | #define TEST_MX_NAME "mail.+" | 48 | #define TEST_MX_NAME "mail.+" |
49 | #define TEST_EXPECTED_MX "mail.bob.gnunet" | 49 | #define TEST_EXPECTED_MX "mail.bob.gads" |
50 | 50 | ||
51 | #define TEST_AUTHORITY_NAME "bob" | 51 | #define TEST_AUTHORITY_NAME "bob" |
52 | 52 | ||
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c index 789ba5386..fb02d223e 100644 --- a/src/gns/test_gns_simple_shorten.c +++ b/src/gns/test_gns_simple_shorten.c | |||
@@ -42,14 +42,14 @@ | |||
42 | #define DEFAULT_NUM_PEERS 2 | 42 | #define DEFAULT_NUM_PEERS 2 |
43 | 43 | ||
44 | /* test records to resolve */ | 44 | /* test records to resolve */ |
45 | #define TEST_DOMAIN "www.alice.bob.gnunet" | 45 | #define TEST_DOMAIN "www.alice.bob.gads" |
46 | #define TEST_IP "127.0.0.1" | 46 | #define TEST_IP "127.0.0.1" |
47 | #define TEST_RECORD_NAME "www" | 47 | #define TEST_RECORD_NAME "www" |
48 | 48 | ||
49 | #define TEST_AUTHORITY_BOB "bob" | 49 | #define TEST_AUTHORITY_BOB "bob" |
50 | #define TEST_AUTHORITY_ALICE "alice" | 50 | #define TEST_AUTHORITY_ALICE "alice" |
51 | #define TEST_ALICE_PSEU "carol" | 51 | #define TEST_ALICE_PSEU "carol" |
52 | #define TEST_EXPECTED_RESULT "www.carol.gnunet" | 52 | #define TEST_EXPECTED_RESULT "www.carol.gads" |
53 | 53 | ||
54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" | 54 | #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey" |
55 | #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" | 55 | #define KEYFILE_ALICE "../namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey" |
diff --git a/src/gns/test_gns_simple_srv_lookup.c b/src/gns/test_gns_simple_srv_lookup.c index fd3feacdf..ea1673759 100644 --- a/src/gns/test_gns_simple_srv_lookup.c +++ b/src/gns/test_gns_simple_srv_lookup.c | |||
@@ -43,12 +43,12 @@ | |||
43 | #define DEFAULT_NUM_PEERS 2 | 43 | #define DEFAULT_NUM_PEERS 2 |
44 | 44 | ||
45 | /* test records to resolve */ | 45 | /* test records to resolve */ |
46 | #define TEST_DOMAIN "_sip._tcp.bob.gnunet" | 46 | #define TEST_DOMAIN "_sip._tcp.bob.gads" |
47 | #define TEST_IP "127.0.0.1" | 47 | #define TEST_IP "127.0.0.1" |
48 | #define TEST_RECORD_NAME "sipserver" | 48 | #define TEST_RECORD_NAME "sipserver" |
49 | #define TEST_RECORD_NAME_SRV "_sip._tcp" | 49 | #define TEST_RECORD_NAME_SRV "_sip._tcp" |
50 | #define TEST_SRV_NAME "sipserver.+" | 50 | #define TEST_SRV_NAME "sipserver.+" |
51 | #define TEST_EXPECTED_SRV "sipserver.bob.gnunet" | 51 | #define TEST_EXPECTED_SRV "sipserver.bob.gads" |
52 | 52 | ||
53 | #define TEST_AUTHORITY_NAME "bob" | 53 | #define TEST_AUTHORITY_NAME "bob" |
54 | 54 | ||