-gads to gnu

21 files changed, 41 insertions, 41 deletions

diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index fc78a5050..dcba31495 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -436,7 +436,7 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
       }
       else
       { 
-        /* try '.gads' name */
+        /* try '.gnu' name */
         GNUNET_asprintf (&nname, 
                          "%s.%s", 
                          name, 
diff --git a/src/gns/gnunet-service-gns_interceptor.c b/src/gns/gnunet-service-gns_interceptor.c
index 6097c8611..677350735 100644
--- a/src/gns/gnunet-service-gns_interceptor.c
+++ b/src/gns/gnunet-service-gns_interceptor.c
@@ -253,7 +253,7 @@ handle_dns_request (void *cls,
   }
 
   /* Check for GNS TLDs. */ 
-  if ( (GNUNET_YES == is_gads_tld (p->queries[0].name)) ||
+  if ( (GNUNET_YES == is_gnu_tld (p->queries[0].name)) ||
        (GNUNET_YES == is_zkey_tld (p->queries[0].name)) ||
        (0 == strcmp (p->queries[0].name, GNUNET_GNS_TLD)) )
   {
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 327986415..d357a1312 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -489,7 +489,7 @@ is_srv (const char *name)
  * even though they consist of multiple labels.
  *
  * Examples:
- * a.b.gads  = not canonical
+ * a.b.gnu  = not canonical
  * a         = canonical
  * _foo._srv = canonical
  * _f.bar    = not canonical
@@ -1455,7 +1455,7 @@ process_pkey_revocation_result_ns (void *cls,
     {
       GNUNET_log(GNUNET_ERROR_TYPE_DEBUG,
         "GNS_PHASE_DELEGATE_REV-%llu: Starting background lookup for %s type %d\n",
-        rh->id, "+.gads", GNUNET_NAMESTORE_TYPE_REV);
+        rh->id, "+.gnu", GNUNET_NAMESTORE_TYPE_REV);
 
       gns_resolver_lookup_record(rh->authority,
                                  rh->private_local_zone,
@@ -3199,7 +3199,7 @@ GNS_resolver_lookup (const struct GNUNET_CRYPTO_EccPublicKey *zone,
 
   if ( ( (GNUNET_YES == is_canonical (name)) &&
          (0 != strcmp (GNUNET_GNS_TLD, name)) ) ||
-       ( (GNUNET_YES != is_gads_tld (name)) &&
+       ( (GNUNET_YES != is_gnu_tld (name)) &&
          (GNUNET_YES != is_zkey_tld (name)) ) )
   {
     /* use standard DNS lookup */
diff --git a/src/gns/gnunet-service-gns_resolver.h b/src/gns/gnunet-service-gns_resolver.h
index 47942e57b..877c7ecd0 100644
--- a/src/gns/gnunet-service-gns_resolver.h
+++ b/src/gns/gnunet-service-gns_resolver.h
@@ -119,7 +119,7 @@ is_tld (const char *name,
 /**
  * Checks for gnu/zkey
  */
-#define is_gads_tld(name) is_tld(name, GNUNET_GNS_TLD)
+#define is_gnu_tld(name) is_tld(name, GNUNET_GNS_TLD)
 #define is_zkey_tld(name) is_tld(name, GNUNET_GNS_TLD_ZKEY)
 
 
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index ce9dcf34d..29dbfd87b 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -61,13 +61,13 @@ static int ends_with(const char *name, const char* suffix) {
 
 
 /**
- * Check if name is inside .gads or .zkey TLD
+ * Check if name is inside .gnu or .zkey TLD
  *
  * @param name name to check
  * @return 1 if true
  */
-static int verify_name_allowed(const char *name) {
-    return ends_with(name, ".gads") || ends_with(name, ".zkey"); 
+static int verify_name_allowed (const char *name) {
+  return ends_with(name, ".gnu") || ends_with(name, ".zkey"); 
 }
 
 /**
diff --git a/src/gns/test_gns_cname_lookup.c b/src/gns/test_gns_cname_lookup.c
index 58f0e1c9e..cadb4e989 100644
--- a/src/gns/test_gns_cname_lookup.c
+++ b/src/gns/test_gns_cname_lookup.c
@@ -38,13 +38,13 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN_PLUS "www.gads"
-#define TEST_DOMAIN_ZKEY "www2.gads"
-#define TEST_DOMAIN_DNS  "www3.gads"
+#define TEST_DOMAIN_PLUS "www.gnu"
+#define TEST_DOMAIN_ZKEY "www2.gnu"
+#define TEST_DOMAIN_DNS  "www3.gnu"
 #define TEST_IP_PLUS "127.0.0.1"
 #define TEST_IP_ZKEY "127.0.0.2"
 #define TEST_IP_DNS  "131.159.74.67"
-#define TEST_RECORD_CNAME_SERVER "server.gads"
+#define TEST_RECORD_CNAME_SERVER "server.gnu"
 #define TEST_RECORD_CNAME_PLUS "server.+"
 #define TEST_RECORD_CNAME_ZKEY "www.J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey"
 #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 104c6e01d..0f499e6b1 100644
--- a/src/gns/test_gns_dht_delegated_lookup.c
+++ b/src/gns/test_gns_dht_delegated_lookup.c
@@ -40,7 +40,7 @@
 #define DHT_DELAY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.bob.gads"
+#define TEST_DOMAIN "www.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
diff --git a/src/gns/test_gns_dht_three_peers.c b/src/gns/test_gns_dht_three_peers.c
index 968889b0d..d9e1b76ca 100644
--- a/src/gns/test_gns_dht_three_peers.c
+++ b/src/gns/test_gns_dht_three_peers.c
@@ -24,7 +24,7 @@
  * topology:
  * alice <----> bob <-----> dave
  *
- * alice queries for www.buddy.bob.gads
+ * alice queries for www.buddy.bob.gnu
  *
  */
 #include "platform.h"
@@ -42,7 +42,7 @@
 
 #define ZONE_PUT_WAIT_TIME GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 10)
 
-#define TEST_DOMAIN "www.buddy.bob.gads"
+#define TEST_DOMAIN "www.buddy.bob.gnu"
 #define TEST_IP "1.1.1.1"
 #define TEST_DAVE_PSEU "hagbard"
 
diff --git a/src/gns/test_gns_max_queries.c b/src/gns/test_gns_max_queries.c
index c63495ca3..131d8cf86 100644
--- a/src/gns/test_gns_max_queries.c
+++ b/src/gns/test_gns_max_queries.c
@@ -37,8 +37,8 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.gads"
-#define TEST_DOMAIN_NACK "doesnotexist.bob.gads"
+#define TEST_DOMAIN "www.gnu"
+#define TEST_DOMAIN_NACK "doesnotexist.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 #define TEST_ADDITIONAL_LOOKUPS 5
@@ -230,7 +230,7 @@ commence_testing (void *cls, int32_t success, const char *emsg)
   {
     GNUNET_snprintf(lookup_name,
                     GNUNET_DNSPARSER_MAX_NAME_LENGTH,
-                    "www.doesnotexist-%d.bob.gads", i);
+                    "www.doesnotexist-%d.bob.gnu", i);
     lr = GNUNET_GNS_lookup (gns_handle, lookup_name, GNUNET_DNSPARSER_TYPE_A,
                             GNUNET_NO,
                             NULL,
diff --git a/src/gns/test_gns_ns_lookup.c b/src/gns/test_gns_ns_lookup.c
index 77398b3de..6a150e86a 100644
--- a/src/gns/test_gns_ns_lookup.c
+++ b/src/gns/test_gns_ns_lookup.c
@@ -38,25 +38,25 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN "www.homepage.gads"
+#define TEST_DOMAIN "www.homepage.gnu"
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN_ALT "homepage.gads"
+#define TEST_DOMAIN_ALT "homepage.gnu"
 
 /**
- * Name to resolve for testing.  NS record on 'homepage.gads' redirects to
+ * Name to resolve for testing.  NS record on 'homepage.gnu' redirects to
  * DNS 'TEST_RECORD_NS' domain and thus names should be resolved within
  * that target domain.
  */
-#define TEST_DOMAIN_ALT2 "uk.homepage.gads"
+#define TEST_DOMAIN_ALT2 "uk.homepage.gnu"
 
 /**
  * Expected test value (matching TEST_DOMAIN_ALT2).
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index d9c660c86..bf31b3647 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -32,7 +32,7 @@
 #include "gnunet_os_lib.h"
 
 #define PORT 8080
-#define TEST_DOMAIN "www.gads"
+#define TEST_DOMAIN "www.gnu"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
diff --git a/src/gns/test_gns_pseu_shorten.c b/src/gns/test_gns_pseu_shorten.c
index c6724ab05..c1fe64cb6 100644
--- a/src/gns/test_gns_pseu_shorten.c
+++ b/src/gns/test_gns_pseu_shorten.c
@@ -37,7 +37,7 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 30)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.alicewonderland.bobbuilder.gads"
+#define TEST_DOMAIN "www.alicewonderland.bobbuilder.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
@@ -46,7 +46,7 @@
 #define TEST_AUTHORITY_BOB "bobbuilder"
 #define TEST_AUTHORITY_ALICE "alicewonderland"
 #define TEST_PSEU_ALICE "carol"
-#define TEST_EXPECTED_RESULT "www.carol.short.private.gads"
+#define TEST_EXPECTED_RESULT "www.carol.short.private.gnu"
 
 #define DHT_OPERATION_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
diff --git a/src/gns/test_gns_revocation.c b/src/gns/test_gns_revocation.c
index 85da4a09a..2574dec28 100644
--- a/src/gns/test_gns_revocation.c
+++ b/src/gns/test_gns_revocation.c
@@ -36,7 +36,7 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.bob.gads"
+#define TEST_DOMAIN "www.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
diff --git a/src/gns/test_gns_simple_delegated_lookup.c b/src/gns/test_gns_simple_delegated_lookup.c
index 522b74d29..a57a2b5a7 100644
--- a/src/gns/test_gns_simple_delegated_lookup.c
+++ b/src/gns/test_gns_simple_delegated_lookup.c
@@ -50,7 +50,7 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.bob.gads"
+#define TEST_DOMAIN "www.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
diff --git a/src/gns/test_gns_simple_lookup.c b/src/gns/test_gns_simple_lookup.c
index 471e6843a..c8e7e3758 100644
--- a/src/gns/test_gns_simple_lookup.c
+++ b/src/gns/test_gns_simple_lookup.c
@@ -38,7 +38,7 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 120)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.gads"
+#define TEST_DOMAIN "www.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
diff --git a/src/gns/test_gns_simple_mx_lookup.c b/src/gns/test_gns_simple_mx_lookup.c
index a6839e549..7b57aeb6c 100644
--- a/src/gns/test_gns_simple_mx_lookup.c
+++ b/src/gns/test_gns_simple_mx_lookup.c
@@ -36,11 +36,11 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "bob.gads"
+#define TEST_DOMAIN "bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "mail"
 #define TEST_MX_NAME "mail.+"
-#define TEST_EXPECTED_MX "mail.bob.gads"
+#define TEST_EXPECTED_MX "mail.bob.gnu"
 
 #define TEST_AUTHORITY_NAME "bob"
 
diff --git a/src/gns/test_gns_simple_shorten.c b/src/gns/test_gns_simple_shorten.c
index ab8129254..87348f9f4 100644
--- a/src/gns/test_gns_simple_shorten.c
+++ b/src/gns/test_gns_simple_shorten.c
@@ -36,14 +36,14 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "www.alice.bob.gads"
+#define TEST_DOMAIN "www.alice.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "www"
 
 #define TEST_AUTHORITY_BOB "bob"
 #define TEST_AUTHORITY_ALICE "alice"
 #define TEST_ALICE_PSEU "carol"
-#define TEST_EXPECTED_RESULT "www.carol.gads"
+#define TEST_EXPECTED_RESULT "www.carol.gnu"
 
 #define KEYFILE_BOB "../namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey"
 #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 d9de98af8..024d7fb31 100644
--- a/src/gns/test_gns_simple_srv_lookup.c
+++ b/src/gns/test_gns_simple_srv_lookup.c
@@ -37,12 +37,12 @@
 #define TIMEOUT GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 20)
 
 /* test records to resolve */
-#define TEST_DOMAIN "_sip._tcp.bob.gads"
+#define TEST_DOMAIN "_sip._tcp.bob.gnu"
 #define TEST_IP "127.0.0.1"
 #define TEST_RECORD_NAME "sipserver"
 #define TEST_RECORD_NAME_SRV "_sip._tcp"
 #define TEST_SRV_NAME "sipserver.+"
-#define TEST_EXPECTED_SRV "sipserver.bob.gads"
+#define TEST_EXPECTED_SRV "sipserver.bob.gnu"
 
 #define TEST_AUTHORITY_NAME "bob"
 
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c
index c2062637f..79609eb5a 100644
--- a/src/gns/w32nsp.c
+++ b/src/gns/w32nsp.c
@@ -340,7 +340,7 @@ GNUNET_W32NSP_LookupServiceBegin (LPGUID lpProviderId, LPWSAQUERYSETW lpqsRestri
       if (len >= 4 && wcscmp (&s[len - 4], L"zkey") == 0)
       {
       }
-      else if (len >= 4 && wcscmp (&s[len - 4], L"gads") == 0)
+      else if (len >= 4 && wcscmp (&s[len - 4], L"gnu") == 0)
       {
       }
       else
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 428f2f081..b3a5ca236 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -402,7 +402,7 @@ GNUNET_SOCIAL_home_leave (struct GNUNET_SOCIAL_Home *home);
  * @param cfg Configuration to contact the social service.
  * @param ego Owner of the home (host).
  * @param address GADS name of the place to enter.  Either in the form of
- *        'room.friend.gads', or 'NYMPUBKEY.zkey'.  This latter case refers to
+ *        'room.friend.gnu', or 'NYMPUBKEY.zkey'.  This latter case refers to
  *        the 'PLACE' record of the empty label ("+") in the GADS zone with the
  *        nym's public key 'NYMPUBKEY', and can be used to request entry to a
  *        pseudonym's place directly.
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 0be066317..1eeb1ec59 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -31,7 +31,7 @@
 #include "gnunet_testing_lib.h"
 
 #define PORT 8080
-#define TEST_DOMAIN "www.gads"
+#define TEST_DOMAIN "www.gnu"
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300)
 
@@ -394,7 +394,7 @@ run (void *cls,
 
   host_key = GNUNET_CRYPTO_ecc_key_create_from_file (zone_keyfile);
   rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
-  GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gads.");
+  GNUNET_asprintf (&rd_string, "6 %s %s", (char*)&peername, "www.gnu.");
   GNUNET_assert (GNUNET_OK == GNUNET_NAMESTORE_string_to_value (GNUNET_NAMESTORE_TYPE_VPN,
                                                                rd_string,
                                                                (void**)&rd.data,