* @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_namestore_service.h>
/**
* Private key for the our zone.
*/
-static struct GNUNET_CRYPTO_EccPrivateKey zone_pkey;
+static struct GNUNET_CRYPTO_EcdsaPrivateKey zone_pkey;
/**
* Handle to identity lookup.
/**
* Name of the ego controlling the zone.
*/
-static char *ego_name;
+static char *ego_name;
/**
* Desired action is to add a record.
*/
static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
+/**
+ * Queue entry for the 'reverse lookup' operation (in combination with a name).
+ */
+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;
/**
- * Is record authority
+ * Is record a shadow record (#GNUNET_GNSRECORD_RF_SHADOW_RECORD)
*/
-static int nonauthority;
+static int 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.
*/
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);
}
+/**
+ * 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 ();
+}
+
+
/**
* Continuation called to notify client about result of the
* 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 ();
+ 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
fprintf (stderr,
_("Deleting record failed: %s\n"),
emsg);
- if ( (NULL == add_qe) &&
- (NULL == add_qe_uri) &&
- (NULL == list_it) )
- GNUNET_SCHEDULER_shutdown ();
+ test_finished ();
}
*
* @param cls closure
* @param zone_key private key of the zone
- * @param name name that is being mapped (at most 255 characters long)
- * @param rd_len number of entries in 'rd' array
+ * @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
*/
static void
display_record (void *cls,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
- 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_GNSRECORD_Data *rd)
{
const char *typestring;
char *s;
unsigned int i;
+ const char *ets;
+ struct GNUNET_TIME_Absolute at;
+ struct GNUNET_TIME_Relative rt;
- if (NULL == name)
+ if (NULL == rname)
{
list_it = NULL;
- if ( (NULL == del_qe) &&
- (NULL == add_qe_uri) &&
- (NULL == add_qe) )
- GNUNET_SCHEDULER_shutdown ();
+ test_finished ();
+ return;
+ }
+ if ( (NULL != name) &&
+ (0 != strcmp (name, rname)) )
+ {
+ 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,
+ 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)
(unsigned int) rd[i].record_type);
continue;
}
- FPRINTF (stdout,
- "\t%s: %s\n",
- typestring,
- s);
- GNUNET_free (s);
+ if (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION))
+ {
+ rt.rel_value_us = rd[i].expiration_time;
+ ets = GNUNET_STRINGS_relative_time_to_string (rt, GNUNET_YES);
+ }
+ else
+ {
+ at.abs_value_us = rd[i].expiration_time;
+ ets = GNUNET_STRINGS_absolute_time_to_string (at);
+ }
+ FPRINTF (stdout,
+ "\t%s: %s (%s)\n",
+ typestring,
+ s,
+ ets);
+ GNUNET_free (s);
}
FPRINTF (stdout, "%s", "\n");
GNUNET_NAMESTORE_zone_iterator_next (list_it);
* @param cls closure, unused
* @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
*/
static void
get_existing_record (void *cls,
- const struct GNUNET_CRYPTO_EccPrivateKey *zone_key,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
const char *rec_name,
unsigned int rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ 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;
if ( (NULL != zone_key) &&
(0 != strcmp (rec_name, name)) )
GNUNET_NAMESTORE_zone_iterator_next (add_zit);
return;
}
- memset (rdn, 0, sizeof (struct GNUNET_NAMESTORE_RecordData));
- memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_NAMESTORE_RecordData));
+ 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->data = data;
rde->data_size = data_size;
rde->record_type = type;
- if (1 != nonauthority)
- rde->flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
+ if (1 != shadow)
+ rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
if (1 != public)
- rde->flags |= GNUNET_NAMESTORE_RF_PRIVATE;
+ rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
+ if (GNUNET_YES == etime_is_rel)
+ {
+ 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_us;
+ else
+ rde->expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
GNUNET_assert (NULL != name);
add_qe = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
rde,
&add_continuation,
&add_qe);
- GNUNET_NAMESTORE_zone_iteration_stop (add_zit);
+ /* 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;
}
+/**
+ * Function called with the result of our attempt to obtain a name for a given
+ * public key.
+ *
+ * @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
+handle_reverse_lookup (void *cls,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+ const char *label,
+ unsigned int rd_count,
+ const struct GNUNET_GNSRECORD_Data *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 with the result from the check if the namestore
* service is actually running. If it is, we start the actual
* operation.
*
* @param cls closure with our configuration
- * @param result GNUNET_YES if the namestore service is running
+ * @param result #GNUNET_YES if the namestore service is running
*/
static void
testservice_task (void *cls,
int result)
{
const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
- struct GNUNET_CRYPTO_EccPublicKey pub;
- struct GNUNET_NAMESTORE_RecordData rd;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+ struct GNUNET_GNSRECORD_Data rd;
if (GNUNET_YES != result)
{
- FPRINTF (stderr, _("Service `%s' is not running\n"),
+ FPRINTF (stderr, _("Service `%s' is not running\n"),
"namestore");
return;
}
- if (! (add|del|list|(NULL != uri)))
+ if (! (add|del|list|(NULL != uri)|(NULL != reverse_pkey)) )
{
- /* nothing more to be done */
+ /* nothing more to be done */
fprintf (stderr,
_("No options given\n"));
- return;
+ GNUNET_SCHEDULER_shutdown ();
+ return;
}
- GNUNET_CRYPTO_ecc_key_get_public (&zone_pkey,
+ GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
&pub);
ns = GNUNET_NAMESTORE_connect (cfg);
_("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,
_("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))
_("Missing option `%s' for operation `%s'\n"),
"-e", _("add"));
GNUNET_SCHEDULER_shutdown ();
- ret = 1;
- return;
+ ret = 1;
+ return;
}
if (0 == strcmp (expirationstring, "never"))
{
{
etime_is_rel = GNUNET_YES;
}
- else if (GNUNET_OK ==
+ else if (GNUNET_OK ==
GNUNET_STRINGS_fancy_time_to_absolute (expirationstring,
&etime_abs))
{
expirationstring);
GNUNET_SCHEDULER_shutdown ();
ret = 1;
- return;
+ return;
}
add_zit = GNUNET_NAMESTORE_zone_iteration_start (ns,
&zone_pkey,
"-n", _("del"));
GNUNET_SCHEDULER_shutdown ();
ret = 1;
- return;
+ return;
}
del_qe = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
&display_record,
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,
+ &handle_reverse_lookup,
+ NULL);
+ }
if (NULL != uri)
{
char sh[105];
char sname[64];
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
if ( (2 != (sscanf (uri,
"gnunet://gns/%104s/%63s",
sh,
sname)) ) ||
(GNUNET_OK !=
- GNUNET_CRYPTO_ecc_public_key_from_string (sh, strlen (sh), &pkey)) )
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
{
- fprintf (stderr,
+ fprintf (stderr,
_("Invalid URI `%s'\n"),
uri);
GNUNET_SCHEDULER_shutdown ();
}
memset (&rd, 0, sizeof (rd));
rd.data = &pkey;
- rd.data_size = sizeof (struct GNUNET_CRYPTO_EccPublicKey);
- rd.record_type = GNUNET_NAMESTORE_TYPE_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_us;
- rd.flags |= GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
}
else if (GNUNET_NO == etime_is_rel)
rd.expiration_time = etime_abs.abs_value_us;
- else
+ else
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- if (1 != nonauthority)
- rd.flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
+ if (1 != shadow)
+ rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
sname,
* 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
+ * @param ego an ego known to identity service, or NULL
*/
static void
identity_cb (void *cls,
el = NULL;
if (NULL == ego)
{
- fprintf (stderr,
+ fprintf (stderr,
_("Ego `%s' not known to identity service\n"),
ego_name);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
{
if (NULL == ego_name)
{
- fprintf (stderr,
+ fprintf (stderr,
_("You must specify which zone should be accessed\n"));
return;
}
int
main (int argc, char *const *argv)
{
- nonauthority = -1;
public = -1;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
&GNUNET_GETOPT_set_one, &add},
{'d', "delete", NULL,
gettext_noop ("delete record"), 0,
- &GNUNET_GETOPT_set_one, &del},
+ &GNUNET_GETOPT_set_one, &del},
{'D', "display", NULL,
gettext_noop ("display records"), 0,
- &GNUNET_GETOPT_set_one, &list},
+ &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},
+ &GNUNET_GETOPT_set_string, &expirationstring},
{'m', "monitor", NULL,
gettext_noop ("monitor changes in the namestore"), 0,
- &GNUNET_GETOPT_set_one, &monitor},
+ &GNUNET_GETOPT_set_one, &monitor},
{'n', "name", "NAME",
gettext_noop ("name of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &name},
+ &GNUNET_GETOPT_set_string, &name},
+ {'r', "reverse", "PKEY",
+ gettext_noop ("determine our name for the given PKEY"), 1,
+ &GNUNET_GETOPT_set_string, &reverse_pkey},
{'t', "type", "TYPE",
gettext_noop ("type of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &typestring},
+ &GNUNET_GETOPT_set_string, &typestring},
{'u', "uri", "URI",
gettext_noop ("URI to import into our zone"), 1,
- &GNUNET_GETOPT_set_string, &uri},
+ &GNUNET_GETOPT_set_string, &uri},
{'V', "value", "VALUE",
gettext_noop ("value of the record to add/delete"), 1,
- &GNUNET_GETOPT_set_string, &value},
+ &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},
+ {'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},
{'z', "zone", "EGO",
gettext_noop ("name of the ego controlling the zone"), 1,
- &GNUNET_GETOPT_set_string, &ego_name},
+ &GNUNET_GETOPT_set_string, &ego_name},
GNUNET_GETOPT_OPTION_END
};
GNUNET_log_setup ("gnunet-namestore", "WARNING", NULL);
if (GNUNET_OK !=
GNUNET_PROGRAM_run (argc, argv, "gnunet-namestore",
- _("GNUnet zone manipulation tool"),
+ _("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