/*
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
* @brief command line tool to access distributed GNS
* @author Christian Grothoff
*
- * TODO:
- * - everything
*/
#include "platform.h"
#include <gnunet_util_lib.h>
*/
static struct GNUNET_GNS_Handle *gns;
-/**
- * GNS name to shorten. (-s option)
- */
-static char *shorten_name;
-
/**
* GNS name to lookup. (-u option)
*/
static char *lookup_name;
-
/**
* record type to look up (-t option)
*/
static char *lookup_type;
/**
- * name to look up authority for (-a option)
+ * raw output
+ */
+static int raw;
+
+/**
+ * Requested record type.
+ */
+static int rtype;
+
+/**
+ * Handle to lookup request
*/
-static char *auth_name;
+static struct GNUNET_GNS_LookupRequest *lookup_request;
-static enum GNUNET_GNS_RecordType rtype;
/**
* Task run on shutdown. Cleans up everything.
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != lookup_request)
+ {
+ GNUNET_GNS_lookup_cancel (lookup_request);
+ lookup_request = NULL;
+ }
if (NULL != gns)
{
GNUNET_GNS_disconnect (gns);
}
+/**
+ * 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_shorten_result(void* cls, const char* nshort)
-{
- printf("%s shortened to %s\n", (char*) cls, nshort);
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-}
-
-static void
-process_lookup_result(void* cls, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+process_lookup_result (void *cls, uint32_t rd_count,
+ const struct GNUNET_NAMESTORE_RecordData *rd)
{
- int i;
- char* name = (char*) cls;
- const char* typename;
+ const char *name = cls;
+ uint32_t i;
+ const char *typename;
char* string_val;
- if (rd_count == 0)
- printf("No results.\n");
- else
- printf("%s:\n", name);
-
-
-
+ 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);
- printf("Got %s record: %s\n", typename, string_val);
-
+ 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_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_shutdown ();
}
-static void
-process_auth_result(void* cls, const char* auth)
-{
- printf ("%s\n", auth);
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
-}
/**
* Main function that will be run.
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- gns = GNUNET_GNS_connect (cfg);
- if (lookup_type != NULL)
- rtype = GNUNET_NAMESTORE_typename_to_number(lookup_type);
- else
- rtype = GNUNET_GNS_RECORD_TYPE_A;
+ char *keyfile;
+ struct GNUNET_CRYPTO_EccPrivateKey *key;
+ struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
+ gns = GNUNET_GNS_connect (cfg);
if (NULL == gns)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Failed to connect to GNS\n"));
+ fprintf (stderr,
+ _("Failed to connect to GNS\n"));
+ return;
+ }
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "ZONEKEY", &keyfile))
+ {
+ fprintf (stderr,
+ "Need zone to perform lookup in!\n");
+ GNUNET_SCHEDULER_shutdown ();
return;
}
+ /* 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 (shorten_name != NULL)
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "SHORTEN_ZONEKEY", &keyfile))
{
- /** shorten name */
- GNUNET_GNS_shorten(gns, shorten_name, &process_shorten_result,
- shorten_name);
+ shorten_key = NULL;
}
-
- if (lookup_name != NULL)
+ else
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Lookup\n");
- GNUNET_GNS_lookup(gns, lookup_name, rtype,
- &process_lookup_result, lookup_name);
+ // FIXME: use identity service!
+ shorten_key = GNUNET_CRYPTO_ecc_key_create_from_file (keyfile);
+ GNUNET_free (keyfile);
}
+
+ if (NULL != lookup_type)
+ rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ else
+ rtype = GNUNET_DNSPARSER_TYPE_A;
- if (auth_name != NULL)
+ if (NULL != lookup_name)
{
- GNUNET_GNS_get_authority(gns, auth_name, &process_auth_result, auth_name);
+ lookup_request = GNUNET_GNS_lookup (gns,
+ lookup_name,
+ &pkey,
+ rtype,
+ GNUNET_NO, /* Use DHT */
+ shorten_key,
+ &process_lookup_result,
+ lookup_name);
}
-
- // FIXME: do work here...
- //GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ else
+ {
+ fprintf (stderr,
+ _("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[] = {
- {'s', "shorten", NULL,
- gettext_noop ("try to shorten a given GNS name"), 1,
- &GNUNET_GETOPT_set_string, &shorten_name},
- {'u', "lookup", NULL,
- gettext_noop ("Lookup a record using GNS (NOT IMPLEMENTED)"), 1,
+ {'u', "lookup", "NAME",
+ gettext_noop ("Lookup a record for the given name"), 1,
&GNUNET_GETOPT_set_string, &lookup_name},
- {'a', "authority", NULL,
- gettext_noop ("Get the authority of a particular name"), 1,
- &GNUNET_GETOPT_set_string, &auth_name},
- {'t', "type", NULL,
- gettext_noop ("Specify the type of the record lookup"), 1,
+ {'t', "type", "TYPE",
+ 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 access tool"),
+ _("GNUnet GNS resolver tool"),
options,
&run, NULL)) ? 0 : 1;
-
+ GNUNET_free ((void*) argv);
return ret;
}
projects / oweals / gnunet.git / blobdiff