/*
This file is part of GNUnet.
- (C) 2012 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
* @author Christian Grothoff
*
* TODO:
- * - allow users to set record options (not just 'RF_AUTHORITY')
* - test
- * - add options to list/lookup individual records
*/
#include "platform.h"
#include <gnunet_util_lib.h>
#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_NAMESTORE_Handle *ns;
/**
- * Hash of the public key of our zone.
+ * Private key for the our zone.
*/
-static struct GNUNET_CRYPTO_ShortHashCode zone;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
/**
- * Private key for the our zone.
+ * Handle to identity lookup.
+ */
+static struct GNUNET_IDENTITY_EgoLookup *el;
+
+/**
+ * Identity service handle
*/
-static struct GNUNET_CRYPTO_EccPrivateKey *zone_pkey;
+static struct GNUNET_IDENTITY_Handle *idh;
/**
- * Keyfile to manipulate.
+ * Obtain default ego
*/
-static char *keyfile;
+struct GNUNET_IDENTITY_Operation *get_default;
+
+/**
+ * Name of the ego controlling the zone.
+ */
+static char *ego_name;
/**
* Desired action is to add a record.
*/
static int add;
+/**
+ * Queue entry for the 'add-uri' operation.
+ */
+static struct GNUNET_NAMESTORE_QueueEntry *add_qe_uri;
+
/**
* Queue entry for the 'add' operation.
*/
static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
/**
- * Queue entry for the 'add-uri' operation.
+ * Queue entry for the 'reverse lookup' operation (in combination with a name).
*/
-static struct GNUNET_NAMESTORE_QueueEntry *add_qe_uri;
+static struct GNUNET_NAMESTORE_QueueEntry *reverse_qe;
/**
* Desired action is to list records.
static int del;
/**
- * Is record public
+ * Is record public (opposite of #GNUNET_GNSRECORD_RF_PRIVATE)
*/
-static int public;
+static int is_public;
/**
- * Is record authority
+ * Is record a shadow record (#GNUNET_GNSRECORD_RF_SHADOW_RECORD)
*/
-static int nonauthority;
+static int is_shadow;
/**
* Queue entry for the 'del' operation.
*/
static char *uri;
+/**
+ * Reverse lookup to perform.
+ */
+static char *reverse_pkey;
+
/**
* Type of the record to add/remove, NULL to remove all.
*/
*/
static char *expirationstring;
+/**
+ * Desired nick name.
+ */
+static char *nickstring;
+
/**
* Global return value
*/
static void *data;
/**
- * Number of bytes in 'data'.
+ * Number of bytes in #data.
*/
static size_t data_size;
*/
static int monitor;
+
/**
* 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);
+ el = NULL;
+ }
if (NULL != list_it)
{
GNUNET_NAMESTORE_zone_iteration_stop (list_it);
GNUNET_NAMESTORE_disconnect (ns);
ns = NULL;
}
- if (NULL != zone_pkey)
- {
- GNUNET_CRYPTO_ecc_key_free (zone_pkey);
- zone_pkey = NULL;
- }
+ memset (&zone_pkey, 0, sizeof (zone_pkey));
if (NULL != uri)
{
GNUNET_free (uri);
GNUNET_NAMESTORE_zone_monitor_stop (zm);
zm = NULL;
}
+ if (NULL != data)
+ {
+ GNUNET_free (data);
+ data = NULL;
+ }
+}
+
+
+/**
+ * Check if we are finished, and if so, perform shutdown.
+ */
+static void
+test_finished ()
+{
+ if ( (NULL == add_qe) &&
+ (NULL == add_qe_uri) &&
+ (NULL == del_qe) &&
+ (NULL == reverse_qe) &&
+ (NULL == list_it) )
+ GNUNET_SCHEDULER_shutdown ();
}
* operation.
*
* @param cls closure, location of the QueueEntry pointer to NULL out
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- * GNUNET_NO if content was already there
- * GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
+ * #GNUNET_NO if content was already there
+ * #GNUNET_YES (or other positive value) on success
* @param emsg NULL on success, otherwise an error message
*/
static void
if (GNUNET_NO != success)
ret = 1;
}
- if ( (NULL == add_qe) &&
- (NULL == add_qe_uri) &&
- (NULL == del_qe) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ ret = 0;
+ test_finished ();
}
* operation.
*
* @param cls closure, unused
- * @param success GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
- * GNUNET_NO if content was already there
- * GNUNET_YES (or other positive value) on success
+ * @param success #GNUNET_SYSERR on failure (including timeout/queue drop/failure to validate)
+ * #GNUNET_NO if content was already there
+ * #GNUNET_YES (or other positive value) on success
* @param emsg NULL on success, otherwise an error message
*/
static void
const char *emsg)
{
del_qe = NULL;
- if (success != GNUNET_YES)
+ if (GNUNET_NO == success)
+ {
fprintf (stderr,
- _("Deleting record failed: %s\n"),
- emsg);
- if ( (NULL == add_qe) &&
- (NULL == add_qe_uri) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ _("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 ();
+}
+
+
+/**
+ * Function called when we are done with a zone iteration.
+ */
+static void
+zone_iteration_finished (void *cls)
+{
+ list_it = NULL;
+ test_finished ();
+}
+
+
+/**
+ * Function called when we encountered an error in a zone iteration.
+ */
+static void
+zone_iteration_error_cb (void *cls)
+{
+ list_it = NULL;
+ fprintf (stderr,
+ "Error iterating over zone\n");
+ ret = 1;
+ test_finished ();
}
* Process a record that was stored in the namestore.
*
* @param cls closure
- * @param zone_key public key of the zone
- * @param expire when does the corresponding block in the DHT expire (until
- * when should we never do a DHT lookup for the same name again)?;
- * GNUNET_TIME_UNIT_ZERO_ABS if there are no records of any type in the namestore,
- * or the expiration time of the block in the namestore (even if there are zero
- * records matching the desired record type)
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd_len number of entries in 'rd' array
+ * @param zone_key private key of the zone
+ * @param rname name that is being mapped (at most 255 characters long)
+ * @param rd_len number of entries in @a rd array
* @param rd array of records with data to store
- * @param signature signature of the record block, NULL if signature is unavailable (i.e.
- * because the user queried for a particular record type only)
*/
static void
display_record (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute expire,
- const char *name,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
+ const char *rname,
unsigned int rd_len,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
const char *typestring;
char *s;
unsigned int i;
- const char *etime;
- struct GNUNET_TIME_Absolute aex;
- struct GNUNET_TIME_Relative rex;
+ const char *ets;
+ struct GNUNET_TIME_Absolute at;
+ struct GNUNET_TIME_Relative rt;
- if (NULL == name)
+ if ( (NULL != name) &&
+ (0 != strcmp (name, rname)) )
{
- list_it = NULL;
- if ( (NULL == del_qe) &&
- (NULL == add_qe_uri) &&
- (NULL == add_qe) )
- GNUNET_SCHEDULER_shutdown ();
+ GNUNET_NAMESTORE_zone_iterator_next (list_it);
return;
}
FPRINTF (stdout,
"%s:\n",
- name);
+ rname);
for (i=0;i<rd_len;i++)
{
- typestring = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
- s = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ 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,
rd[i].data_size);
if (NULL == s)
{
- FPRINTF (stdout, _("\tCorrupt or unsupported record of type %u\n"),
+ FPRINTF (stdout,
+ _("\tCorrupt or unsupported record of type %u\n"),
(unsigned int) rd[i].record_type);
continue;
}
- if (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
+ if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
{
- rex.rel_value = rd[i].expiration_time;
- etime = GNUNET_STRINGS_relative_time_to_string (rex, GNUNET_YES);
+ rt.rel_value_us = rd[i].expiration_time;
+ ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);
}
else
{
- aex.abs_value = rd[i].expiration_time;
- etime = GNUNET_STRINGS_absolute_time_to_string (aex);
+ at.abs_value_us = rd[i].expiration_time;
+ ets = GNUNET_STRINGS_absolute_time_to_string (at);
}
- FPRINTF (stdout, "\t%s: %s (%s %s)\n", typestring, s,
- (0 != (rd[i].flags & GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION))
- ? _(/* what follows is relative expiration */ "for at least")
- : _(/* what follows is absolute expiration */ "until"),
- etime);
- GNUNET_free (s);
+ FPRINTF (stdout,
+ "\t%s: %s (%s)\t%s\t%s\n",
+ typestring,
+ s,
+ 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");
GNUNET_NAMESTORE_zone_iterator_next (list_it);
}
+/**
+ * Function called on errors while monitoring.
+ *
+ * @param cls NULL
+ */
+static void
+monitor_error_cb (void *cls)
+{
+ FPRINTF (stderr, "%s", "Monitor disconnected and out of sync.\n");
+}
+
+
+/**
+ * Function called if lookup fails.
+ */
+static void
+lookup_error_cb (void *cls)
+{
+ add_qe = NULL;
+ GNUNET_break (0);
+ ret = 1;
+ test_finished ();
+}
+
+
/**
* We're storing a record; this function is given the existing record
* so that we can merge the information.
*
* @param cls closure, unused
- * @param zone_key public key of the zone
- * @param freshness when does the corresponding block in the DHT expire (until
- * when should we never do a DHT lookup for the same name again)?;
- * GNUNET_TIME_UNIT_ZERO_ABS if there are no records of any type in the namestore,
- * or the expiration time of the block in the namestore (even if there are zero
- * records matching the desired record type)
+ * @param zone_key private key of the zone
* @param rec_name name that is being mapped (at most 255 characters long)
- * @param rd_count number of entries in 'rd' array
+ * @param rd_count number of entries in @a rd array
* @param rd array of records with data to store
- * @param signature signature of the record block, NULL if signature is unavailable (i.e.
- * because the user queried for a particular record type only)
*/
static void
get_existing_record (void *cls,
- const struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded *zone_key,
- struct GNUNET_TIME_Absolute freshness,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *rec_name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd,
- const struct GNUNET_CRYPTO_EccSignature *signature)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- struct GNUNET_NAMESTORE_RecordData rdn[rd_count + 1];
- struct GNUNET_NAMESTORE_RecordData *rde;
-
+ struct GNUNET_GNSRECORD_Data rdn[rd_count + 1];
+ struct GNUNET_GNSRECORD_Data *rde;
+ unsigned int i;
+
add_qe = NULL;
- memset (rdn, 0, sizeof (struct GNUNET_NAMESTORE_RecordData));
- memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
- /* 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... */
+ if (0 != strcmp (rec_name, name))
+ {
+ 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));
+ GNUNET_memcpy (&rdn[1],
+ rd,
+ rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
rde = &rdn[0];
rde->data = data;
rde->data_size = data_size;
rde->record_type = type;
+ if (1 == is_shadow)
+ rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ if (1 != is_public)
+ rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
if (GNUNET_YES == etime_is_rel)
{
- rde->expiration_time = etime_rel.rel_value;
- rde->flags |= GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ rde->expiration_time = etime_rel.rel_value_us;
+ rde->flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
}
else if (GNUNET_NO == etime_is_rel)
- {
- rde->expiration_time = etime_abs.abs_value;
- }
- if (1 != nonauthority)
- rde->flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
- if (1 != public)
- rde->flags |= GNUNET_NAMESTORE_RF_PRIVATE;
+ rde->expiration_time = etime_abs.abs_value_us;
+ else
+ rde->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
GNUNET_assert (NULL != name);
- add_qe = GNUNET_NAMESTORE_record_put_by_authority (ns,
- zone_pkey,
- name,
- rd_count + 1,
- rde,
- &add_continuation,
- &add_qe);
+ add_qe = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ name,
+ rd_count + 1,
+ rde,
+ &add_continuation,
+ &add_qe);
}
/**
- * Function called with the result from the check if the namestore
- * service is actually running. If it is, we start the actual
- * operation.
+ * Function called if we encountered an error in zone-to-name.
+ */
+static void
+reverse_error_cb (void *cls)
+{
+ reverse_qe = NULL;
+ FPRINTF (stdout,
+ "%s.zkey\n",
+ reverse_pkey);
+}
+
+
+/**
+ * Function called with the result of our attempt to obtain a name for a given
+ * public key.
*
- * @param cls closure with our configuration
- * @param result GNUNET_YES if the namestore service is running
+ * @param cls NULL
+ * @param zone private key of the zone; NULL on disconnect
+ * @param label label of the records; NULL on disconnect
+ * @param rd_count number of entries in @a rd array, 0 if label was deleted
+ * @param rd array of records with data to store
*/
static void
-testservice_task (void *cls,
- int result)
+handle_reverse_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *rd)
{
- const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
- struct GNUNET_NAMESTORE_RecordData rd;
+ reverse_qe = NULL;
+ if (NULL == label)
+ FPRINTF (stdout,
+ "%s.zkey\n",
+ reverse_pkey);
+ else
+ FPRINTF (stdout,
+ "%s.gnu\n",
+ label);
+ test_finished ();
+}
+
+
+/**
+ * Function called if lookup for deletion fails.
+ */
+static void
+del_lookup_error_cb (void *cls)
+{
+ del_qe = NULL;
+ GNUNET_break (0);
+ ret = 1;
+ test_finished ();
+}
- if (GNUNET_YES != result)
+
+/**
+ * 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);
+ ret = 1;
+ test_finished ();
+ return;
+ }
+ if ( (NULL == value) &&
+ (NULL == typestring) )
{
- FPRINTF (stderr, _("Service `%s' is not running\n"),
- "namestore");
+ /* delete everything */
+ del_qe = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ name,
+ 0,
+ NULL,
+ &del_continuation,
+ NULL);
return;
}
- if (NULL == keyfile)
+ 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++)
{
- if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "ZONEKEY", &keyfile))
+ 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);
+}
+
+
+/**
+ * Callback invoked from identity service with ego information.
+ * An @a ego of NULL means the ego was not found.
+ *
+ * @param cls closure with the configuration
+ * @param ego an ego known to identity service, or NULL
+ */
+static void
+identity_cb (void *cls,
+ const struct GNUNET_IDENTITY_Ego *ego)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_GNSRECORD_Data rd;
+
+ el = NULL;
+ if (NULL == ego)
+ {
+ if (NULL != ego_name)
{
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "gns", "ZONEKEY");
- return;
+ fprintf (stderr,
+ _("Ego `%s' not known to identity service\n"),
+ ego_name);
}
- fprintf (stderr,
- _("Using default zone file `%s'\n"),
- keyfile);
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
}
- zone_pkey = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
+ GNUNET_free_non_null (ego_name);
+ ego_name = NULL;
- if (! (add|del|list|(NULL != uri)))
+ if (! (add|del|list|(NULL != nickstring)|(NULL != uri)|(NULL != reverse_pkey)) )
{
- /* nothing more to be done */
+ /* nothing more to be done */
fprintf (stderr,
_("No options given\n"));
- GNUNET_CRYPTO_ecc_key_free (zone_pkey);
- zone_pkey = NULL;
- return;
- }
- if (NULL == zone_pkey)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read or create private zone key\n"));
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- GNUNET_CRYPTO_ecc_key_get_public (zone_pkey,
+ GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
&pub);
- GNUNET_CRYPTO_short_hash (&pub, sizeof (pub), &zone);
ns = GNUNET_NAMESTORE_connect (cfg);
if (NULL == ns)
_("Failed to connect to namestore\n"));
return;
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_shutdown, NULL);
if (add)
{
if (NULL == name)
_("Missing option `%s' for operation `%s'\n"),
"-n", _("add"));
GNUNET_SCHEDULER_shutdown ();
- ret = 1;
- return;
+ ret = 1;
+ return;
}
if (NULL == typestring)
{
"-t", _("add"));
GNUNET_SCHEDULER_shutdown ();
ret = 1;
- return;
+ return;
}
- type = GNUNET_NAMESTORE_typename_to_number (typestring);
+ type = GNUNET_GNSRECORD_typename_to_number (typestring);
if (UINT32_MAX == type)
{
- fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
+ fprintf (stderr,
+ _("Unsupported type `%s'\n"),
+ typestring);
GNUNET_SCHEDULER_shutdown ();
ret = 1;
return;
fprintf (stderr,
_("Missing option `%s' for operation `%s'\n"),
"-V", _("add"));
- ret = 1;
+ ret = 1;
GNUNET_SCHEDULER_shutdown ();
- return;
+ return;
}
if (GNUNET_OK !=
- GNUNET_NAMESTORE_string_to_value (type,
+ GNUNET_GNSRECORD_string_to_value (type,
value,
&data,
&data_size))
{
- fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
+ fprintf (stderr,
+ _("Value `%s' invalid for record type `%s'\n"),
value,
typestring);
GNUNET_SCHEDULER_shutdown ();
{
fprintf (stderr,
_("Missing option `%s' for operation `%s'\n"),
- "-e", _("add"));
+ "-e",
+ _("add"));
GNUNET_SCHEDULER_shutdown ();
- ret = 1;
- return;
+ ret = 1;
+ return;
}
- if (0 == strcmp (expirationstring, "never"))
+ if (0 == strcmp (expirationstring,
+ "never"))
{
etime_abs = GNUNET_TIME_UNIT_FOREVER_ABS;
etime_is_rel = GNUNET_NO;
&etime_rel))
{
etime_is_rel = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Storing record with relative expiration time of %s\n",
+ GNUNET_STRINGS_relative_time_to_string (etime_rel,
+ GNUNET_NO));
}
- else if (GNUNET_OK ==
+ else if (GNUNET_OK ==
GNUNET_STRINGS_fancy_time_to_absolute (expirationstring,
&etime_abs))
{
etime_is_rel = GNUNET_NO;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Storing record with absolute expiration time of %s\n",
+ GNUNET_STRINGS_absolute_time_to_string (etime_abs));
}
else
{
expirationstring);
GNUNET_SCHEDULER_shutdown ();
ret = 1;
- return;
+ return;
}
- add_qe = GNUNET_NAMESTORE_lookup_record (ns,
- &zone,
- name,
- 0,
- &get_existing_record,
- NULL);
+ add_qe = GNUNET_NAMESTORE_records_lookup (ns,
+ &zone_pkey,
+ name,
+ &lookup_error_cb,
+ NULL,
+ &get_existing_record,
+ NULL);
}
if (del)
{
"-n", _("del"));
GNUNET_SCHEDULER_shutdown ();
ret = 1;
- return;
+ return;
}
- del_qe = GNUNET_NAMESTORE_record_put_by_authority (ns,
- zone_pkey,
- name,
- 0, NULL,
- &del_continuation,
- NULL);
+ del_qe = GNUNET_NAMESTORE_records_lookup (ns,
+ &zone_pkey,
+ name,
+ &del_lookup_error_cb,
+ NULL,
+ &del_monitor,
+ NULL);
}
if (list)
{
- uint32_t must_not_flags = 0;
-
- if (1 == nonauthority) /* List non-authority records */
- must_not_flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
-
- if (1 == public)
- must_not_flags |= GNUNET_NAMESTORE_RF_PRIVATE;
-
list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone,
- GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION,
- must_not_flags,
+ &zone_pkey,
+ &zone_iteration_error_cb,
+ NULL,
&display_record,
+ NULL,
+ &zone_iteration_finished,
NULL);
}
+ if (NULL != reverse_pkey)
+ {
+ struct GNUNET_CRYPTO_EcdsaPublicKey pubkey;
+
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (reverse_pkey,
+ strlen (reverse_pkey),
+ &pubkey))
+ {
+ fprintf (stderr,
+ _("Invalid public key for reverse lookup `%s'\n"),
+ reverse_pkey);
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ reverse_qe = GNUNET_NAMESTORE_zone_to_name (ns,
+ &zone_pkey,
+ &pubkey,
+ &reverse_error_cb,
+ NULL,
+ &handle_reverse_lookup,
+ NULL);
+ }
if (NULL != uri)
{
- char sh[53];
+ char sh[105];
char sname[64];
- struct GNUNET_CRYPTO_ShortHashCode sc;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+ GNUNET_STRINGS_utf8_tolower (uri, uri);
if ( (2 != (sscanf (uri,
"gnunet://gns/%52s/%63s",
sh,
sname)) ) ||
(GNUNET_OK !=
- GNUNET_CRYPTO_short_hash_from_string (sh, &sc)) )
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (sh,
+ strlen (sh),
+ &pkey)) )
{
- fprintf (stderr,
+ fprintf (stderr,
_("Invalid URI `%s'\n"),
uri);
GNUNET_SCHEDULER_shutdown ();
return;
}
memset (&rd, 0, sizeof (rd));
- rd.data = ≻
- rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
- rd.record_type = GNUNET_NAMESTORE_TYPE_PKEY;
+ rd.data = &pkey;
+ rd.data_size = sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey);
+ rd.record_type = GNUNET_GNSRECORD_TYPE_PKEY;
if (GNUNET_YES == etime_is_rel)
{
- rd.expiration_time = etime_rel.rel_value;
- rd.flags |= GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ rd.expiration_time = etime_rel.rel_value_us;
+ rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
}
else if (GNUNET_NO == etime_is_rel)
- rd.expiration_time = etime_abs.abs_value;
- else
- rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value;
- if (1 != nonauthority)
- rd.flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
- add_qe_uri = GNUNET_NAMESTORE_record_put_by_authority (ns,
- zone_pkey,
- sname,
- 1,
- &rd,
- &add_continuation,
- &add_qe_uri);
- }
- GNUNET_free_non_null (data);
+ rd.expiration_time = etime_abs.abs_value_us;
+ else
+ rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
+
+ if (1 == is_shadow)
+ rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
+ &zone_pkey,
+ sname,
+ 1,
+ &rd,
+ &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,
+ &zone_pkey,
+ GNUNET_YES,
+ &monitor_error_cb,
+ NULL,
&display_record,
+ NULL,
&sync_cb,
NULL);
}
}
+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);
+ }
+}
+
+
/**
* Main function that will be run.
*
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
-
if ( (NULL != args[0]) && (NULL == uri) )
uri = GNUNET_strdup (args[0]);
- GNUNET_CLIENT_service_test ("namestore", cfg,
- GNUNET_TIME_UNIT_SECONDS,
- &testservice_task,
- (void *) cfg);
+ 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);
}
* @return 0 ok, 1 on error
*/
int
-main (int argc, char *const *argv)
+main (int argc,
+ char *const *argv)
{
- nonauthority = -1;
- public = -1;
-
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'a', "add", NULL,
- gettext_noop ("add record"), 0,
- &GNUNET_GETOPT_set_one, &add},
- {'d', "delete", NULL,
- gettext_noop ("delete record"), 0,
- &GNUNET_GETOPT_set_one, &del},
- {'D', "display", NULL,
- gettext_noop ("display records"), 0,
- &GNUNET_GETOPT_set_one, &list},
- {'e', "expiration", "TIME",
- gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), 1,
- &GNUNET_GETOPT_set_string, &expirationstring},
- {'m', "monitor", NULL,
- gettext_noop ("monitor changes in the namestore"), 0,
- &GNUNET_GETOPT_set_one, &monitor},
- {'n', "name", "NAME",
- gettext_noop ("name of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &name},
- {'t', "type", "TYPE",
- gettext_noop ("type of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &typestring},
- {'u', "uri", "URI",
- gettext_noop ("URI to import into our zone"), 1,
- &GNUNET_GETOPT_set_string, &uri},
- {'V', "value", "VALUE",
- gettext_noop ("value of the record to add/delete"), 1,
- &GNUNET_GETOPT_set_string, &value},
- {'p', "public", NULL,
- gettext_noop ("create or list public record"), 0,
- &GNUNET_GETOPT_set_one, &public},
- {'N', "non-authority", NULL,
- gettext_noop ("create or list non-authority record"), 0,
- &GNUNET_GETOPT_set_one, &nonauthority},
- {'z', "zonekey", "FILENAME",
- gettext_noop ("filename with the zone key"), 1,
- &GNUNET_GETOPT_set_string, &keyfile},
+ is_public = -1;
+ is_shadow = -1;
+
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+
+ GNUNET_GETOPT_option_flag ('a',
+ "add",
+ gettext_noop ("add record"),
+ &add),
+
+ GNUNET_GETOPT_option_flag ('d',
+ "delete",
+ gettext_noop ("delete record"),
+ &del),
+
+ GNUNET_GETOPT_option_flag ('D',
+ "display",
+ gettext_noop ("display records"),
+ &list),
+
+ GNUNET_GETOPT_option_string ('e',
+ "expiration",
+ "TIME",
+ gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"),
+ &expirationstring),
+
+ GNUNET_GETOPT_option_string ('i',
+ "nick",
+ "NICKNAME",
+ gettext_noop ("set the desired nick name for the zone"),
+ &nickstring),
+
+ GNUNET_GETOPT_option_flag ('m',
+ "monitor",
+ gettext_noop ("monitor changes in the namestore"),
+ &monitor),
+
+ GNUNET_GETOPT_option_string ('n',
+ "name",
+ "NAME",
+ gettext_noop ("name of the record to add/delete/display"),
+ &name),
+
+ GNUNET_GETOPT_option_string ('r',
+ "reverse",
+ "PKEY",
+ gettext_noop ("determine our name for the given PKEY"),
+ &reverse_pkey),
+
+
+
+ GNUNET_GETOPT_option_string ('t',
+ "type",
+ "TYPE",
+ gettext_noop ("type of the record to add/delete/display"),
+ &typestring),
+
+ GNUNET_GETOPT_option_string ('u',
+ "uri",
+ "URI",
+ gettext_noop ("URI to import into our zone"),
+ &uri),
+
+ GNUNET_GETOPT_option_string ('V',
+ "value",
+ "VALUE",
+ gettext_noop ("value of the record to add/delete"),
+ &value),
+
+ GNUNET_GETOPT_option_flag ('p',
+ "public",
+ gettext_noop ("create or list public record"),
+ &is_public),
+
+ GNUNET_GETOPT_option_flag ('s',
+ "shadow",
+ gettext_noop ("create shadow record (only valid if all other records of the same type have expired"),
+ &is_shadow),
+
+ GNUNET_GETOPT_option_string ('z',
+ "zone",
+ "EGO",
+ gettext_noop ("name of the ego controlling the zone"),
+ &ego_name),
+
GNUNET_GETOPT_OPTION_END
};
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- GNUNET_log_setup ("gnunet-namestore", "WARNING", NULL);
+ GNUNET_log_setup ("gnunet-namestore",
+ "WARNING",
+ NULL);
if (GNUNET_OK !=
- GNUNET_PROGRAM_run (argc, argv, "gnunet-namestore",
- _("GNUnet zone manipulation tool"),
+ GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-namestore",
+ _("GNUnet zone manipulation tool"),
options,
&run, NULL))
{
GNUNET_free ((void*) argv);
+ GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
return 1;
}
GNUNET_free ((void*) argv);
+ GNUNET_CRYPTO_ecdsa_key_clear (&zone_pkey);
return ret;
}
projects / oweals / gnunet.git / blobdiff