*/
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_YES if we must not use the DHT (only local lookup).
+ */
+static int only_cached;
+
/**
* raw output
*/
*/
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;
lookup_name,
pkey,
rtype,
- GNUNET_NO, /* Use DHT */
+ only_cached,
shorten_key,
&process_lookup_result,
lookup_name);
{
fprintf (stderr,
_("Please specify name to lookup!\n"));
- GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
+ GNUNET_SCHEDULER_shutdown ();
return;
}
}
GNUNET_assert (NULL != pkey);
pkeym = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPublicKey);
*pkeym = *pkey;
+ GNUNET_break (NULL == id_op);
id_op = GNUNET_IDENTITY_get (identity,
"gns-short",
&identity_shorten_cb,
const char *name)
{
struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
+ const char *dot;
id_op = NULL;
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);
+ /* if the name is of the form 'label.gnu', never go to the DHT */
+ dot = strchr (lookup_name, '.');
+ if ( (NULL != dot) &&
+ (0 == strcasecmp (dot, ".gnu")) )
+ only_cached = GNUNET_YES;
lookup_with_public_key (&pkey);
}
_("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)
{
}
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;