* @brief command line tool to access distributed GNS
* @author Christian Grothoff
*
- * TODO:
- * - everything
*/
#include "platform.h"
#include <gnunet_util_lib.h>
static enum GNUNET_GNS_RecordType rtype;
+/* Handle to lookup request */
+static struct GNUNET_GNS_LookupRequest *lookup_request;
+
+/* Handle to shorten request */
+static struct GNUNET_GNS_ShortenRequest *shorten_request;
+
+/* Handle to get authority request */
+static struct GNUNET_GNS_GetAuthRequest *getauth_request;
+
+/* shutdown task */
+static GNUNET_SCHEDULER_TaskIdentifier shutdown_task;
+
/**
* Task run on shutdown. Cleans up everything.
*
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != lookup_request)
+ GNUNET_GNS_cancel_lookup_request (lookup_request);
+
+ if (NULL != shorten_request)
+ GNUNET_GNS_cancel_shorten_request (shorten_request);
+
+ if (NULL != getauth_request)
+ GNUNET_GNS_cancel_get_auth_request (getauth_request);
+
if (NULL != gns)
- {
GNUNET_GNS_disconnect (gns);
- gns = NULL;
- }
}
static void
process_shorten_result(void* cls, const char* nshort)
{
+ shorten_request = NULL;
if (raw)
printf("%s", nshort);
else
printf("%s shortened to %s\n", (char*) cls, nshort);
+ GNUNET_SCHEDULER_cancel (shutdown_task);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
char* name = (char*) cls;
const char* typename;
char* string_val;
+ lookup_request = NULL;
if (!raw) {
if (rd_count == 0)
printf("Got %s record: %s\n", typename, string_val);
}
-
+ GNUNET_SCHEDULER_cancel (shutdown_task);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
static void
process_auth_result(void* cls, const char* auth)
{
+ getauth_request = NULL;
printf ("%s\n", auth);
+ GNUNET_SCHEDULER_cancel (shutdown_task);
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
}
struct GNUNET_CRYPTO_RsaPrivateKey *key = NULL;
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded pkey;
struct GNUNET_CRYPTO_ShortHashCode *zone = NULL;
- struct GNUNET_CRYPTO_ShortHashCode *shorten_zone = NULL;
struct GNUNET_CRYPTO_ShortHashCode user_zone;
struct GNUNET_CRYPTO_ShortHashAsciiEncoded zonename;
+ struct GNUNET_CRYPTO_RsaPrivateKey *shorten_key = NULL;
+ struct GNUNET_CRYPTO_RsaPrivateKey *private_key = NULL;
+ struct GNUNET_CRYPTO_ShortHashCode *private_zone = NULL;
+ struct GNUNET_CRYPTO_ShortHashCode *shorten_zone = NULL;
+
+ shorten_request = NULL;
+ lookup_request = NULL;
+ getauth_request = NULL;
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
"ZONEKEY", &keyfile))
}
if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "AUTO_IMPORT_ZONEKEY",
- &keyfile))
+ "SHORTEN_ZONEKEY", &keyfile))
{
if (!raw)
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "No private key for shorten zone found!\n");
- shorten_zone = NULL;
+ "No shorten key found!\n");
+ shorten_key = NULL;
}
else
{
if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
{
- key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
- GNUNET_CRYPTO_rsa_key_get_public (key, &pkey);
+ shorten_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (shorten_key, &pkey);
+ shorten_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
GNUNET_CRYPTO_short_hash(&pkey,
sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
- &user_zone);
- shorten_zone = &user_zone;
+ shorten_zone);
GNUNET_CRYPTO_short_hash_to_enc (shorten_zone, &zonename);
if (!raw)
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Using zone: %s!\n", &zonename);
- GNUNET_CRYPTO_rsa_key_free(key);
+ "Using shorten zone: %s!\n", &zonename);
+
+ }
+ GNUNET_free(keyfile);
+ }
+
+
+ if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
+ "PRIVATE_ZONEKEY", &keyfile))
+ {
+ if (!raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "No private zone key file name specified in configuration!\n");
+ private_key = NULL;
+ }
+ else
+ {
+ if (GNUNET_YES == GNUNET_DISK_file_test (keyfile))
+ {
+ private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
+ GNUNET_CRYPTO_rsa_key_get_public (private_key, &pkey);
+ private_zone = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+ GNUNET_CRYPTO_short_hash(&pkey,
+ sizeof(struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded),
+ private_zone);
+ GNUNET_CRYPTO_short_hash_to_enc (private_zone, &zonename);
+ if (!raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Using private zone: %s!\n", &zonename);
+ }
+ else
+ {
+ /* FIXME: shouldn't we just create the private key in this case? */
+ if (!raw)
+ fprintf (stderr,
+ _("Key file `%s' for private zone does not exist!\n"),
+ keyfile);
+
}
GNUNET_free(keyfile);
+ if (NULL != private_key)
+ {
+ GNUNET_CRYPTO_rsa_key_free (private_key);
+ private_key = NULL;
+ }
}
+
gns = GNUNET_GNS_connect (cfg);
- if (lookup_type != NULL)
- rtype = GNUNET_NAMESTORE_typename_to_number(lookup_type);
+ if (NULL != lookup_type)
+ rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
else
- rtype = GNUNET_GNS_RECORD_TYPE_A;
+ rtype = GNUNET_GNS_RECORD_A;
if (NULL == gns)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Failed to connect to GNS\n"));
+ if (NULL != shorten_key)
+ {
+ GNUNET_CRYPTO_rsa_key_free (shorten_key);
+ shorten_key = NULL;
+ }
return;
}
- if (shorten_name != NULL)
+ if ((NULL != shorten_name) && (NULL != shorten_zone) && (NULL != private_zone))
{
- /** shorten name */
- GNUNET_GNS_shorten_zone (gns, shorten_name,
- zone, shorten_zone,
+ shorten_request = GNUNET_GNS_shorten_zone (gns, shorten_name,
+ private_zone,
+ shorten_zone,
+ zone,
&process_shorten_result,
shorten_name);
}
- if (lookup_name != NULL)
+ if (NULL != lookup_name)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Lookup\n");
- GNUNET_GNS_lookup_zone (gns, lookup_name,
- zone, shorten_zone,
+ lookup_request = GNUNET_GNS_lookup_zone (gns, lookup_name,
+ zone,
rtype,
+ GNUNET_NO, //Use DHT
+ shorten_key,
&process_lookup_result, lookup_name);
}
- if (auth_name != NULL)
+ if (NULL != auth_name)
{
- GNUNET_GNS_get_authority(gns, auth_name, &process_auth_result, auth_name);
+ getauth_request = GNUNET_GNS_get_authority(gns, auth_name,
+ &process_auth_result, auth_name);
}
+
+ if (NULL != shorten_key)
+ GNUNET_CRYPTO_rsa_key_free (shorten_key);
+
+ if (NULL != shorten_zone)
+ GNUNET_free (shorten_zone);
+
+ if (NULL != private_zone)
+ GNUNET_free (private_zone);
- // FIXME: do work here...
- //GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ if ((NULL == auth_name) &&
+ (NULL == shorten_name) &&
+ (NULL == lookup_name))
+ {
+ if (!raw)
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Please specify lookup, shorten or authority operation!\n");
+ GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ return;
+ }
+
+ shutdown_task = GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, NULL);
}
{
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'s', "shorten", NULL,
- gettext_noop ("try to shorten a given GNS name"), 1,
+ gettext_noop ("try to shorten a given name"), 1,
&GNUNET_GETOPT_set_string, &shorten_name},
{'u', "lookup", NULL,
- gettext_noop ("Lookup a record using GNS (NOT IMPLEMENTED)"), 1,
+ 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,
+ 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,
projects / oweals / gnunet.git / blobdiff