-
/*
This file is part of GNUnet.
(C) 2012, 2013 Christian Grothoff (and other contributing authors)
#include <gnunet_dnsparser_lib.h>
#include <gnunet_identity_service.h>
#include <gnunet_gnsrecord_lib.h>
+#include <gnunet_gns_service.h>
#include <gnunet_namestore_service.h>
*/
static struct GNUNET_IDENTITY_EgoLookup *el;
+/**
+ * Identity service handle
+ */
+static struct GNUNET_IDENTITY_Handle *idh;
+
+/**
+ * Obtain default ego
+ */
+struct GNUNET_IDENTITY_Operation *get_default;
+
/**
* Name of the ego controlling the zone.
*/
*/
static int add;
-/**
- * Iterator for the 'add' operation.
- */
-static struct GNUNET_NAMESTORE_ZoneIterator *add_zit;
-
/**
* Queue entry for the 'add-uri' operation.
*/
*/
static struct GNUNET_NAMESTORE_QueueEntry *add_qe;
-/**
- * Queue entry for the 'list' operation (in combination with a name).
- */
-static struct GNUNET_NAMESTORE_QueueEntry *list_qe;
-
/**
* Queue entry for the 'reverse lookup' operation (in combination with a name).
*/
*/
static char *expirationstring;
+/**
+ * Desired nick name.
+ */
+static char *nickstring;
+
/**
* Global return value
*/
do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != get_default)
+ {
+ GNUNET_IDENTITY_cancel (get_default);
+ get_default = NULL;
+ }
+ if (NULL != idh)
+ {
+ GNUNET_IDENTITY_disconnect (idh);
+ idh = NULL;
+ }
if (NULL != el)
{
GNUNET_IDENTITY_ego_lookup_cancel (el);
GNUNET_NAMESTORE_cancel (add_qe);
add_qe = NULL;
}
- if (NULL != list_qe)
- {
- GNUNET_NAMESTORE_cancel (list_qe);
- list_qe = NULL;
- }
if (NULL != add_qe_uri)
{
GNUNET_NAMESTORE_cancel (add_qe_uri);
test_finished ()
{
if ( (NULL == add_qe) &&
- (NULL == list_qe) &&
(NULL == add_qe_uri) &&
(NULL == del_qe) &&
(NULL == reverse_qe) &&
if (GNUNET_NO != success)
ret = 1;
}
+ ret = 0;
test_finished ();
}
const char *emsg)
{
del_qe = NULL;
- if (success != GNUNET_YES)
+ if (GNUNET_NO == success)
+ {
+ fprintf (stderr,
+ _("Deleting record failed, record does not exist%s%s\n"),
+ (NULL != emsg) ? ": " : "",
+ (NULL != emsg) ? emsg : "");
+ }
+ if (GNUNET_SYSERR == success)
+ {
fprintf (stderr,
- _("Deleting record failed: %s\n"),
- emsg);
+ _("Deleting record failed%s%s\n"),
+ (NULL != emsg) ? ": " : "",
+ (NULL != emsg) ? emsg : "");
+ }
test_finished ();
}
*
* @param cls closure
* @param zone_key private key of the zone
- * @param name name that is being mapped (at most 255 characters long)
+ * @param rname name that is being mapped (at most 255 characters long)
* @param rd_len number of entries in @a rd array
* @param rd array of records with data to store
*/
static void
display_record (void *cls,
const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone_key,
- const char *name,
+ const char *rname,
unsigned int rd_len,
const struct GNUNET_GNSRECORD_Data *rd)
{
struct GNUNET_TIME_Absolute at;
struct GNUNET_TIME_Relative rt;
- if (NULL == name)
+ if (NULL == rname)
{
list_it = NULL;
test_finished ();
return;
}
+ if ( (NULL != name) &&
+ (0 != strcmp (name, rname)) )
+ {
+ GNUNET_NAMESTORE_zone_iterator_next (list_it);
+ return;
+ }
FPRINTF (stdout,
"%s:\n",
- name);
+ rname);
for (i=0;i<rd_len;i++)
{
+ if (GNUNET_GNSRECORD_TYPE_NICK == rd[i].record_type)
+ continue;
typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
rd[i].data,
ets = GNUNET_STRINGS_absolute_time_to_string (at);
}
FPRINTF (stdout,
- "\t%s: %s (%s)\n",
+ "\t%s: %s (%s)\t%s\t%s\t%s\n",
typestring,
s,
- ets);
+ ets,
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)) ? "PRIVATE" : "PUBLIC",
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD)) ? "SHADOW" : "",
+ (0 != (rd[i].flags & GNUNET_GNSRECORD_RF_PENDING)) ? "PENDING" : "");
GNUNET_free (s);
}
FPRINTF (stdout, "%s", "\n");
struct GNUNET_GNSRECORD_Data rdn[rd_count + 1];
struct GNUNET_GNSRECORD_Data *rde;
+ add_qe = NULL;
if ( (NULL != zone_key) &&
(0 != strcmp (rec_name, name)) )
{
- GNUNET_NAMESTORE_zone_iterator_next (add_zit);
+ GNUNET_break (0);
return;
}
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received %u records for name `%s'\n",
+ rd_count, rec_name);
+
memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
/* FIXME: should add some logic to overwrite records if there
rde->data = data;
rde->data_size = data_size;
rde->record_type = type;
- if (1 != shadow)
+ if (1 == shadow)
rde->flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
if (1 != public)
rde->flags |= GNUNET_GNSRECORD_RF_PRIVATE;
rde,
&add_continuation,
&add_qe);
- /* only cancel if we were not told that this
- was the end of the iteration already */
- if (NULL != rec_name)
- GNUNET_NAMESTORE_zone_iteration_stop (add_zit);
- add_zit = NULL;
-}
-
-
-
-/**
- * Process a record that was stored in the namestore in a block.
- *
- * @param cls closure, NULL
- * @param rd_len number of entries in @a rd array
- * @param rd array of records with data to store
- */
-static void
-display_records_from_block (void *cls,
- unsigned int rd_len,
- const struct GNUNET_GNSRECORD_Data *rd)
-{
- const char *typestring;
- char *s;
- unsigned int i;
-
- if (0 == rd_len)
- {
- FPRINTF (stdout,
- _("No records found for `%s'"),
- name);
- return;
- }
- FPRINTF (stdout,
- "%s:\n",
- name);
- for (i=0;i<rd_len;i++)
- {
- typestring = GNUNET_GNSRECORD_number_to_typename (rd[i].record_type);
- s = GNUNET_GNSRECORD_value_to_string (rd[i].record_type,
- rd[i].data,
- rd[i].data_size);
- if (NULL == s)
- {
- FPRINTF (stdout, _("\tCorrupt or unsupported record of type %u\n"),
- (unsigned int) rd[i].record_type);
- continue;
- }
- FPRINTF (stdout,
- "\t%s: %s\n",
- typestring,
- s);
- GNUNET_free (s);
- }
- FPRINTF (stdout, "%s", "\n");
-}
-
-
-/**
- * Display block obtained from listing (by name).
- *
- * @param cls NULL
- * @param block NULL if not found
- */
-static void
-handle_block (void *cls,
- const struct GNUNET_GNSRECORD_Block *block)
-{
- struct GNUNET_CRYPTO_EcdsaPublicKey zone_pubkey;
-
- list_qe = NULL;
- GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
- &zone_pubkey);
- if (NULL == block)
- {
- fprintf (stderr,
- "No matching block found\n");
- }
- else if (GNUNET_OK !=
- GNUNET_GNSRECORD_block_decrypt (block,
- &zone_pubkey,
- name,
- &display_records_from_block,
- NULL))
- {
- fprintf (stderr,
- "Failed to decrypt block!\n");
- }
- test_finished ();
}
"namestore");
return;
}
- if (! (add|del|list|(NULL != uri)|(NULL != reverse_pkey)) )
+ if (! (add|del|list|(NULL != nickstring)|(NULL != uri)|(NULL != reverse_pkey)) )
{
/* nothing more to be done */
fprintf (stderr,
ret = 1;
return;
}
- add_zit = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone_pkey,
- &get_existing_record,
- NULL);
+ add_qe = GNUNET_NAMESTORE_records_lookup (ns, &zone_pkey, name,
+ &get_existing_record, NULL );
}
if (del)
{
}
if (list)
{
- if (NULL == name)
- {
- list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
- &zone_pkey,
- &display_record,
- NULL);
- }
- else
- {
- struct GNUNET_HashCode query;
- struct GNUNET_CRYPTO_EcdsaPublicKey zone_pubkey;
-
- GNUNET_CRYPTO_ecdsa_key_get_public (&zone_pkey,
- &zone_pubkey);
- GNUNET_GNSRECORD_query_from_public_key (&zone_pubkey,
- name,
- &query);
- list_qe = GNUNET_NAMESTORE_lookup_block (ns,
- &query,
- &handle_block,
- NULL);
- }
+ list_it = GNUNET_NAMESTORE_zone_iteration_start (ns,
+ &zone_pkey,
+ &display_record,
+ NULL);
}
if (NULL != reverse_pkey)
{
char sname[64];
struct GNUNET_CRYPTO_EcdsaPublicKey pkey;
- if ( (2 != (sscanf (uri,
- "gnunet://gns/%104s/%63s",
- sh,
- sname)) ) ||
- (GNUNET_OK !=
- GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
+ if ( (2 != (sscanf (uri, "gnunet://gns/%52s/%63s", sh, sname)) ) ||
+ (GNUNET_OK != GNUNET_CRYPTO_ecdsa_public_key_from_string (sh, strlen (sh), &pkey)) )
{
fprintf (stderr,
_("Invalid URI `%s'\n"),
rd.expiration_time = etime_abs.abs_value_us;
else
rd.expiration_time = GNUNET_TIME_UNIT_FOREVER_ABS.abs_value_us;
- if (1 != shadow)
+
+ if (1 == shadow)
rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
add_qe_uri = GNUNET_NAMESTORE_records_store (ns,
&zone_pkey,
&add_continuation,
&add_qe_uri);
}
+ if (NULL != nickstring)
+ {
+ if (0 == strlen(nickstring))
+ {
+ fprintf (stderr,
+ _("Invalid nick `%s'\n"),
+ nickstring);
+ GNUNET_SCHEDULER_shutdown ();
+ ret = 1;
+ return;
+ }
+ add_qe_uri = GNUNET_NAMESTORE_set_nick(ns, &zone_pkey, nickstring,
+ &add_continuation, &add_qe_uri);
+ }
if (monitor)
{
zm = GNUNET_NAMESTORE_zone_monitor_start (cfg,
&zone_pkey,
+ GNUNET_YES,
&display_record,
&sync_cb,
NULL);
el = NULL;
if (NULL == ego)
{
- fprintf (stderr,
- _("Ego `%s' not known to identity service\n"),
- ego_name);
+ if (NULL != ego_name)
+ {
+ fprintf (stderr,
+ _("Ego `%s' not known to identity service\n"),
+ ego_name);
+ }
GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
return;
}
zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
- GNUNET_free (ego_name);
+ GNUNET_free_non_null (ego_name);
ego_name = NULL;
GNUNET_CLIENT_service_test ("namestore", cfg,
GNUNET_TIME_UNIT_SECONDS,
}
+static void
+default_ego_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ get_default = NULL;
+ if (NULL == ego)
+ {
+ fprintf (stderr,
+ _("No default ego configured in identity service\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+ else
+ {
+ identity_cb (cls, ego);
+ }
+}
+
+static void
+id_connect_cb (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *name)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ if (NULL == ego)
+ {
+ get_default = GNUNET_IDENTITY_get (idh, "namestore",
+ &default_ego_cb, (void *) cfg);
+ }
+}
+
+
+static void
+testservice_id_task (void *cls, int result)
+{
+ const struct GNUNET_CONFIGURATION_Handle *cfg = cls;
+ if (result != GNUNET_YES)
+ {
+ fprintf (stderr,
+ _("Identity service is not running\n"));
+ GNUNET_SCHEDULER_shutdown ();
+ ret = -1;
+ return;
+ }
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
+ &do_shutdown, (void *) cfg);
+
+ if (NULL == ego_name)
+ {
+ idh = GNUNET_IDENTITY_connect (cfg, &id_connect_cb, (void *) cfg);
+ if (NULL == idh)
+ fprintf (stderr, _("Cannot connect to identity service\n"));
+ ret = -1;
+ return;
+ }
+ el = GNUNET_IDENTITY_ego_lookup (cfg,
+ ego_name,
+ &identity_cb,
+ (void *) cfg);
+}
+
+
/**
* Main function that will be run.
*
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- if (NULL == ego_name)
- {
- fprintf (stderr,
- _("You must specify which zone should be accessed\n"));
- return;
- }
if ( (NULL != args[0]) && (NULL == uri) )
uri = GNUNET_strdup (args[0]);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &do_shutdown, NULL);
- el = GNUNET_IDENTITY_ego_lookup (cfg,
- ego_name,
- &identity_cb,
- (void *) cfg);
+
+ GNUNET_CLIENT_service_test ("identity", cfg,
+ GNUNET_TIME_UNIT_SECONDS,
+ &testservice_id_task,
+ (void *) cfg);
}
main (int argc, char *const *argv)
{
public = -1;
+ shadow = -1;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
{'a', "add", NULL,
{'e', "expiration", "TIME",
gettext_noop ("expiration time for record to use (for adding only), \"never\" is possible"), 1,
&GNUNET_GETOPT_set_string, &expirationstring},
+ {'i', "nick", "NICKNAME",
+ gettext_noop ("set the desired nick name for the zone"), 1,
+ &GNUNET_GETOPT_set_string, &nickstring},
{'m', "monitor", NULL,
gettext_noop ("monitor changes in the namestore"), 0,
&GNUNET_GETOPT_set_one, &monitor},
projects / oweals / gnunet.git / blobdiff