[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30665 - in gnunet/src: gns include namestore
From: |
gnunet |
Subject: |
[GNUnet-SVN] r30665 - in gnunet/src: gns include namestore |
Date: |
Wed, 13 Nov 2013 10:31:07 +0100 |
Author: wachs
Date: 2013-11-13 10:31:07 +0100 (Wed, 13 Nov 2013)
New Revision: 30665
Modified:
gnunet/src/gns/gnunet-service-gns_shorten.c
gnunet/src/gns/plugin_gnsrecord_gns.c
gnunet/src/include/gnunet_gnsrecord_lib.h
gnunet/src/namestore/gnunet-namestore.c
Log:
renaming PSEU to NICK
gnunet-namestore can set nick name in namestore
Modified: gnunet/src/gns/gnunet-service-gns_shorten.c
===================================================================
--- gnunet/src/gns/gnunet-service-gns_shorten.c 2013-11-12 13:06:12 UTC (rev
30664)
+++ gnunet/src/gns/gnunet-service-gns_shorten.c 2013-11-13 09:31:07 UTC (rev
30665)
@@ -380,7 +380,7 @@
for (i=0; i < rd_count; i++)
{
- if (GNUNET_GNSRECORD_TYPE_PSEU == rd[i].record_type)
+ if (GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type)
{
char pseu[rd[i].data_size + 1];
Modified: gnunet/src/gns/plugin_gnsrecord_gns.c
===================================================================
--- gnunet/src/gns/plugin_gnsrecord_gns.c 2013-11-12 13:06:12 UTC (rev
30664)
+++ gnunet/src/gns/plugin_gnsrecord_gns.c 2013-11-13 09:31:07 UTC (rev
30665)
@@ -57,7 +57,7 @@
if (data_size != sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey))
return NULL;
return GNUNET_CRYPTO_ecdsa_public_key_to_string (data);
- case GNUNET_GNSRECORD_TYPE_PSEU:
+ case GNUNET_GNSRECORD_TYPE_NICK:
return GNUNET_strndup (data, data_size);
case GNUNET_GNSRECORD_TYPE_LEHO:
return GNUNET_strndup (data, data_size);
@@ -157,7 +157,7 @@
*data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
return GNUNET_OK;
- case GNUNET_GNSRECORD_TYPE_PSEU:
+ case GNUNET_GNSRECORD_TYPE_NICK:
*data = GNUNET_strdup (s);
*data_size = strlen (s);
return GNUNET_OK;
@@ -246,7 +246,7 @@
uint32_t number;
} name_map[] = {
{ "PKEY", GNUNET_GNSRECORD_TYPE_PKEY },
- { "PSEU", GNUNET_GNSRECORD_TYPE_PSEU },
+ { "NICK", GNUNET_GNSRECORD_TYPE_NICK },
{ "LEHO", GNUNET_GNSRECORD_TYPE_LEHO },
{ "VPN", GNUNET_GNSRECORD_TYPE_VPN },
{ "GNS2DNS", GNUNET_GNSRECORD_TYPE_GNS2DNS },
Modified: gnunet/src/include/gnunet_gnsrecord_lib.h
===================================================================
--- gnunet/src/include/gnunet_gnsrecord_lib.h 2013-11-12 13:06:12 UTC (rev
30664)
+++ gnunet/src/include/gnunet_gnsrecord_lib.h 2013-11-13 09:31:07 UTC (rev
30665)
@@ -51,9 +51,9 @@
#define GNUNET_GNSRECORD_TYPE_PKEY 65536
/**
- * Record type for GNS zone transfer ("PSEU").
+ * Record type for GNS nick names ("NICK").
*/
-#define GNUNET_GNSRECORD_TYPE_PSEU 65537
+#define GNUNET_GNSRECORD_TYPE_NICK 65537
/**
* Record type for GNS legacy hostnames ("LEHO").
Modified: gnunet/src/namestore/gnunet-namestore.c
===================================================================
--- gnunet/src/namestore/gnunet-namestore.c 2013-11-12 13:06:12 UTC (rev
30664)
+++ gnunet/src/namestore/gnunet-namestore.c 2013-11-13 09:31:07 UTC (rev
30665)
@@ -135,6 +135,11 @@
static char *expirationstring;
/**
+ * Desired nick name.
+ */
+static char *nickstring;
+
+/**
* Global return value
*/
static int ret;
@@ -521,7 +526,7 @@
"namestore");
return;
}
- if (! (add|del|list|(NULL != uri)|(NULL != reverse_pkey)) )
+ if (! (add|del|list|(NULL != nickstring)|(NULL != uri)|(NULL !=
reverse_pkey)) )
{
/* nothing more to be done */
fprintf (stderr,
@@ -705,6 +710,7 @@
rd.expiration_time = etime_abs.abs_value_us;
else
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+
if (1 != shadow)
rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
@@ -715,6 +721,31 @@
&add_continuation,
&add_qe_uri);
}
+ if (NULL != nickstring)
+ {
+ if (0 == strlen(nickstring))
+ {
+ fprintf (stderr,
+ _("Invalid nick `%s'\n"),
+ nickstring);
+ GNUNET_SCHEDULER_shutdown ();
+ ret = 1;
+ return;
+ }
+ memset (&rd, 0, sizeof (rd));
+ rd.data = nickstring;
+ rd.data_size = strlen(nickstring);
+ rd.record_type = GNUNET_GNSRECORD_TYPE_NICK;
+ rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+ rd.flags |= GNUNET_GNSRECORD_RF_PRIVATE;
+ add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ "+",
+ 1,
+ &rd,
+ &add_continuation,
+ &add_qe_uri);
+ }
if (monitor)
{
zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
@@ -777,6 +808,7 @@
_("You must specify which zone should be accessed\n"));
return;
}
+
if ( (NULL != args[0]) && (NULL == uri) )
uri = GNUNET_strdup (args[0]);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
@@ -814,6 +846,9 @@
{'e', "expiration", "TIME",
gettext_noop ("expiration time for record to use (for adding only),
\"never\" is possible"), 1,
&GNUNET_GETOPT_set_string, &expirationstring},
+ {'i', "nick", "NICKNAME",
+ gettext_noop ("set the desired nick name for the zone"), 1,
+ &GNUNET_GETOPT_set_string, &nickstring},
{'m', "monitor", NULL,
gettext_noop ("monitor changes in the namestore"), 0,
&GNUNET_GETOPT_set_one, &monitor},
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30665 - in gnunet/src: gns include namestore,
gnunet <=