/*
This file is part of GNUnet.
- (C) 2013 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2013 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
*/
/**
* @file identity/gnunet-identity.c
#include "gnunet_util_lib.h"
#include "gnunet_identity_service.h"
+
+/**
+ * Return value from main on timeout.
+ */
+#define TIMEOUT_STATUS_CODE 40
+
/**
* Handle to IDENTITY service.
*/
*/
static struct GNUNET_IDENTITY_Operation *delete_op;
+/**
+ * Value to return from #main().
+ */
+static int global_ret;
+
/**
* Task run on shutdown.
*
* @param cls NULL
- * @param tc unused
*/
static void
-shutdown_task (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task (void *cls)
{
if (NULL != set_op)
{
{
GNUNET_IDENTITY_cancel (delete_op);
delete_op = NULL;
- }
+ }
GNUNET_IDENTITY_disconnect (sh);
sh = NULL;
}
(NULL == set_op) &&
(NULL == set_ego) &&
(! list) &&
- (! monitor) )
+ (! monitor) )
+ {
+ if (TIMEOUT_STATUS_CODE == global_ret)
+ global_ret = 0;
GNUNET_SCHEDULER_shutdown ();
+ }
}
*op = NULL;
if (NULL != emsg)
+ {
fprintf (stderr,
_("Failed to create ego: %s\n"),
emsg);
+ global_ret = 1;
+ }
test_finished ();
}
{
set_op = NULL;
if (NULL != emsg)
+ {
fprintf (stderr,
_("Failed to set default ego: %s\n"),
emsg);
+ global_ret = 1;
+ }
test_finished ();
}
* '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
+ * 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.
+ * (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,
void **ctx,
const char *identifier)
{
- struct GNUNET_CRYPTO_EccPublicSignKey pk;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pk;
char *s;
if ( (NULL != set_ego) &&
(NULL != ego) &&
(NULL != identifier) &&
- (0 == strcmp (identifier,
+ (0 == strcmp (identifier,
set_ego)) )
{
set_op = GNUNET_IDENTITY_set (sh,
}
if ( (NULL == ego) && (! monitor) )
{
- GNUNET_SCHEDULER_shutdown ();
+ list = 0;
+ test_finished ();
return;
}
if (! (list | monitor))
return;
if (NULL == ego)
return;
- GNUNET_IDENTITY_ego_get_public_key (ego, &pk);
- s = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pk);
- if ( (monitor) || (NULL != identifier) )
- fprintf (stdout, "%s - %s\n", identifier, s);
+ GNUNET_IDENTITY_ego_get_public_key (ego,
+ &pk);
+ s = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pk);
+ if ( (monitor) ||
+ (NULL != identifier) )
+ fprintf (stdout,
+ "%s - %s\n",
+ identifier,
+ s);
GNUNET_free (s);
}
* @param cfg configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
+run (void *cls,
+ char *const *args,
+ const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
if ( (NULL == set_subsystem) ^
"Options -e and -s must always be specified together\n");
return;
}
- sh = GNUNET_IDENTITY_connect (cfg, &print_ego, NULL);
+ sh = GNUNET_IDENTITY_connect (cfg,
+ &print_ego,
+ NULL);
if (NULL != delete_ego)
delete_op = GNUNET_IDENTITY_delete (sh,
delete_ego,
create_ego,
&create_finished,
&create_op);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- &shutdown_task, NULL);
+ GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
+ NULL);
test_finished ();
}
int
main (int argc, char *const *argv)
{
- int res;
+ struct GNUNET_GETOPT_CommandLineOption options[] = {
+ GNUNET_GETOPT_option_string ('C',
+ "create",
+ "NAME",
+ gettext_noop ("create ego NAME"),
+ &create_ego),
+
+ GNUNET_GETOPT_option_string ('D',
+ "delete",
+ "NAME",
+ gettext_noop ("delete ego NAME "),
+ &delete_ego),
+
+ GNUNET_GETOPT_option_flag ('d',
+ "display",
+ gettext_noop ("display all egos"),
+ &list),
+
+ GNUNET_GETOPT_option_string ('e',
+ "ego",
+ "NAME",
+ gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"),
+ &set_ego),
+
+ GNUNET_GETOPT_option_flag ('m',
+ "monitor",
+ gettext_noop ("run in monitor mode egos"),
+ &monitor),
+
+ GNUNET_GETOPT_option_string ('s',
+ "set",
+ "SUBSYSTEM",
+ gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"),
+ &set_subsystem),
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'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},
- {'d', "display", NULL,
- gettext_noop ("display all egos"),
- 0, &GNUNET_GETOPT_set_one, &list},
- {'e', "ego", "NAME",
- gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"),
- 1, &GNUNET_GETOPT_set_string, &set_ego},
- {'m', "monitor", NULL,
- gettext_noop ("run in monitor mode egos"),
- 0, &GNUNET_GETOPT_set_one, &monitor},
- {'s', "set", "SUBSYSYSTEM",
- gettext_noop ("set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"),
- 1, &GNUNET_GETOPT_set_string, &set_subsystem},
GNUNET_GETOPT_OPTION_END
};
+ int res;
- if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
- return 2;
-
- res = GNUNET_PROGRAM_run (argc, argv, "gnunet-identity",
- gettext_noop ("Maintain egos"),
+ if (GNUNET_OK !=
+ GNUNET_STRINGS_get_utf8_args (argc, argv,
+ &argc, &argv))
+ return 4;
+ global_ret = TIMEOUT_STATUS_CODE; /* timeout */
+ res = GNUNET_PROGRAM_run (argc, argv,
+ "gnunet-identity",
+ gettext_noop ("Maintain egos"),
options, &run,
NULL);
GNUNET_free ((void *) argv);
if (GNUNET_OK != res)
- return 1;
- return 0;
+ return 3;
+ return global_ret;
}
/* end of gnunet-identity.c */
projects / oweals / gnunet.git / blobdiff