#include <gnunet_util_lib.h>
#include <gnunet_dnsparser_lib.h>
#include <gnunet_identity_service.h>
+#include <gnunet_gnsrecord_lib.h>
#include <gnunet_namestore_service.h>
#include <gnunet_gns_service.h>
*/
static struct GNUNET_GNS_Handle *gns;
+/**
+ * Desired timeout for the lookup (default is no timeout).
+ */
+static struct GNUNET_TIME_Relative timeout;
+
/**
* GNS name to lookup. (-u option)
*/
*/
static char *public_key;
+/**
+ * Set to GNUNET_GNS_LO_LOCAL_MASTER if we are looking up in the master zone.
+ */
+static enum GNUNET_GNS_LocalOptions local_options;
+
/**
* raw output
*/
static int rtype;
/**
- * Handle to lookup request
+ * Handle to lookup request
*/
static struct GNUNET_GNS_LookupRequest *lookup_request;
*/
static void
process_lookup_result (void *cls, uint32_t rd_count,
- const struct GNUNET_NAMESTORE_RecordData *rd)
+ const struct GNUNET_GNSRECORD_Data *rd)
{
const char *name = cls;
uint32_t i;
const char *typename;
char* string_val;
- lookup_request = NULL;
- if (!raw)
+ lookup_request = NULL;
+ if (!raw)
{
if (0 == rd_count)
printf ("No results.\n");
else
- printf ("%s:\n",
+ printf ("%s:\n",
name);
}
for (i=0; i<rd_count; i++)
{
if ( (rd[i].record_type != rtype) &&
- (GNUNET_NAMESTORE_TYPE_ANY != rtype) )
+ (GNUNET_GNSRECORD_TYPE_ANY != rtype) )
continue;
- typename = GNUNET_NAMESTORE_number_to_typename (rd[i].record_type);
- string_val = GNUNET_NAMESTORE_value_to_string (rd[i].record_type,
+ typename = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
+ string_val = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
rd[i].data_size);
if (NULL == string_val)
continue;
}
if (raw)
- printf ("%s\n",
+ printf ("%s\n",
string_val);
else
printf ("Got `%s' record: %s\n",
- typename,
+ typename,
string_val);
GNUNET_free (string_val);
}
* @param shorten_key private key used for shortening, can be NULL
*/
static void
-lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
- const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
+lookup_with_keys (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey,
+ const struct GNUNET_CRYPTO_EcdsaPrivateKey *shorten_key)
{
if (NULL != lookup_type)
- rtype = GNUNET_NAMESTORE_typename_to_number (lookup_type);
+ rtype = GNUNET_GNSRECORD_typename_to_number (lookup_type);
else
rtype = GNUNET_DNSPARSER_TYPE_A;
+ if (UINT32_MAX == rtype)
+ {
+ fprintf (stderr,
+ _("Invalid typename specified, assuming `ANY'\n"));
+ rtype = GNUNET_GNSRECORD_TYPE_ANY;
+ }
if (NULL != lookup_name)
{
- lookup_request = GNUNET_GNS_lookup (gns,
+ lookup_request = GNUNET_GNS_lookup (gns,
lookup_name,
pkey,
rtype,
- GNUNET_NO, /* Use DHT */
+ local_options,
shorten_key,
- &process_lookup_result,
+ &process_lookup_result,
lookup_name);
}
else
{
fprintf (stderr,
_("Please specify name to lookup!\n"));
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
-/**
+/**
* Method called to with the ego we are to use for shortening
* during the lookup.
*
* NULL if the user just deleted the ego and it
* must thus no longer be used
*/
-static void
+static void
identity_shorten_cb (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
void **ctx,
const char *name)
{
- struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls;
+ struct GNUNET_CRYPTO_EcdsaPublicKey *pkeym = cls;
id_op = NULL;
- if (NULL == ego)
+ if (NULL == ego)
lookup_with_keys (pkeym, NULL);
else
lookup_with_keys (pkeym,
* @param pkey public key to use for the zone
*/
static void
-lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
+lookup_with_public_key (const struct GNUNET_CRYPTO_EcdsaPublicKey *pkey)
{
- struct GNUNET_CRYPTO_EccPublicSignKey *pkeym;
+ struct GNUNET_CRYPTO_EcdsaPublicKey *pkeym;
GNUNET_assert (NULL != pkey);
- pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
+ pkeym = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
*pkeym = *pkey;
+ GNUNET_break (NULL == id_op);
id_op = GNUNET_IDENTITY_get (identity,
- "shorten-zone",
+ "gns-short",
&identity_shorten_cb,
pkeym);
if (NULL == id_op)
}
-/**
+/**
* Method called to with the ego we are to use for the lookup,
* when the ego is determined by a name.
*
* @param cls closure (NULL, unused)
* @param ego ego handle, NULL if not found
*/
-static void
+static void
identity_zone_cb (void *cls,
const struct GNUNET_IDENTITY_Ego *ego)
{
- struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
el = NULL;
- if (NULL == ego)
+ if (NULL == ego)
{
fprintf (stderr,
_("Ego for `%s' not found, cannot perform lookup.\n"),
}
-/**
+/**
* Method called to with the ego we are to use for the lookup,
* when the ego is the one for the default master zone.
*
* NULL if the user just deleted the ego and it
* must thus no longer be used
*/
-static void
+static void
identity_master_cb (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
void **ctx,
const char *name)
{
- struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+ const char *dot;
id_op = NULL;
- if (NULL == ego)
+ if (NULL == ego)
{
fprintf (stderr,
- _("Ego for `master-zone' not found, cannot perform lookup. Did you run gnunet-gns-import.sh?\n"));
+ _("Ego for `gns-master' not found, cannot perform lookup. Did you run gnunet-gns-import.sh?\n"));
GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
+ /* main name is our own master zone, do no look for that in the DHT */
+ local_options = GNUNET_GNS_LO_LOCAL_MASTER;
+
+ /* if the name is of the form 'label.gnu', never go to the DHT */
+ dot = NULL;
+ if (NULL != lookup_name)
+ dot = strchr (lookup_name, '.');
+ if ( (NULL != dot) &&
+ (0 == strcasecmp (dot, ".gnu")) )
+ local_options = GNUNET_GNS_LO_NO_DHT;
lookup_with_public_key (&pkey);
}
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
cfg = c;
gns = GNUNET_GNS_connect (cfg);
_("Failed to connect to GNS\n"));
return;
}
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ GNUNET_SCHEDULER_add_delayed (timeout,
&do_shutdown, NULL);
if (NULL != public_key)
{
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (public_key,
strlen (public_key),
&pkey))
{
- fprintf (stderr,
+ fprintf (stderr,
_("Public key `%s' is not well-formed\n"),
public_key);
GNUNET_SCHEDULER_shutdown ();
}
if (NULL != zone_ego_name)
{
- el = GNUNET_IDENTITY_ego_lookup (cfg,
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
zone_ego_name,
&identity_zone_cb,
NULL);
&lookup_name[strlen (lookup_name) - 4])) )
{
/* no zone required, use 'anonymous' zone */
- GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (),
+ GNUNET_CRYPTO_ecdsa_key_get_public (GNUNET_CRYPTO_ecdsa_key_get_anonymous (),
&pkey);
lookup_with_public_key (&pkey);
}
else
{
+ GNUNET_break (NULL == id_op);
id_op = GNUNET_IDENTITY_get (identity,
- "master-zone",
+ "gns-master",
&identity_master_cb,
NULL);
GNUNET_assert (NULL != id_op);
{'t', "type", "TYPE",
gettext_noop ("Specify the type of the record to lookup"), 1,
&GNUNET_GETOPT_set_string, &lookup_type},
+ { 'T', "timeout", "DELAY",
+ gettext_noop ("Specify timeout for the lookup"), 1,
+ &GNUNET_GETOPT_set_relative_time, &timeout },
{'r', "raw", NULL,
gettext_noop ("No unneeded output"), 0,
&GNUNET_GETOPT_set_one, &raw},
};
int ret;
+ timeout = GNUNET_TIME_UNIT_FOREVER_REL;
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
ret =
(GNUNET_OK ==
GNUNET_PROGRAM_run (argc, argv, "gnunet-gns",
- _("GNUnet GNS resolver tool"),
+ _("GNUnet GNS resolver tool"),
options,
&run, NULL)) ? 0 : 1;
GNUNET_free ((void*) argv);
projects / oweals / gnunet.git / blobdiff