static int rtype;
/**
- * Handle to lookup request
+ * Handle to lookup request
*/
static struct GNUNET_GNS_LookupRequest *lookup_request;
/**
- * Function called with the result of a GADS lookup.
+ * Function called with the result of a GNS 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
+ * @param rd array of @a rd_count records with the results
*/
static void
process_lookup_result (void *cls, uint32_t rd_count,
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) )
+ continue;
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 (NULL == string_val)
+ {
+ fprintf (stderr,
+ "Record %u of type %d malformed, skipping\n",
+ (unsigned int) i,
+ (int) rd[i].record_type);
+ continue;
+ }
if (raw)
- printf ("%s\n",
+ printf ("%s\n",
string_val);
else
printf ("Got `%s' record: %s\n",
- typename,
+ typename,
string_val);
- GNUNET_free_non_null (string_val);
+ GNUNET_free (string_val);
}
GNUNET_SCHEDULER_shutdown ();
}
* @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);
if (NULL != lookup_name)
{
- lookup_request = GNUNET_GNS_lookup (gns,
+ lookup_request = GNUNET_GNS_lookup (gns,
lookup_name,
pkey,
rtype,
GNUNET_NO, /* Use DHT */
shorten_key,
- &process_lookup_result,
+ &process_lookup_result,
lookup_name);
}
else
}
-/**
+/**
* 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;
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;
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"));
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);
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);
}
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);