-
/*
This file is part of GNUnet.
- (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012, 2013, 2014 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file gnunet-namestore.c
#include <gnunet_dnsparser_lib.h>
#include <gnunet_identity_service.h>
#include <gnunet_gnsrecord_lib.h>
+#include <gnunet_gns_service.h>
#include <gnunet_namestore_service.h>
*/
static struct GNUNET_IDENTITY_EgoLookup *el;
+/**
+ * Identity service handle
+ */
+static struct GNUNET_IDENTITY_Handle *idh;
+
+/**
+ * Obtain default ego
+ */
+struct GNUNET_IDENTITY_Operation *get_default;
+
/**
* Name of the ego controlling the zone.
*/
*/
static int add;
-/**
- * Iterator for the 'add' operation.
- */
-static struct GNUNET_NAMESTORE_ZoneIterator *add_zit;
-
/**
* Queue entry for the 'add-uri' operation.
*/
/**
* Is record public (opposite of #GNUNET_GNSRECORD_RF_PRIVATE)
*/
-static int public;
+static int is_public;
/**
* Is record a shadow record (#GNUNET_GNSRECORD_RF_SHADOW_RECORD)
*/
-static int shadow;
+static int is_shadow;
/**
* Queue entry for the 'del' operation.
*/
static char *expirationstring;
+/**
+ * Desired nick name.
+ */
+static char *nickstring;
+
/**
* Global return value
*/
* Task run on shutdown. Cleans up everything.
*
* @param cls unused
- * @param tc scheduler context
*/
static void
-do_shutdown (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+do_shutdown (void *cls)
{
+ if (NULL != get_default)
+ {
+ GNUNET_IDENTITY_cancel (get_default);
+ get_default = NULL;
+ }
+ if (NULL != idh)
+ {
+ GNUNET_IDENTITY_disconnect (idh);
+ idh = NULL;
+ }
if (NULL != el)
{
GNUNET_IDENTITY_ego_lookup_cancel (el);
GNUNET_NAMESTORE_zone_iteration_stop (list_it);
list_it = NULL;
}
- if (NULL != add_zit)
- {
- GNUNET_NAMESTORE_zone_iteration_stop (add_zit);
- add_zit = NULL;
- }
if (NULL != add_qe)
{
GNUNET_NAMESTORE_cancel (add_qe);
if (GNUNET_NO != success)
ret = 1;
}
+ ret = 0;
test_finished ();
}
const char *emsg)
{
del_qe = NULL;
- if (success != GNUNET_YES)
+ if (GNUNET_NO == success)
+ {
fprintf (stderr,
- _("Deleting record failed: %s\n"),
- emsg);
+ _("Deleting record failed, record does not exist%s%s\n"),
+ (NULL != emsg) ? ": " : "",
+ (NULL != emsg) ? emsg : "");
+ }
+ if (GNUNET_SYSERR == success)
+ {
+ fprintf (stderr,
+ _("Deleting record failed%s%s\n"),
+ (NULL != emsg) ? ": " : "",
+ (NULL != emsg) ? emsg : "");
+ }
test_finished ();
}
rname);
for (i=0;i<rd_len;i++)
{
+ if ( (GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type) &&
+ (0 != strcmp (rname,
+ "+")) )
+ continue;
typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
ets = GNUNET_STRINGS_absolute_time_to_string (at);
}
FPRINTF (stdout,
- "\t%s: %s (%s)\n",
+ "\t%s: %s (%s)\t%s\t%s\n",
typestring,
s,
- ets);
+ ets,
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE" : "PUBLIC",
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? "SHADOW" : "");
GNUNET_free (s);
}
FPRINTF (stdout, "%s", "\n");
{
struct GNUNET_GNSRECORD_Data rdn[rd_count + 1];
struct GNUNET_GNSRECORD_Data *rde;
+ unsigned int i;
+ add_qe = NULL;
if ( (NULL != zone_key) &&
(0 != strcmp (rec_name, name)) )
{
- GNUNET_NAMESTORE_zone_iterator_next (add_zit);
+ GNUNET_break (0);
+ ret = 1;
+ test_finished ();
return;
}
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Received %u records for name `%s'\n",
+ rd_count, rec_name);
+ for (i=0;i<rd_count;i++)
+ {
+ switch (rd[i].record_type)
+ {
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ fprintf (stderr,
+ _("A %s record exists already under `%s', no other records can be added.\n"),
+ "CNAME",
+ rec_name);
+ ret = 1;
+ test_finished ();
+ return;
+ case GNUNET_GNSRECORD_TYPE_PKEY:
+ fprintf (stderr,
+ _("A %s record exists already under `%s', no other records can be added.\n"),
+ "PKEY",
+ rec_name);
+ ret = 1;
+ test_finished ();
+ return;
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+ fprintf (stderr,
+ _("A %s record exists already under `%s', no other records can be added.\n"),
+ "GNS2DNS",
+ rec_name);
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ }
+ switch (type)
+ {
+ case GNUNET_DNSPARSER_TYPE_CNAME:
+ if (0 != rd_count)
+ {
+ fprintf (stderr,
+ _("Records already exist under `%s', cannot add `%s' record.\n"),
+ rec_name,
+ "CNAME");
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ break;
+ case GNUNET_GNSRECORD_TYPE_PKEY:
+ if (0 != rd_count)
+ {
+ fprintf (stderr,
+ _("Records already exist under `%s', cannot add `%s' record.\n"),
+ rec_name,
+ "PKEY");
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ break;
+ case GNUNET_GNSRECORD_TYPE_GNS2DNS:
+ if (0 != rd_count)
+ {
+ fprintf (stderr,
+ _("Records already exist under `%s', cannot add `%s' record.\n"),
+ rec_name,
+ "GNS2DNS");
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ break;
+ }
memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
- /* FIXME: should add some logic to overwrite records if there
- can only be one record of a particular type, and to check
- if the combination of records is valid to begin with... */
rde = &rdn[0];
rde->data = data;
rde->data_size = data_size;
rde->record_type = type;
- if (1 != shadow)
+ if (1 == is_shadow)
rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
- if (1 != public)
+ if (1 != is_public)
rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
if (GNUNET_YES == etime_is_rel)
{
rde,
&add_continuation,
&add_qe);
- /* only cancel if we were not told that this
- was the end of the iteration already */
- if (NULL != rec_name)
- GNUNET_NAMESTORE_zone_iteration_stop (add_zit);
- add_zit = NULL;
}
}
+/**
+ * We were asked to delete something; this function is called with
+ * the existing records. Now we should determine what should be
+ * deleted and then issue the deletion operation.
+ *
+ * @param cls NULL
+ * @param zone private key of the zone we are deleting from
+ * @param label name of the records we are editing
+ * @param rd_count size of the @a rd array
+ * @param rd existing records
+ */
+static void
+del_monitor (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
+{
+ struct GNUNET_GNSRECORD_Data rdx[rd_count];
+ unsigned int rd_left;
+ unsigned int i;
+ uint32_t type;
+ char *vs;
+
+ del_qe = NULL;
+ if (0 == rd_count)
+ {
+ FPRINTF (stderr,
+ _("There are no records under label `%s' that could be deleted.\n"),
+ label);
+ test_finished ();
+ return;
+ }
+ if ( (NULL == value) &&
+ (NULL == typestring) )
+ {
+ /* delete everything */
+ del_qe = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ name,
+ 0, NULL,
+ &del_continuation,
+ NULL);
+ return;
+ }
+ rd_left = 0;
+ if (NULL != typestring)
+ type = GNUNET_GNSRECORD_typename_to_number (typestring);
+ else
+ type = GNUNET_GNSRECORD_TYPE_ANY;
+ for (i=0;i<rd_count;i++)
+ {
+ vs = NULL;
+ if (! ( ( (GNUNET_GNSRECORD_TYPE_ANY == type) ||
+ (rd[i].record_type == type) ) &&
+ ( (NULL == value) ||
+ (NULL == (vs = (GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
+ rd[i].data,
+ rd[i].data_size)))) ||
+ (0 == strcmp (vs, value)) ) ) )
+ rdx[rd_left++] = rd[i];
+ GNUNET_free_non_null (vs);
+ }
+ if (rd_count == rd_left)
+ {
+ /* nothing got deleted */
+ FPRINTF (stderr,
+ _("There are no records under label `%s' that match the request for deletion.\n"),
+ label);
+ test_finished ();
+ return;
+ }
+ /* delete everything but what we copied to 'rdx' */
+ del_qe = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ name,
+ rd_left, rdx,
+ &del_continuation,
+ NULL);
+}
+
+
/**
* Function called with the result from the check if the namestore
* service is actually running. If it is, we start the actual
"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,
ret = 1;
return;
}
- add_zit = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone_pkey,
- &get_existing_record,
- NULL);
+ add_qe = GNUNET_NAMESTORE_records_lookup (ns, &zone_pkey, name,
+ &get_existing_record, NULL );
}
if (del)
{
ret = 1;
return;
}
- del_qe = GNUNET_NAMESTORE_records_store (ns,
- &zone_pkey,
- name,
- 0, NULL,
- &del_continuation,
- NULL);
+ del_qe = GNUNET_NAMESTORE_records_lookup (ns,
+ &zone_pkey,
+ name,
+ &del_monitor,
+ NULL);
}
if (list)
{
char sname[64];
struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+ GNUNET_STRINGS_utf8_tolower (uri, uri);
if ( (2 != (sscanf (uri,
- "gnunet://gns/%104s/%63s",
+ "gnunet://gns/%52s/%63s",
sh,
sname)) ) ||
- (GNUNET_OK !=
- GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
+ (GNUNET_OK != GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
{
fprintf (stderr,
_("Invalid URI `%s'\n"),
rd.expiration_time = etime_abs.abs_value_us;
else
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- if (1 != shadow)
+
+ if (1 == is_shadow)
rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
&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;
+ }
+ add_qe_uri = GNUNET_NAMESTORE_set_nick(ns, &zone_pkey, nickstring,
+ &add_continuation, &add_qe_uri);
+ }
if (monitor)
{
zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
&zone_pkey,
+ GNUNET_YES,
&display_record,
&sync_cb,
NULL);
el = NULL;
if (NULL == ego)
{
- fprintf (stderr,
- _("Ego `%s' not known to identity service\n"),
- ego_name);
+ if (NULL != ego_name)
+ {
+ fprintf (stderr,
+ _("Ego `%s' not known to identity service\n"),
+ ego_name);
+ }
GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
return;
}
zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
- GNUNET_free (ego_name);
+ GNUNET_free_non_null (ego_name);
ego_name = NULL;
GNUNET_CLIENT_service_test ("namestore", cfg,
GNUNET_TIME_UNIT_SECONDS,
}
+static void
+default_ego_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ get_default = NULL;
+ if (NULL == ego)
+ {
+ fprintf (stderr,
+ _("No default ego configured in identity service\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+ else
+ {
+ identity_cb (cls, ego);
+ }
+}
+
+
+static void
+id_connect_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+
+ if (NULL == ego)
+ {
+ get_default = GNUNET_IDENTITY_get (idh,
+ "namestore",
+ &default_ego_cb, (void *) cfg);
+ }
+}
+
+
+static void
+testservice_id_task (void *cls, int result)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ if (result != GNUNET_YES)
+ {
+ fprintf (stderr,
+ _("Identity service is not running\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+ GNUNET_SCHEDULER_add_shutdown (&do_shutdown, (void *) cfg);
+
+ if (NULL == ego_name)
+ {
+ idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
+ if (NULL == idh)
+ fprintf (stderr, _("Cannot connect to identity service\n"));
+ ret = -1;
+ return;
+ }
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
+ ego_name,
+ &identity_cb,
+ (void *) cfg);
+}
+
+
/**
* Main function that will be run.
*
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- if (NULL == ego_name)
- {
- fprintf (stderr,
- _("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,
- &do_shutdown, NULL);
- el = GNUNET_IDENTITY_ego_lookup (cfg,
- ego_name,
- &identity_cb,
- (void *) cfg);
+
+ GNUNET_CLIENT_service_test ("identity", cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_id_task,
+ (void *) cfg);
}
int
main (int argc, char *const *argv)
{
- public = -1;
+ is_public = -1;
+ is_shadow = -1;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'a', "add", NULL,
{'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},
&GNUNET_GETOPT_set_string, &value},
{'p', "public", NULL,
gettext_noop ("create or list public record"), 0,
- &GNUNET_GETOPT_set_one, &public},
+ &GNUNET_GETOPT_set_one, &is_public},
{'s', "shadow", NULL,
gettext_noop ("create shadow record (only valid if all other records of the same type have expired"), 0,
- &GNUNET_GETOPT_set_one, &shadow},
+ &GNUNET_GETOPT_set_one, &is_shadow},
{'z', "zone", "EGO",
gettext_noop ("name of the ego controlling the zone"), 1,
&GNUNET_GETOPT_set_string, &ego_name},