-more renaming

diff --git a/src/gns/gnunet-gns-fcfsd.c b/src/gns/gnunet-gns-fcfsd.c
index fcb229c6994eb9f7e8bf6c827bc3e55512e58327..178772089e2ed438fab4ad0a3287c9922410b97e 100644 (file)
--- a/src/gns/gnunet-gns-fcfsd.c
+++ b/src/gns/gnunet-gns-fcfsd.c
@@ -388,7 +388,7 @@ lookup_result_processor (void *cls,
   r.data = &pub;
   r.data_size = sizeof (pub);
   r.expiration = GNUNET_TIME_UNIT_FOREVER_ABS;
-  r.record_type = htonl (GNUNET_GNS_TYPE_PKEY);
+  r.record_type = htonl (GNUNET_NAMESTORE_TYPE_PKEY);
   r.flags = htonl (GNUNET_NAMESTORE_RF_AUTHORITY);
   request->qe = GNUNET_NAMESTORE_record_create (ns,
                                                fcfs_zone_pkey,
@@ -496,7 +496,7 @@ create_response (void *cls,
          request->qe = GNUNET_NAMESTORE_lookup_record (ns,
                                                        &fcfsd_zone,
                                                        request->domain_name,
-                                                       GNUNET_GNS_TYPE_PKEY,
+                                                       GNUNET_NAMESTORE_TYPE_PKEY,
                                                        &lookup_result_processor,
                                                        request);
          break;

diff --git a/src/include/gnunet_gns_service.h b/src/include/gnunet_gns_service.h
index f7bfc2aa76f55c148e0f22742faf18cc4deb416e..70931b85da0a004f4853efb1ecfc46e58d0aa1dd 100644 (file)
--- a/src/include/gnunet_gns_service.h
+++ b/src/include/gnunet_gns_service.h
@@ -62,17 +62,18 @@ struct GNUNET_GNS_LookupHandle;
 enum GNUNET_GNS_RecordType
 {
   /* Standard DNS */
-  GNUNET_GNS_RECORD_TYPE_A = 1,
-  GNUNET_GNS_RECORD_TYPE_NS = 2,
-  GNUNET_GNS_RECORD_TYPE_CNAME = 5,
-  GNUNET_GNS_RECORD_TYPE_SOA = 6,
-  GNUNET_GNS_RECORD_TYPE_PTR = 12,
-  GNUNET_GNS_RECORD_MX = 15,
-  GNUNET_GNS_RECORD_TXT = 16,
-  GNUNET_GNS_RECORD_AAAA = 28,
+  GNUNET_GNS_RECORD_TYPE_A = GNUNET_DNSPARSER_TYPE_A,
+  GNUNET_GNS_RECORD_TYPE_NS = GNUNET_DNSPARSER_TYPE_NS,
+  GNUNET_GNS_RECORD_TYPE_CNAME = GNUNET_DNSPARSER_TYPE_CNAME,
+  GNUNET_GNS_RECORD_TYPE_SOA = GNUNET_DNSPARSER_TYPE_SOA,
+  GNUNET_GNS_RECORD_TYPE_PTR = GNUNET_DNSPARSER_TYPE_PTR,
+  GNUNET_GNS_RECORD_MX = GNUNET_DNSPARSER_TYPE_MX,
+  GNUNET_GNS_RECORD_TXT = GNUNET_DNSPARSER_TYPE_TXT,
+  GNUNET_GNS_RECORD_AAAA = GNUNET_DNSPARSER_TYPE_AAAA,
 
   /* GNS specific */
-  GNUNET_GNS_RECORD_PKEY = 256
+  GNUNET_GNS_RECORD_PKEY = GNUNET_NAMESTORE_TYPE_PKEY,
+  GNUNET_GNS_RECORD_PSEU = GNUNET_NAMESTORE_TYPE_PSEU
 };
 
 /**

diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h
index f3ea765fde2c3f617e9d54f0fc55f1fbc1e01fad..a50243d093a806a276f852a536ae19f5bcc87f17 100644 (file)
--- a/src/include/gnunet_namestore_service.h
+++ b/src/include/gnunet_namestore_service.h
@@ -46,12 +46,12 @@ extern "C"
 /**
  * Record type for GNS zone transfer ("PKEY").
  */
-#define GNUNET_GNS_TYPE_PKEY 65536
+#define GNUNET_NAMESTORE_TYPE_PKEY 65536
 
 /**
  * Record type for GNS zone transfer ("PSEU").
  */
-#define GNUNET_GNS_TYPE_PSEU 65537
+#define GNUNET_NAMESTORE_TYPE_PSEU 65537
 
 /**
  * Entry in the queue.

diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index a6b45586b434fe2a14a0b7f76262c6c6625483c8..3e1ad4ea0df6d400531f3fbd57e885c20272c290 100644 (file)
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -18,7 +18,7 @@
      Boston, MA 02111-1307, USA.
 */
 /**
- * @file gnunet-gns.c
+ * @file gnunet-namestore.c
  * @brief command line tool to manipulate the local zone
  * @author Christian Grothoff
  *
@@ -28,8 +28,6 @@
  * - test
  * - parsing SOA, PTR and MX value specifications (and define format!)
  * - add options to list/lookup individual records
- * - add option to shorten name (lookup PKEY, then lookup name by zone,
- *   then possibly lookup PSEU for the zone and update our zone)
  */
 #include "platform.h"
 #include <gnunet_util_lib.h>
@@ -353,11 +351,11 @@ run (void *cls, char *const *args, const char *cfgfile,
       data = &value_aaaa;
       data_size = sizeof (value_aaaa);
       break;
-    case GNUNET_GNS_TYPE_PKEY:
+    case GNUNET_NAMESTORE_TYPE_PKEY:
       fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
       GNUNET_SCHEDULER_shutdown ();
       return;
-    case GNUNET_GNS_TYPE_PSEU:
+    case GNUNET_NAMESTORE_TYPE_PSEU:
       data = value;
       data_size = strlen (value);
       break;
@@ -448,7 +446,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 
 /**
- * The main function for gnunet-gns.
+ * The main function for gnunet-namestore.
  *
  * @param argc number of arguments from the command line
  * @param argv command line arguments
@@ -487,15 +485,15 @@ main (int argc, char *const *argv)
 
   int ret;
 
-  GNUNET_log_setup ("gnunet-gns", "WARNING", NULL);
+  GNUNET_log_setup ("gnunet-namestore", "WARNING", NULL);
   ret =
       (GNUNET_OK ==
-       GNUNET_PROGRAM_run (argc, argv, "gnunet-gns",
-                           _("GNUnet GNS zone manipulation tool"), 
+       GNUNET_PROGRAM_run (argc, argv, "gnunet-namestore",
+                           _("GNUnet zone manipulation tool"), 
                           options,
                            &run, NULL)) ? 0 : 1;
 
   return ret;
 }
 
-/* end of gnunet-gns.c */
+/* end of gnunet-namestore.c */

diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 7d42b68e4030172cd1cd6436140992f70623e0a8..7e9a5f7ac2d2ff23d930f13f787fbd1497605e00 100644 (file)
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -223,8 +223,8 @@ GNUNET_NAMESTORE_typename_to_number (const char *typename)
     { "MX", GNUNET_DNSPARSER_TYPE_MX },
     { "TXT", GNUNET_DNSPARSER_TYPE_TXT },
     { "AAAA", GNUNET_DNSPARSER_TYPE_AAAA },
-    { "PKEY",  GNUNET_GNS_TYPE_PKEY },
-    { "PSEU",  GNUNET_GNS_TYPE_PSEU },
+    { "PKEY",  GNUNET_NAMESTORE_TYPE_PKEY },
+    { "PSEU",  GNUNET_NAMESTORE_TYPE_PSEU },
     { NULL, UINT32_MAX }
   };
   unsigned int i;

diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 5dc52bcfc4362f7e96a6eca23bc60d1e6234b8c2..ec81f7d00d44cf23f091688163c4b3819895caf0 100644 (file)
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -480,7 +480,7 @@ namestore_sqlite_put_records (void *cls,
   GNUNET_CRYPTO_hash (name, name_len, &nh);
   memset (&zone_delegation, 0, sizeof (zone_delegation));
   for (i=0;i<rd_count;i++)
-    if (rd->record_type == GNUNET_GNS_TYPE_PKEY)
+    if (rd->record_type == GNUNET_NAMESTORE_TYPE_PKEY)
     {
       GNUNET_assert (sizeof (GNUNET_HashCode) == rd->data_size);
       memcpy (&zone_delegation,