* TODO:
* - allow users to set record options (not just 'RF_AUTHORITY')
* - test
- * - parsing SOA, PTR and MX value specifications (and define format!)
* - add options to list/lookup individual records
*/
#include "platform.h"
#include <gnunet_dnsparser_lib.h>
#include <gnunet_namestore_service.h>
+
/**
* Handle to the namestore.
*/
/**
* Hash of the public key of our zone.
*/
-static GNUNET_HashCode zone;
+static struct GNUNET_CRYPTO_ShortHashCode zone;
/**
* Private key for the our zone.
*/
static int del;
+/**
+ * Is record public
+ */
+static int public;
+
+/**
+ * Is record authority
+ */
+static int nonauthority;
+
/**
* Queue entry for the 'del' operation.
*/
{
if (NULL != ns)
{
- GNUNET_NAMESTORE_disconnect (ns, GNUNET_NO);
+ GNUNET_NAMESTORE_disconnect (ns);
ns = NULL;
}
if (NULL != zone_pkey)
uint32_t type;
void *data = NULL;
size_t data_size = 0;
- struct GNUNET_TIME_Relative etime;
+ struct GNUNET_TIME_Relative etime_rel;
+ struct GNUNET_TIME_Absolute etime_abs;
+ int etime_is_rel = GNUNET_SYSERR;
struct GNUNET_NAMESTORE_RecordData rd;
if (NULL == keyfile)
{
- fprintf (stderr,
- _("Option `%s' not given, but I need a zone key file!\n"),
- "z");
- return;
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "ZONEKEY", &keyfile))
+ {
+ fprintf (stderr,
+ _("Option `%s' not given, but I need a zone key file!\n"),
+ "z");
+ return;
+ }
+ fprintf (stderr,
+ _("Using default zone file `%s'\n"),
+ keyfile);
}
zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
if (! (add|del|list))
{
/* nothing more to be done */
+ fprintf (stderr,
+ _("No options given\n"));
GNUNET_CRYPTO_rsa_key_free (zone_pkey);
zone_pkey = NULL;
return;
}
GNUNET_CRYPTO_rsa_key_get_public (zone_pkey,
&pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &zone);
+ GNUNET_CRYPTO_short_hash (&pub, sizeof (pub), &zone);
ns = GNUNET_NAMESTORE_connect (cfg);
if (NULL == ns)
fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
GNUNET_SCHEDULER_shutdown ();
return;
- } else if (add | del)
+ }
+ if ((NULL == typestring) && (add | del))
{
fprintf (stderr,
_("Missing option `%s' for operation `%s'\n"),
}
if (NULL != expirationstring)
{
- if (GNUNET_OK !=
- GNUNET_STRINGS_fancy_time_to_relative (expirationstring,
- &etime))
+ if (0 == strcmp (expirationstring, "never"))
+ {
+ etime_abs = GNUNET_TIME_UNIT_FOREVER_ABS;
+ etime_is_rel = GNUNET_NO;
+ }
+ else if (GNUNET_OK ==
+ GNUNET_STRINGS_fancy_time_to_relative (expirationstring,
+ &etime_rel))
+ {
+ etime_is_rel = GNUNET_YES;
+ }
+ else if (GNUNET_OK ==
+ GNUNET_STRINGS_fancy_time_to_absolute (expirationstring,
+ &etime_abs))
+ {
+ etime_is_rel = GNUNET_NO;
+ }
+ else
{
fprintf (stderr,
_("Invalid time format `%s'\n"),
GNUNET_SCHEDULER_shutdown ();
return;
}
- } else if (add | del)
+ }
+ else if (add)
{
fprintf (stderr,
_("Missing option `%s' for operation `%s'\n"),
- "-e", _("add/del"));
+ "-e", _("add"));
GNUNET_SCHEDULER_shutdown ();
return;
}
rd.data = data;
rd.data_size = data_size;
rd.record_type = type;
- rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
+ if (GNUNET_YES == etime_is_rel)
+ {
+ rd.expiration_time = etime_rel.rel_value;
+ rd.flags |= GNUNET_NAMESTORE_RF_RELATIVE_EXPIRATION;
+ }
+ else if (GNUNET_NO == etime_is_rel)
+ rd.expiration_time = etime_abs.abs_value;
+ else
+ {
+ fprintf (stderr,
+ _("No valid expiration time for operation `%s'\n"),
+ _("add"));
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ if (1 != nonauthority)
+ rd.flags |= GNUNET_NAMESTORE_RF_AUTHORITY;
+ if (1 != public)
+ rd.flags |= GNUNET_NAMESTORE_RF_PRIVATE;
add_qe = GNUNET_NAMESTORE_record_create (ns,
zone_pkey,
name,
rd.data = data;
rd.data_size = data_size;
rd.record_type = type;
- rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
- rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
+ rd.expiration_time = 0;
+ rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY;
del_qe = GNUNET_NAMESTORE_record_remove (ns,
zone_pkey,
name,
}
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,
- 0, 0,
+ 0,
+ must_not_flags,
&display_record,
NULL);
}
int
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,
gettext_noop ("display records"), 0,
&GNUNET_GETOPT_set_one, &list},
{'e', "expiration", "TIME",
- gettext_noop ("expiration time for record to use (for adding only)"), 1,
+ gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), 1,
&GNUNET_GETOPT_set_string, &expirationstring},
{'n', "name", "NAME",
gettext_noop ("name of the record to add/delete/display"), 1,
{'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},
int ret;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
GNUNET_log_setup ("gnunet-namestore", "WARNING", NULL);
ret =
(GNUNET_OK ==