summaryrefslogtreecommitdiff
path: root/src/identity/gnunet-identity.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/identity/gnunet-identity.c')
-rw-r--r--src/identity/gnunet-identity.c174
1 files changed, 166 insertions, 8 deletions
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index 77ba6c2cd..15cb17d1b 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -19,7 +19,7 @@
*/
/**
* @file identity/gnunet-identity.c
- * @brief IDENTITY monitoring command line tool
+ * @brief IDENTITY management command line tool
* @author Christian Grothoff
*/
#include "platform.h"
@@ -32,9 +32,34 @@
static struct GNUNET_IDENTITY_Handle *sh;
/**
- * Was verbose specified?
+ * Was "list" specified?
*/
-static int verbose;
+static int list;
+
+/**
+ * Was "monitor" specified?
+ */
+static int monitor;
+
+/**
+ * -C option
+ */
+static char *create_ego;
+
+/**
+ * -D option
+ */
+static char *delete_ego;
+
+/**
+ * Handle for create operation.
+ */
+static struct GNUNET_IDENTITY_Operation *create_op;
+
+/**
+ * Handle for delete operation.
+ */
+static struct GNUNET_IDENTITY_Operation *delete_op;
/**
@@ -52,6 +77,119 @@ shutdown_task (void *cls,
}
+
+/**
+ * Test if we are finished yet.
+ */
+static void
+test_finished ()
+{
+ if ( (NULL == create_op) &&
+ (NULL == delete_op) &&
+ (! list) &&
+ (! monitor) )
+ GNUNET_SCHEDULER_shutdown ();
+}
+
+
+/**
+ * Deletion operation finished.
+ *
+ * @param cls pointer to operation handle
+ * @param emsg NULL on success, otherwise an error message
+ */
+static void
+delete_finished (void *cls,
+ const char *emsg)
+{
+ struct GNUNET_IDENTITY_Operation **op = cls;
+
+ *op = NULL;
+ if (NULL != emsg)
+ fprintf (stderr,
+ "%s\n",
+ gettext (emsg));
+ test_finished ();
+}
+
+
+/**
+ * Creation operation finished.
+ *
+ * @param cls pointer to operation handle
+ * @param ego ego handle
+ * @param ego_ctx context for application to store data for this ego
+ * (during the lifetime of this process, initially NULL)
+ * @param identifier identifier assigned by the user for this ego
+ */
+static void
+create_finished (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *identifier)
+{
+ struct GNUNET_IDENTITY_Operation **op = cls;
+
+ *op = NULL;
+ if (NULL == ego)
+ fprintf (stderr,
+ "%s\n",
+ _("Failed to create ego\n"));
+ test_finished ();
+}
+
+
+/**
+ * If listing is enabled, prints information about the egos.
+ *
+ * This function is initially called for all egos and then again
+ * whenever a ego's identifier changes or if it is deleted. At the
+ * end of the initial pass over all egos, the function is once called
+ * with 'NULL' for 'ego'. That does NOT mean that the callback won't
+ * be invoked in the future or that there was an error.
+ *
+ * When used with 'GNUNET_IDENTITY_create' or 'GNUNET_IDENTITY_get',
+ * this function is only called ONCE, and 'NULL' being passed in
+ * 'ego' does indicate an error (i.e. name is taken or no default
+ * value is known). If 'ego' is non-NULL and if '*ctx'
+ * is set in those callbacks, the value WILL be passed to a subsequent
+ * call to the identity callback of 'GNUNET_IDENTITY_connect' (if
+ * that one was not NULL).
+ *
+ * When an identity is renamed, this function is called with the
+ * (known) ego but the NEW identifier.
+ *
+ * When an identity is deleted, this function is called with the
+ * (known) ego and "NULL" for the 'identifier'. In this case,
+ * the 'ego' is henceforth invalid (and the 'ctx' should also be
+ * cleaned up).
+ *
+ * @param cls closure
+ * @param ego ego handle
+ * @param ego_ctx context for application to store data for this ego
+ * (during the lifetime of this process, initially NULL)
+ * @param identifier identifier 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
+print_ego (void *cls,
+ struct GNUNET_IDENTITY_Ego *ego,
+ void **ctx,
+ const char *identifier)
+{
+
+ if (! (list | monitor))
+ return;
+ if ( (NULL == ego) && (! monitor) )
+ {
+ GNUNET_SCHEDULER_shutdown ();
+ return;
+ }
+ fprintf (stderr, "%s\n", identifier);
+}
+
+
/**
* Main function that will be run by the scheduler.
*
@@ -64,9 +202,20 @@ static void
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- sh = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
+ sh = GNUNET_IDENTITY_connect (cfg, &print_ego, NULL);
+ if (NULL != delete_ego)
+ delete_op = GNUNET_IDENTITY_delete (sh,
+ delete_ego,
+ &delete_finished,
+ &delete_op);
+ if (NULL != create_ego)
+ create_op = GNUNET_IDENTITY_create (sh,
+ create_ego,
+ &create_finished,
+ &create_op);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&shutdown_task, NULL);
+ test_finished ();
}
@@ -83,9 +232,18 @@ main (int argc, char *const *argv)
int res;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'V', "verbose", NULL,
- gettext_noop ("verbose output"),
- 0, &GNUNET_GETOPT_set_one, &verbose},
+ {'C', "create", "NAME",
+ gettext_noop ("create ego NAME"),
+ 1, &GNUNET_GETOPT_set_string, &create_ego},
+ {'D', "delete", "NAME",
+ gettext_noop ("delete ego NAME "),
+ 1, &GNUNET_GETOPT_set_string, &delete_ego},
+ {'L', "list", NULL,
+ gettext_noop ("list all egos"),
+ 0, &GNUNET_GETOPT_set_one, &list},
+ {'m', "monitor", NULL,
+ gettext_noop ("run in monitor mode egos"),
+ 0, &GNUNET_GETOPT_set_one, &monitor},
GNUNET_GETOPT_OPTION_END
};
@@ -93,7 +251,7 @@ main (int argc, char *const *argv)
return 2;
res = GNUNET_PROGRAM_run (argc, argv, "gnunet-identity",
- gettext_noop ("Print information about IDENTITY state"),
+ gettext_noop ("Maintain egos"),
options, &run,
NULL);
GNUNET_free ((void *) argv);