/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012-2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
*/
/**
* @file gnunet-gns.c
- * @brief command line tool to manipulate the local zone
+ * @brief command line tool to access distributed GNS
* @author Christian Grothoff
*
- * TODO:
- * - everything
*/
#include "platform.h"
#include <gnunet_util_lib.h>
#include <gnunet_dnsparser_lib.h>
#include <gnunet_namestore_service.h>
+#include <gnunet_gns_service.h>
/**
- * Handle to the namestore.
+ * Handle to GNS service.
*/
-static struct GNUNET_NAMESTORE_Handle *ns;
+static struct GNUNET_GNS_Handle *gns;
/**
- * Hash of the public key of our zone.
+ * GNS name to lookup. (-u option)
*/
-static GNUNET_HashCode zone;
+static char *lookup_name;
/**
- * Private key for the our zone.
+ * record type to look up (-t option)
*/
-static struct GNUNET_CRYPTO_RsaPrivateKey *zone_pkey;
+static char *lookup_type;
/**
- * Keyfile to manipulate.
+ * raw output
*/
-static char *keyfile;
+static int raw;
/**
- * Desired action is to add a record.
+ * Requested record type.
*/
-static int add;
+static int rtype;
/**
- * Desired action is to list records.
+ * Handle to lookup request
*/
-static int list;
+static struct GNUNET_GNS_LookupRequest *lookup_request;
-/**
- * Desired action is to remove a record.
- */
-static int del;
-
-/**
- * Name of the records to add/list/remove.
- */
-static char *name;
-
-/**
- * Value of the record to add/remove.
- */
-static char *value;
-
-/**
- * Type of the record to add/remove, NULL to remove all.
- */
-static char *typestring;
-
-/**
- * Desired expiration time.
- */
-static char *expirationstring;
-
/**
* Task run on shutdown. Cleans up everything.
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != ns)
+ if (NULL != lookup_request)
{
- GNUNET_NAMESTORE_disconnect (ns, GNUNET_NO);
- ns = NULL;
+ GNUNET_GNS_lookup_cancel (lookup_request);
+ lookup_request = NULL;
}
- if (NULL != zone_pkey)
+ if (NULL != gns)
{
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
+ GNUNET_GNS_disconnect (gns);
+ gns = NULL;
}
}
+/**
+ * Function called with the result of a GADS lookup.
+ *
+ * @param cls the 'const char *' name that was resolved
+ * @param rd_count number of records returned
+ * @param rd array of 'rd_count' records with the results
+ */
+static void
+process_lookup_result (void *cls, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
+{
+ const char *name = cls;
+ uint32_t i;
+ const char *typename;
+ char* string_val;
+
+ lookup_request = NULL;
+ if (!raw)
+ {
+ if (0 == rd_count)
+ printf ("No results.\n");
+ else
+ printf ("%s:\n",
+ name);
+ }
+ for (i=0; i<rd_count; i++)
+ {
+ typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ rd[i].data,
+ rd[i].data_size);
+ if (raw)
+ printf ("%s\n",
+ string_val);
+ else
+ printf ("Got `%s' record: %s\n",
+ typename,
+ string_val);
+ GNUNET_free_non_null (string_val);
+ }
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
/**
* Main function that will be run.
*
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- 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;
- struct GNUNET_TIME_Relative etime;
+ char *keyfile;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
- if (NULL == keyfile)
+ gns = GNUNET_GNS_connect (cfg);
+ if (NULL == gns)
{
fprintf (stderr,
- _("Option `%s' not given, but I need a zone key file!\n"),
- "z");
+ _("Failed to connect to GNS\n"));
return;
}
- zone_pkey = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_free (keyfile);
- keyfile = NULL;
- if (! (add|del|list))
- {
- /* nothing more to be done */
- GNUNET_CRYPTO_rsa_key_free (zone_pkey);
- zone_pkey = NULL;
- return;
- }
- if (NULL == zone_pkey)
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "ZONEKEY", &keyfile))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to read or create private zone key\n"));
+ fprintf (stderr,
+ "Need zone to perform lookup in!\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- GNUNET_CRYPTO_rsa_key_get_public (zone_pkey,
- &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &zone);
-
- ns = GNUNET_NAMESTORE_connect (cfg);
- if (NULL == ns)
+ /* FIXME: use identity service and/or allow user to specify public key! */
+ key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_ecc_key_free (key);
+ GNUNET_free (keyfile);
+
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "SHORTEN_ZONEKEY", &keyfile))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to namestore\n"));
- return;
+ shorten_key = NULL;
}
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
- if (NULL == typestring)
- type = 0;
else
- type = GNUNET_NAMESTORE_typename_to_number (typestring);
- if (UINT32_MAX == type)
{
- fprintf (stderr, _("Unsupported type `%s'\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- } else if (add)
- {
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-t", _("add"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ // FIXME: use identity service!
+ shorten_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ GNUNET_free (keyfile);
}
- 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:
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_PTR:
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_DNSPARSER_TYPE_MX:
- 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))
- {
- fprintf (stderr, _("Value `%s' invalid for record type `%s'\n"),
- value,
- typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- data = &value_aaaa;
- data_size = sizeof (value_aaaa);
- break;
- case GNUNET_GNS_TYPE_PKEY:
- fprintf (stderr, _("Record type `%s' not implemented yet\n"), typestring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- case GNUNET_GNS_TYPE_PSEU:
- data = value;
- data_size = strlen (value);
- break;
- default:
- GNUNET_assert (0);
- }
- } else if (add)
+
+ if (NULL != lookup_type)
+ rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ else
+ rtype = GNUNET_DNSPARSER_TYPE_A;
+
+ if (NULL != lookup_name)
{
- fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-V", _("add"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ lookup_request = GNUNET_GNS_lookup (gns,
+ lookup_name,
+ &pkey,
+ rtype,
+ GNUNET_NO, /* Use DHT */
+ shorten_key,
+ &process_lookup_result,
+ lookup_name);
}
- if (NULL != expirationstring)
- {
- if (GNUNET_OK !=
- GNUNET_STRINGS_fancy_time_to_relative (expirationstring,
- &etime))
- {
- fprintf (stderr,
- _("Invalid time format `%s'\n"),
- expirationstring);
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- } else if (add)
+ else
{
fprintf (stderr,
- _("Missing option `%s' for operation `%s'\n"),
- "-e", _("add"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
- if (add)
- {
- // FIXME
- }
- if (del)
- {
- // FIXME
- }
- if (list)
- {
- // FIXME
+ _("Please specify name to lookup!\n"));
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
}
+ if (NULL != shorten_key)
+ GNUNET_CRYPTO_ecc_key_free (shorten_key);
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, NULL);
}
main (int argc, char *const *argv)
{
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 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,
- &GNUNET_GETOPT_set_string, &name},
+ {'u', "lookup", "NAME",
+ gettext_noop ("Lookup a record for the given name"), 1,
+ &GNUNET_GETOPT_set_string, &lookup_name},
{'t', "type", "TYPE",
- gettext_noop ("type of the record to add/delete/display"), 1,
- &GNUNET_GETOPT_set_string, &typestring},
- {'V', "value", "VALUE",
- gettext_noop ("value of the record to add/delete"), 1,
- &GNUNET_GETOPT_set_string, &value},
- {'z', "zonekey", "FILENAME",
- gettext_noop ("filename with the zone key"), 1,
- &GNUNET_GETOPT_set_string, &keyfile},
+ gettext_noop ("Specify the type of the record to lookup"), 1,
+ &GNUNET_GETOPT_set_string, &lookup_type},
+ {'r', "raw", NULL,
+ gettext_noop ("No unneeded output"), 0,
+ &GNUNET_GETOPT_set_one, &raw},
GNUNET_GETOPT_OPTION_END
};
-
int ret;
+ if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ return 2;
+
GNUNET_log_setup ("gnunet-gns", "WARNING", NULL);
ret =
(GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "gnunet-gns",
- _("GNUnet GNS zone manipulation tool"),
+ _("GNUnet GNS resolver tool"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff