[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20276 - in gnunet/src: gns include namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20276 - in gnunet/src: gns include namestore |
Date: |
Mon, 5 Mar 2012 14:13:21 +0100 |
Author: grothoff
Date: 2012-03-05 14:13:21 +0100 (Mon, 05 Mar 2012)
New Revision: 20276
Modified:
gnunet/src/gns/gnunet-gns-fcfsd.c
gnunet/src/include/gnunet_gns_service.h
gnunet/src/include/gnunet_namestore_service.h
gnunet/src/namestore/gnunet-namestore.c
gnunet/src/namestore/namestore_api.c
gnunet/src/namestore/plugin_namestore_sqlite.c
Log:
-more renaming
Modified: gnunet/src/gns/gnunet-gns-fcfsd.c
===================================================================
--- gnunet/src/gns/gnunet-gns-fcfsd.c 2012-03-05 13:09:23 UTC (rev 20275)
+++ gnunet/src/gns/gnunet-gns-fcfsd.c 2012-03-05 13:13:21 UTC (rev 20276)
@@ -388,7 +388,7 @@
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 @@
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;
Modified: gnunet/src/include/gnunet_gns_service.h
===================================================================
--- gnunet/src/include/gnunet_gns_service.h 2012-03-05 13:09:23 UTC (rev
20275)
+++ gnunet/src/include/gnunet_gns_service.h 2012-03-05 13:13:21 UTC (rev
20276)
@@ -62,17 +62,18 @@
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
};
/**
Modified: gnunet/src/include/gnunet_namestore_service.h
===================================================================
--- gnunet/src/include/gnunet_namestore_service.h 2012-03-05 13:09:23 UTC
(rev 20275)
+++ gnunet/src/include/gnunet_namestore_service.h 2012-03-05 13:13:21 UTC
(rev 20276)
@@ -46,12 +46,12 @@
/**
* 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.
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2012-03-05 13:09:23 UTC (rev
20275)
+++ gnunet/src/namestore/gnunet-namestore.c 2012-03-05 13:13:21 UTC (rev
20276)
@@ -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 @@
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 @@
/**
- * 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 @@
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 */
Modified: gnunet/src/namestore/namestore_api.c
===================================================================
--- gnunet/src/namestore/namestore_api.c 2012-03-05 13:09:23 UTC (rev
20275)
+++ gnunet/src/namestore/namestore_api.c 2012-03-05 13:13:21 UTC (rev
20276)
@@ -223,8 +223,8 @@
{ "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;
Modified: gnunet/src/namestore/plugin_namestore_sqlite.c
===================================================================
--- gnunet/src/namestore/plugin_namestore_sqlite.c 2012-03-05 13:09:23 UTC
(rev 20275)
+++ gnunet/src/namestore/plugin_namestore_sqlite.c 2012-03-05 13:13:21 UTC
(rev 20276)
@@ -480,7 +480,7 @@
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,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20276 - in gnunet/src: gns include namestore,
gnunet <=