* @author Christian Grothoff
*
* TODO:
- * - printing records
* - allow users to set record options (not just 'RF_AUTHORITY')
* - test
* - parsing SOA, PTR and MX value specifications (and define format!)
/**
* Hash of the public key of our zone.
*/
-static GNUNET_HashCode zone;
+static struct GNUNET_CRYPTO_ShortHashCode zone;
/**
* Private key for the our zone.
* Desired expiration time.
*/
static char *expirationstring;
-
+
/**
* Task run on shutdown. Cleans up everything.
const struct GNUNET_NAMESTORE_RecordData *rd,
const struct GNUNET_CRYPTO_RsaSignature *signature)
{
+ const char *typestring;
+ char *s;
+ unsigned int i;
+
if (NULL == name)
{
list_it = NULL;
GNUNET_SCHEDULER_shutdown ();
return;
}
- // FIXME: display record!
+ FPRINTF (stdout,
+ "%s:\n",
+ name);
+ 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,
+ rd[i].data,
+ rd[i].data_size);
+ if (NULL == s)
+ {
+ FPRINTF (stdout, _("\tCorrupt or unsupported record of type %u\n"),
+ (unsigned int) rd[i].record_type);
+ continue;
+ }
+ FPRINTF (stdout, "\t%s: %s\n", typestring, s);
+ GNUNET_free (s);
+ }
+ FPRINTF (stdout, "%s", "\n");
GNUNET_NAMESTORE_zone_iterator_next (list_it);
}
{
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pub;
uint32_t type;
- const void *data;
- size_t data_size;
- struct in_addr value_a;
- struct in6_addr value_aaaa;
+ void *data = NULL;
+ size_t data_size = 0;
struct GNUNET_TIME_Relative etime;
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 != value)
{
- switch (type)
- {
- case 0:
- fprintf (stderr, _("Need a record type to interpret value `%s'\n"), value);
- GNUNET_SCHEDULER_shutdown ();
- break;
- case GNUNET_DNSPARSER_TYPE_A:
- if (1 != inet_pton (AF_INET, value, &value_a))
- {
- fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
- value,
- typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- data = &value_a;
- data_size = sizeof (value_a);
- break;
- case GNUNET_DNSPARSER_TYPE_NS:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_CNAME:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_SOA:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_PTR:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_MX:
- // FIXME
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_TXT:
- data = value;
- data_size = strlen (value);
- break;
- case GNUNET_DNSPARSER_TYPE_AAAA:
- if (1 != inet_pton (AF_INET6, value, &value_aaaa))
+ if (GNUNET_OK !=
+ GNUNET_NAMESTORE_string_to_value (type,
+ value,
+ &data,
+ &data_size))
{
fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
value,
GNUNET_SCHEDULER_shutdown ();
return;
}
- data = &value_aaaa;
- data_size = sizeof (value_aaaa);
- break;
- case GNUNET_NAMESTORE_TYPE_PKEY:
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_NAMESTORE_TYPE_PSEU:
- data = value;
- data_size = strlen (value);
- break;
- default:
- GNUNET_assert (0);
- }
} else if (add | del)
{
fprintf (stderr,
rd.record_type = type;
rd.expiration = GNUNET_TIME_relative_to_absolute (etime);
rd.flags = GNUNET_NAMESTORE_RF_AUTHORITY; // FIXME: not always...
- del_qe = GNUNET_NAMESTORE_record_create (ns,
+ del_qe = GNUNET_NAMESTORE_record_remove (ns,
zone_pkey,
name,
&rd,
&display_record,
NULL);
}
+ GNUNET_free_non_null (data);
}
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'a', "add", NULL,
gettext_noop ("add record"), 0,
- &GNUNET_GETOPT_set_one, &add},
+ &GNUNET_GETOPT_set_one, &add},
{'d', "delete", NULL,
gettext_noop ("delete record"), 0,
&GNUNET_GETOPT_set_one, &del},
gettext_noop ("display records"), 0,
&GNUNET_GETOPT_set_one, &list},
{'e', "expiration", "TIME",
- gettext_noop ("expiration time to use (for adding only)"), 1,
+ gettext_noop ("expiration time for record to use (for adding only)"), 1,
&GNUNET_GETOPT_set_string, &expirationstring},
{'n', "name", "NAME",
gettext_noop ("name of the record to add/delete/display"), 1,