X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Farm%2Fgnunet-arm.c;h=3b024ea93f183b41ebea20bb91df2f2ae6daece6;hb=4ab32191fbd53680ff5192fc7d53a21c67ae772d;hp=4e54a490cb15381b8abd81f0eed09cc21bfae549;hpb=95daec0a418692408dadb9d0071b717295dde047;p=oweals%2Fgnunet.git diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c index 4e54a490c..3b024ea93 100644 --- a/src/arm/gnunet-arm.c +++ b/src/arm/gnunet-arm.c @@ -1,6 +1,6 @@ /* This file is part of GNUnet. - (C) 2009 Christian Grothoff (and other contributing authors) + Copyright (C) 2009, 2012, 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 @@ -14,8 +14,8 @@ 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. */ /** @@ -25,35 +25,8 @@ */ #include "platform.h" #include "gnunet_arm_service.h" -#include "gnunet_client_lib.h" #include "gnunet_constants.h" -#include "gnunet_getopt_lib.h" -#include "gnunet_program_lib.h" -#include "gnunet_time_lib.h" - -/** - * Timeout for stopping services. Long to give some services a real chance. - */ -#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 1) - -/** - * Timeout for stopping ARM. Extra-long since ARM needs to stop everyone else. - */ -#define STOP_TIMEOUT_ARM GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 3) - -/** - * Timeout for starting services, very short because of the strange way start works - * (by checking if running before starting, so really this time is always waited on - * startup (annoying)). - */ -#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 1000) - -/** - * Timeout for starting services, very short because of the strange way start works - * (by checking if running before starting, so really this time is always waited on - * startup (annoying)). - */ -#define TEST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2) +#include "gnunet_util_lib.h" /** * Set if we are to shutdown all services (including ARM). @@ -80,6 +53,16 @@ static int delete; */ static int quiet; +/** + * Monitor ARM activity. + */ +static int monitor; + +/** + * Set if we should print a list of currently running services. + */ +static int list; + /** * Set to the name of a service to start. */ @@ -90,11 +73,6 @@ static char *init; */ static char *term; -/** - * Set to the name of a service to test. - */ -static char *test; - /** * Set to the name of the config file used. */ @@ -115,10 +93,15 @@ static int ret; */ static struct GNUNET_ARM_Handle *h; +/** + * Monitor connection with ARM. + */ +static struct GNUNET_ARM_MonitorHandle *m; + /** * Our configuration. */ -const struct GNUNET_CONFIGURATION_Handle *cfg; +static struct GNUNET_CONFIGURATION_Handle *cfg; /** * Processing stage that we are in. Simple counter. @@ -127,234 +110,635 @@ static unsigned int phase; /** * User defined timestamp for completing operations. + * FIXME: to be implemented! */ static struct GNUNET_TIME_Relative timeout; +/** + * Do we want to give our stdout to gnunet-service-arm? + */ +static unsigned int no_stdout; + +/** + * Do we want to give our stderr to gnunet-service-arm? + */ +static unsigned int no_stderr; + +/** + * Handle for the task running the #action_loop(). + */ +static struct GNUNET_SCHEDULER_Task *al_task; + +/** + * Current operation. + */ +static struct GNUNET_ARM_Operation *op; + +/** + * Attempts to delete configuration file and GNUNET_HOME + * on ARM shutdown provided the end and delete options + * were specified when gnunet-arm was run. + */ +static void +delete_files () +{ + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Will attempt to remove configuration file %s and service directory %s\n", + config_file, dir); + + if (0 != UNLINK (config_file)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Failed to remove configuration file %s\n"), + config_file); + } + if (GNUNET_OK != GNUNET_DISK_directory_remove (dir)) + { + GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + _("Failed to remove servicehome directory %s\n"), + dir); + + } +} + /** * Main continuation-passing-style loop. Runs the various * jobs that we've been asked to do in order. * * @param cls closure, unused - * @param tc context, unused */ static void -cps_loop (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc); +shutdown_task (void *cls) +{ + if (NULL != al_task) + { + GNUNET_SCHEDULER_cancel (al_task); + al_task = NULL; + } + if (NULL != op) + { + GNUNET_ARM_operation_cancel (op); + op = NULL; + } + if (NULL != h) + { + GNUNET_ARM_disconnect (h); + h = NULL; + } + if (NULL != m) + { + GNUNET_ARM_monitor_stop (m); + m = NULL; + } + if ((GNUNET_YES == end) && (GNUNET_YES == delete)) + delete_files (); + GNUNET_CONFIGURATION_destroy (cfg); + cfg = NULL; +} + + +/** + * Returns a string interpretation of 'rs' + * + * @param rs the request status from ARM + * @return a string interpretation of the request status + */ +static const char * +req_string (enum GNUNET_ARM_RequestStatus rs) +{ + switch (rs) + { + case GNUNET_ARM_REQUEST_SENT_OK: + return _("Message was sent successfully"); + case GNUNET_ARM_REQUEST_CONFIGURATION_ERROR: + return _("Misconfiguration (can not connect to the ARM service)"); + case GNUNET_ARM_REQUEST_DISCONNECTED: + return _("We disconnected from ARM before we could send a request"); + case GNUNET_ARM_REQUEST_BUSY: + return _("ARM API is busy"); + case GNUNET_ARM_REQUEST_TIMEOUT: + return _("Request timed out"); + } + return _("Unknown request status"); +} + + +/** + * Returns a string interpretation of the 'result' + * + * @param result the arm result + * @return a string interpretation + */ +static const char * +ret_string (enum GNUNET_ARM_Result result) +{ + switch (result) + { + case GNUNET_ARM_RESULT_STOPPED: + return _("%s is stopped"); + case GNUNET_ARM_RESULT_STARTING: + return _("%s is starting"); + case GNUNET_ARM_RESULT_STOPPING: + return _("%s is stopping"); + case GNUNET_ARM_RESULT_IS_STARTING_ALREADY: + return _("%s is starting already"); + case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY: + return _("%s is stopping already"); + case GNUNET_ARM_RESULT_IS_STARTED_ALREADY: + return _("%s is started already"); + case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY: + return _("%s is stopped already"); + case GNUNET_ARM_RESULT_IS_NOT_KNOWN: + return _("%s service is not known to ARM"); + case GNUNET_ARM_RESULT_START_FAILED: + return _("%s service failed to start"); + case GNUNET_ARM_RESULT_IN_SHUTDOWN: + return _("%s service cannot be started because ARM is shutting down"); + } + return _("%.s Unknown result code."); +} /** - * Callback invoked with the status of the last operation. Reports to the - * user and then runs the next phase in the FSM. + * Main task that runs our various operations in order. * - * @param cls pointer to "const char*" identifying service that was manipulated - * @param success GNUNET_OK if service is now running, GNUNET_NO if not, GNUNET_SYSERR on error + * @param cls closure */ static void -confirm_cb (void *cls, int success) +action_loop (void *cls); + + +/** + * Function called whenever we connect to or disconnect from ARM. + * Termiantes the process if we fail to connect to the service on + * our first attempt. + * + * @param cls closure + * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected, + * #GNUNET_SYSERR on error. + */ +static void +conn_status (void *cls, + int connected) { - const char *service = cls; - switch (success) - { - case GNUNET_OK: - if (quiet != GNUNET_YES) - fprintf(stdout, _("Service `%s' has been started.\n"), service); - if ((phase - 1 != 2) && (phase - 1 != 3)) - { - if (quiet != GNUNET_YES) - fprintf(stdout, _("Failed to stop service `%s'!\n"), service); - ret = 1; - } - break; - case GNUNET_NO: - if (quiet != GNUNET_YES) - fprintf(stdout, _("Service `%s' has been stopped.\n"), service); - if ((phase - 1 != 0) && (phase - 1 != 1)) - { - if (quiet != GNUNET_YES) - fprintf(stdout, _("Failed to start service `%s'!\n"), service); - ret = 1; - } - break; - case GNUNET_SYSERR: - if (quiet != GNUNET_YES) - fprintf(stdout, - _("Some error communicating with service `%s'.\n"), service); - ret = 1; - break; - } + static int once; - GNUNET_SCHEDULER_add_continuation (&cps_loop, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + if ( (GNUNET_SYSERR == connected) && + (0 == once) ) + { + GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + _("Fatal error initializing ARM API.\n")); + GNUNET_SCHEDULER_shutdown (); + return; + } + once = 1; } /** - * Function called to confirm that a service is running (or that - * it is not running). + * We have requested ARM to be started, this function + * is called with the result of the operation. Informs the + * use of the result; on success, we continue with the event + * loop, on failure we terminate the process. * - * @param cls pointer to "const char*" identifying service that was manipulated - * @param tc reason determines if service is now running + * @param cls closure unused + * @param rs what happened to our request + * @param result if the request was processed, this is the result + * according to ARM */ static void -confirm_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) +start_callback (void *cls, + enum GNUNET_ARM_RequestStatus rs, + enum GNUNET_ARM_Result result) { - const char *service = cls; + char *msg; - if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_PREREQ_DONE)) - { - if (quiet != GNUNET_YES) - fprintf(stdout, _("Service `%s' is running.\n"), service); - } - else - { - if (quiet != GNUNET_YES) - fprintf(stdout, _("Service `%s' is not running.\n"), service); - } - GNUNET_SCHEDULER_add_continuation (&cps_loop, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + op = NULL; + if (GNUNET_ARM_REQUEST_SENT_OK != rs) + { + GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n")); + FPRINTF (stdout, msg, req_string (rs)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + if ( (GNUNET_ARM_RESULT_STARTING != result) && + (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result) ) + { + GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n")); + FPRINTF (stdout, msg, ret_string (result)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM service [re]start successful\n"); + start = 0; + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } /** - * Main function that will be run by the scheduler. + * We have requested ARM to be stopped, this function + * is called with the result of the operation. Informs the + * use of the result; on success, we continue with the event + * loop, on failure we terminate the process. * - * @param cls closure - * @param args remaining command-line arguments - * @param cfgfile name of the configuration file used (for saving, can be NULL!) - * @param c configuration + * @param cls closure unused + * @param rs what happened to our request + * @param result if the request was processed, this is the result + * according to ARM */ static void -run (void *cls, - char *const *args, - const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *c) +stop_callback (void *cls, + enum GNUNET_ARM_RequestStatus rs, + enum GNUNET_ARM_Result result) { - cfg = c; - config_file = cfgfile; - if (GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "SERVICEHOME", &dir) != GNUNET_OK) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Fatal configuration error: `%s' option in section `%s' missing.\n"), - "SERVICEHOME", - "PATHS"); - return; - } - h = GNUNET_ARM_connect (cfg, NULL); - if (h == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Fatal error initializing ARM API.\n")); - ret = 1; - return; - } - GNUNET_SCHEDULER_add_continuation (&cps_loop, - NULL, - GNUNET_SCHEDULER_REASON_PREREQ_DONE); + char *msg; + + op = NULL; + if (GNUNET_ARM_REQUEST_SENT_OK != rs) + { + GNUNET_asprintf (&msg, "%s", + _("Failed to send a stop request to the ARM service: %s\n")); + FPRINTF (stdout, msg, req_string (rs)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + if ((GNUNET_ARM_RESULT_STOPPING != result) && + (GNUNET_ARM_RESULT_STOPPED != result) && + (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) + { + GNUNET_asprintf (&msg, "%s", + _("Failed to stop the ARM service: %s\n")); + FPRINTF (stdout, msg, ret_string (result)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "ARM service shutdown successful\n"); + end = 0; + if (restart) + { + restart = 0; + start = 1; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Initiating an ARM restart\n"); + } + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } + /** - * Attempts to delete configuration file and SERVICEHOME - * on arm shutdown provided the end and delete options - * were specified when gnunet-arm was run. + * We have requested a service to be started, this function + * is called with the result of the operation. Informs the + * use of the result; on success, we continue with the event + * loop, on failure we terminate the process. + * + * @param cls closure unused + * @param rs what happened to our request + * @param result if the request was processed, this is the result + * according to ARM */ -static void delete_files() +static void +init_callback (void *cls, + enum GNUNET_ARM_RequestStatus rs, + enum GNUNET_ARM_Result result) { - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Will attempt to remove configuration file %s and service directory %s\n", config_file, dir); + char *msg; - if (UNLINK(config_file) != 0) + op = NULL; + if (GNUNET_ARM_REQUEST_SENT_OK != rs) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to remove configuration file %s\n"), config_file); + GNUNET_asprintf (&msg, + _("Failed to send a request to start the `%s' service: %%s\n"), + init); + FPRINTF (stdout, msg, req_string (rs)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + if ((GNUNET_ARM_RESULT_STARTING != result) && + (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result)) + { + GNUNET_asprintf (&msg, + _("Failed to start the `%s' service: %s\n"), + init, + ret_string (result)); + FPRINTF (stdout, "%s", msg); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Service %s [re]started successfully\n", + init); + GNUNET_free (init); + init = NULL; + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); +} - if (GNUNET_DISK_directory_remove(dir) != GNUNET_OK) + +/** + * We have requested a service to be stopped, this function + * is called with the result of the operation. Informs the + * use of the result; on success, we continue with the event + * loop, on failure we terminate the process. + * + * @param cls closure unused + * @param rs what happened to our request + * @param result if the request was processed, this is the result + * according to ARM + */ +static void +term_callback (void *cls, + enum GNUNET_ARM_RequestStatus rs, + enum GNUNET_ARM_Result result) +{ + char *msg; + + op = NULL; + if (GNUNET_ARM_REQUEST_SENT_OK != rs) { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, - _("Failed to remove servicehome directory %s\n"), dir); + GNUNET_asprintf (&msg, + _("Failed to send a request to kill the `%s' service: %%s\n"), + term); + FPRINTF (stdout, msg, req_string (rs)); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + if ((GNUNET_ARM_RESULT_STOPPED != result) && + (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY != result)) + { + GNUNET_asprintf (&msg, + _("Failed to kill the `%s' service: %s\n"), + term, ret_string (result)); + FPRINTF (stdout, "%s", msg); + GNUNET_free (msg); + GNUNET_SCHEDULER_shutdown (); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Service %s stopped successfully\n", + term); + GNUNET_free (term); + term = NULL; + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); +} + + +/** + * Function called with the list of running services. Prints + * the list to stdout, then starts the event loop again. + * Prints an error message and terminates the process on errors. + * + * @param cls closure (unused) + * @param rs request status (success, failure, etc.) + * @param count number of services in the list + * @param list list of services that are running + */ +static void +list_callback (void *cls, + enum GNUNET_ARM_RequestStatus rs, + unsigned int count, + const char *const*list) +{ + unsigned int i; + + op = NULL; + if (GNUNET_ARM_REQUEST_SENT_OK != rs) + { + char *msg; + + GNUNET_asprintf (&msg, "%s", + _("Failed to request a list of services: %s\n")); + FPRINTF (stdout, msg, req_string (rs)); + GNUNET_free (msg); + ret = 3; + GNUNET_SCHEDULER_shutdown (); } + if (NULL == list) + { + FPRINTF (stderr, "%s", + _("Error communicating with ARM. ARM not running?\n")); + GNUNET_SCHEDULER_shutdown (); + ret = 3; + return; + } + if (! quiet) + FPRINTF (stdout, "%s", _("Running services:\n")); + for (i = 0; i < count; i++) + FPRINTF (stdout, "%s\n", list[i]); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, NULL); } + /** - * Main continuation-passing-style loop. Runs the various - * jobs that we've been asked to do in order. + * Main action loop. Runs the various jobs that we've been asked to + * do, in order. * * @param cls closure, unused - * @param tc context, unused */ static void -cps_loop (void *cls, - const struct GNUNET_SCHEDULER_TaskContext *tc) +action_loop (void *cls) { + al_task = NULL; + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Running requested actions\n"); while (1) + { + switch (phase++) { - switch (phase++) + case 0: + if (NULL != term) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Termination action\n"); + op = GNUNET_ARM_request_service_stop (h, + term, + &term_callback, + NULL); + return; + } + break; + case 1: + if (end || restart) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "End action\n"); + op = GNUNET_ARM_request_service_stop (h, + "arm", + &stop_callback, + NULL); + return; + } + break; + case 2: + if (start) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Start action\n"); + op = GNUNET_ARM_request_service_start (h, "arm", + (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) | + (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR), + &start_callback, + NULL); + return; + } + break; + case 3: + if (NULL != init) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Initialization action\n"); + op = GNUNET_ARM_request_service_start (h, init, + GNUNET_OS_INHERIT_STD_NONE, + &init_callback, + NULL); + return; + } + break; + case 4: + if (list) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Going to list all running services controlled by ARM.\n"); + op = GNUNET_ARM_request_service_list (h, + &list_callback, + &list); + return; + } + break; + case 5: + if (monitor) { - case 0: - if (term != NULL) - { - GNUNET_ARM_stop_service (h, term, (0 == timeout.rel_value) ? STOP_TIMEOUT : timeout, &confirm_cb, term); - return; - } - break; - case 1: - if ((end) || (restart)) - { - GNUNET_ARM_stop_service (h, "arm", (0 == timeout.rel_value) ? STOP_TIMEOUT_ARM : timeout, &confirm_cb, "arm"); - return; - } - break; - case 2: - if (start) - { - GNUNET_ARM_start_service (h, "arm", (0 == timeout.rel_value) ? START_TIMEOUT : timeout, &confirm_cb, "arm"); - return; - } - break; - case 3: - if (init != NULL) - { - GNUNET_ARM_start_service (h, init, (0 == timeout.rel_value) ? START_TIMEOUT : timeout, &confirm_cb, init); - return; - } - break; - case 4: - if (test != NULL) - { - GNUNET_CLIENT_service_test (test, cfg, (0 == timeout.rel_value) ? TEST_TIMEOUT : timeout, &confirm_task, test); - return; - } - break; - case 5: - if (restart) - { - GNUNET_ARM_disconnect (h); - phase = 0; - end = 0; - start = 1; - restart = 0; - h = GNUNET_ARM_connect (cfg, NULL); - if (h == NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - _("Fatal error initializing ARM API.\n")); - ret = 1; - return; - } - GNUNET_SCHEDULER_add_now(&cps_loop, NULL); - return; - } - /* Fall through */ - default: /* last phase */ - GNUNET_ARM_disconnect (h); - if ((end == GNUNET_YES) && (delete == GNUNET_YES)) - delete_files(); - return; + if (! quiet) + fprintf (stderr, + _("Now only monitoring, press CTRL-C to stop.\n")); + quiet = 0; /* does not make sense to stay quiet in monitor mode at this time */ + return; /* done with tasks, just monitor */ } + break; + default: /* last phase */ + GNUNET_SCHEDULER_shutdown (); + return; + } + } +} + + +/** + * Function called when a service starts or stops. + * + * @param cls closure + * @param service service name + * @param status status of the service + */ +static void +srv_status (void *cls, + const char *service, + enum GNUNET_ARM_ServiceStatus status) +{ + const char *msg; + + switch (status) + { + case GNUNET_ARM_SERVICE_MONITORING_STARTED: + return; /* this should be done silently */ + case GNUNET_ARM_SERVICE_STOPPED: + msg = _("Stopped %s.\n"); + break; + case GNUNET_ARM_SERVICE_STARTING: + msg = _("Starting %s...\n"); + break; + case GNUNET_ARM_SERVICE_STOPPING: + msg = _("Stopping %s...\n"); + break; + default: + msg = NULL; + break; + } + if (! quiet) + { + if (NULL != msg) + FPRINTF (stderr, + msg, + service); + else + FPRINTF (stderr, + _("Unknown status %u for service %s.\n"), + status, + service); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Got service %s status %d\n", + service, (int) + status); +} + + +/** + * Main function that will be run by the scheduler. + * + * @param cls closure + * @param args remaining command-line arguments + * @param cfgfile name of the configuration file used (for saving, can be NULL!) + * @param c configuration + */ +static void +run (void *cls, + char *const *args, + const char *cfgfile, + const struct GNUNET_CONFIGURATION_Handle *c) +{ + char *armconfig; + + cfg = GNUNET_CONFIGURATION_dup (c); + config_file = cfgfile; + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_string (cfg, + "PATHS", + "GNUNET_HOME", + &dir)) + { + GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, + "PATHS", + "GNUNET_HOME"); + return; + } + if (NULL != cfgfile) + { + if (GNUNET_OK != + GNUNET_CONFIGURATION_get_value_filename (cfg, + "arm", + "CONFIG", + &armconfig)) + { + GNUNET_CONFIGURATION_set_value_string (cfg, + "arm", + "CONFIG", + cfgfile); } + else + GNUNET_free (armconfig); + } + if (NULL == (h = GNUNET_ARM_connect (cfg, + &conn_status, + NULL))) + return; + if (monitor) + m = GNUNET_ARM_monitor_start (cfg, + &srv_status, + NULL); + al_task = GNUNET_SCHEDULER_add_now (&action_loop, + NULL); + GNUNET_SCHEDULER_add_shutdown (&shutdown_task, + NULL); } @@ -368,8 +752,6 @@ cps_loop (void *cls, int main (int argc, char *const *argv) { - static unsigned long long temp_timeout_ms; - static const struct GNUNET_GETOPT_CommandLineOption options[] = { {'e', "end", NULL, gettext_noop ("stop all GNUnet services"), GNUNET_NO, &GNUNET_GETOPT_set_one, &end}, @@ -379,34 +761,44 @@ main (int argc, char *const *argv) GNUNET_YES, &GNUNET_GETOPT_set_string, &term}, {'s', "start", NULL, gettext_noop ("start all GNUnet default services"), GNUNET_NO, &GNUNET_GETOPT_set_one, &start}, - {'r', "restart", NULL, gettext_noop ("stop and start all GNUnet default services"), + {'r', "restart", NULL, + gettext_noop ("stop and start all GNUnet default services"), GNUNET_NO, &GNUNET_GETOPT_set_one, &restart}, - {'t', "test", "SERVICE", - gettext_noop ("test if a particular service is running"), - GNUNET_YES, &GNUNET_GETOPT_set_string, &test}, - {'d', "delete", NULL, gettext_noop ("delete config file and directory on exit"), + {'d', "delete", NULL, + gettext_noop ("delete config file and directory on exit"), GNUNET_NO, &GNUNET_GETOPT_set_one, &delete}, + {'m', "monitor", NULL, + gettext_noop ("monitor ARM activities"), + GNUNET_NO, &GNUNET_GETOPT_set_one, &monitor}, {'q', "quiet", NULL, gettext_noop ("don't print status messages"), GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet}, - {'T', "timeout", NULL, gettext_noop ("timeout for completing current operation"), - GNUNET_NO, &GNUNET_GETOPT_set_one, &temp_timeout_ms}, + {'T', "timeout", "DELAY", + gettext_noop ("exit with error status if operation does not finish after DELAY"), + GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &timeout}, + {'I', "info", NULL, gettext_noop ("list currently running services"), + GNUNET_NO, &GNUNET_GETOPT_set_one, &list}, + {'O', "no-stdout", NULL, gettext_noop ("don't let gnunet-service-arm inherit standard output"), + GNUNET_NO, &GNUNET_GETOPT_set_one, &no_stdout}, + {'E', "no-stderr", NULL, gettext_noop ("don't let gnunet-service-arm inherit standard error"), + GNUNET_NO, &GNUNET_GETOPT_set_one, &no_stderr}, GNUNET_GETOPT_OPTION_END }; - if (temp_timeout_ms > 0) - timeout.rel_value = temp_timeout_ms; + if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, + &argc, &argv)) + return 2; - if (GNUNET_OK == GNUNET_PROGRAM_run (argc, - argv, - "gnunet-arm", - gettext_noop - ("Control services and the Automated Restart Manager (ARM)"), - options, &run, NULL)) + if (GNUNET_OK == + GNUNET_PROGRAM_run (argc, argv, "gnunet-arm", + gettext_noop + ("Control services and the Automated Restart Manager (ARM)"), + options, &run, NULL)) { + GNUNET_free ((void *) argv); return ret; } - - return 1; + GNUNET_free ((void*) argv); + return 1; } /* end of gnunet-arm.c */