static struct GNUNET_GNS_LookupRequest *lookup_request;
/**
- * Handle to the identity service.
+ * Lookup an ego with the identity service.
+ */
+static struct GNUNET_IDENTITY_EgoLookup *el;
+
+/**
+ * Handle for identity service.
*/
static struct GNUNET_IDENTITY_Handle *identity;
+/**
+ * Active operation on identity service.
+ */
+static struct GNUNET_IDENTITY_Operation *id_op;
+
/**
* Task run on shutdown. Cleans up everything.
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- if (NULL != identity)
+ if (NULL != el)
{
- GNUNET_IDENTITY_disconnect (identity);
- identity = NULL;
+ GNUNET_IDENTITY_ego_lookup_cancel (el);
+ el = NULL;
+ }
+ if (NULL != id_op)
+ {
+ GNUNET_IDENTITY_cancel (id_op);
+ id_op = NULL;
}
if (NULL != lookup_request)
{
GNUNET_GNS_lookup_cancel (lookup_request);
lookup_request = NULL;
}
+ if (NULL != identity)
+ {
+ GNUNET_IDENTITY_disconnect (identity);
+ identity = NULL;
+ }
if (NULL != gns)
{
GNUNET_GNS_disconnect (gns);
/**
- * 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,
}
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",
string_val);
printf ("Got `%s' record: %s\n",
typename,
string_val);
- GNUNET_free_non_null (string_val);
+ GNUNET_free (string_val);
}
GNUNET_SCHEDULER_shutdown ();
}
/**
* Perform the actual resolution, starting with the zone
- * identified by the given public key.
+ * identified by the given public key and the shorten zone.
*
- * @param pkey public key to use for the zone
+ * @param pkey public key to use for the zone, can be NULL
+ * @param shorten_key private key used for shortening, can be NULL
*/
static void
-lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicKey *pkey)
+lookup_with_keys (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey,
+ const struct GNUNET_CRYPTO_EccPrivateKey *shorten_key)
{
- char *keyfile;
- struct GNUNET_CRYPTO_EccPrivateKey *shorten_key;
-
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "gns",
- "SHORTEN_ZONEKEY", &keyfile))
- {
- shorten_key = NULL;
- }
- else
- {
- // 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
GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);
return;
}
- GNUNET_free_non_null (shorten_key);
}
/**
- * Method called to inform about the egos of this peer.
- *
- * When used with #GNUNET_IDENTITY_connect, this function is
- * initially called for all egos and then again whenever a
- * ego's name changes or if it is deleted. At the end of
- * the initial pass over all egos, the function is once called
- * with 'NULL' for @a ego. That does NOT mean that the callback won't
- * be invoked in the future or that there was an error.
+ * Method called to with the ego we are to use for shortening
+ * during the lookup.
*
- * If the @a name matches the `zone_ego_name`, we found the zone
- * for our computation and will begin resolving against that zone.
- * If we have iterated over all egos and not found the name, we
- * terminate the program with an error message.
- *
- * @param cls closure (NULL, unused)
- * @param ego ego handle
- * @param ego_ctx context for application to store data for this ego
+ * @param cls closure contains the public key to use
+ * @param ego ego handle, NULL if not found
+ * @param ctx context for application to store data for this ego
* (during the lifetime of this process, initially NULL)
* @param name name assigned by the user for this ego,
* NULL if the user just deleted the ego and it
* must thus no longer be used
*/
static void
-identity_cb (void *cls,
- struct GNUNET_IDENTITY_Ego *ego,
- void **ctx,
- const char *name)
+identity_shorten_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey *pkeym = cls;
+
+ id_op = NULL;
+ if (NULL == ego)
+ lookup_with_keys (pkeym, NULL);
+ else
+ lookup_with_keys (pkeym,
+ GNUNET_IDENTITY_ego_get_private_key (ego));
+ GNUNET_free (pkeym);
+}
+
+
+/**
+ * Perform the actual resolution, starting with the zone
+ * identified by the given public key.
+ *
+ * @param pkey public key to use for the zone
+ */
+static void
+lookup_with_public_key (const struct GNUNET_CRYPTO_EccPublicSignKey *pkey)
{
- struct GNUNET_CRYPTO_EccPublicKey pkey;
-
- if ( (NULL != zone_ego_name) &&
- (NULL != name) &&
- (0 == strcmp (name,
- zone_ego_name)) )
+ struct GNUNET_CRYPTO_EccPublicSignKey *pkeym;
+
+ GNUNET_assert (NULL != pkey);
+ pkeym = GNUNET_new (struct GNUNET_CRYPTO_EccPublicSignKey);
+ *pkeym = *pkey;
+ id_op = GNUNET_IDENTITY_get (identity,
+ "gns-short",
+ &identity_shorten_cb,
+ pkeym);
+ if (NULL == id_op)
+ {
+ GNUNET_break (0);
+ lookup_with_keys (pkey, NULL);
+ }
+}
+
+
+/**
+ * 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
+identity_zone_cb (void *cls,
+ const struct GNUNET_IDENTITY_Ego *ego)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+
+ el = NULL;
+ if (NULL == ego)
+ {
+ fprintf (stderr,
+ _("Ego for `%s' not found, cannot perform lookup.\n"),
+ zone_ego_name);
+ GNUNET_SCHEDULER_shutdown ();
+ }
+ else
{
GNUNET_IDENTITY_ego_get_public_key (ego, &pkey);
lookup_with_public_key (&pkey);
- GNUNET_free (zone_ego_name);
- zone_ego_name = NULL;
- GNUNET_IDENTITY_disconnect (identity);
- identity = NULL;
- return;
}
- if ( (NULL == ego) &&
- (NULL != identity) &&
- (NULL != zone_ego_name) )
+ GNUNET_free_non_null (zone_ego_name);
+ zone_ego_name = NULL;
+}
+
+
+/**
+ * Method called to with the ego we are to use for the lookup,
+ * when the ego is the one for the default master zone.
+ *
+ * @param cls closure (NULL, unused)
+ * @param ego ego handle, NULL if not found
+ * @param ctx context for application to store data for this ego
+ * (during the lifetime of this process, initially NULL)
+ * @param name name assigned by the user for this ego,
+ * NULL if the user just deleted the ego and it
+ * must thus no longer be used
+ */
+static void
+identity_master_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
+
+ id_op = NULL;
+ if (NULL == ego)
{
fprintf (stderr,
- _("Ego `%s' not found\n"),
- zone_ego_name);
- GNUNET_free (zone_ego_name);
- zone_ego_name = NULL;
- GNUNET_IDENTITY_disconnect (identity);
- identity = NULL;
+ _("Ego for `master-zone' 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);
+ lookup_with_public_key (&pkey);
}
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPublicSignKey pkey;
cfg = c;
gns = GNUNET_GNS_connect (cfg);
+ identity = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
if (NULL == gns)
{
fprintf (stderr,
if (NULL != public_key)
{
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_public_key_from_string (public_key,
+ GNUNET_CRYPTO_ecc_public_sign_key_from_string (public_key,
strlen (public_key),
&pkey))
{
}
if (NULL != zone_ego_name)
{
- identity = GNUNET_IDENTITY_connect (cfg,
- &identity_cb,
- NULL);
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
+ zone_ego_name,
+ &identity_zone_cb,
+ NULL);
return;
}
if ( (NULL != lookup_name) &&
&lookup_name[strlen (lookup_name) - 4])) )
{
/* no zone required, use 'anonymous' zone */
- GNUNET_CRYPTO_ecc_key_get_public (GNUNET_CRYPTO_ecc_key_get_anonymous (),
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (GNUNET_CRYPTO_ecc_key_get_anonymous (),
&pkey);
lookup_with_public_key (&pkey);
}
else
{
- fprintf (stderr,
- _("I need a zone (`-p' or `-z' option) to resolve this name\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
+ id_op = GNUNET_IDENTITY_get (identity,
+ "master-zone",
+ &identity_master_cb,
+ NULL);
+ GNUNET_assert (NULL != id_op);
}
}
projects / oweals / gnunet.git / blobdiff