/*
This file is part of GNUnet.
- (C) 2009, 2012, 2013 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
- by the Free Software Foundation; either version 3, or (at your
- option) any later version.
+ GNUnet is free software: you can redistribute it and/or modify it
+ under the terms of the GNU Affero General Public License as published
+ by the Free Software Foundation, either version 3 of the License,
+ or (at your option) any later version.
GNUnet is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ Affero General Public License for more details.
- 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.
-*/
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ SPDX-License-Identifier: AGPL3.0-or-later
+ */
/**
* @file arm/gnunet-arm.c
#include "gnunet_constants.h"
#include "gnunet_util_lib.h"
-/**
- * Timeout for stopping services. Long to give some services a real chance.
- */
-#define STOP_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MINUTES, 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_MINUTES, 2)
-
-/**
- * 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_SECONDS, 1)
-
-/**
- * Timeout for listing all running services.
- */
-#define LIST_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 2)
-
/**
* Set if we are to shutdown all services (including ARM).
*/
*/
static int quiet;
+/**
+ * Monitor ARM activity.
+ */
+static int monitor;
+
/**
* Set if we should print a list of currently running services.
*/
/**
* Set to the name of the config file used.
*/
-static const char *config_file;
+static char *config_file;
/**
* Set to the directory where runtime files are stored.
*/
static struct GNUNET_TIME_Relative timeout;
+/**
+ * Task to be run on timeout.
+ */
+static struct GNUNET_SCHEDULER_Task *timeout_task;
+
/**
* Do we want to give our stdout to gnunet-service-arm?
*/
-static unsigned int no_stdout;
+static int no_stdout;
/**
* Do we want to give our stderr to gnunet-service-arm?
*/
-static unsigned int no_stderr;
+static 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 SERVICEHOME
- * on arm shutdown provided the end and delete options
+ * 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 ()
+delete_files()
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Will attempt to remove configuration file %s and service directory %s\n",
- config_file, dir);
-
- if (UNLINK (config_file) != 0)
+ 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);
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to remove configuration file %s\n"),
+ config_file);
}
-
- if (GNUNET_DISK_directory_remove (dir) != GNUNET_OK)
+ if (GNUNET_OK != GNUNET_DISK_directory_remove(dir))
{
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
- _("Failed to remove servicehome directory %s\n"), dir);
-
+ GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
+ _("Failed to remove servicehome directory %s\n"),
+ dir);
}
}
* jobs that we've been asked to do in order.
*
* @param cls closure, unused
- * @param tc context, unused
*/
static void
-shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+shutdown_task(void *cls)
{
- GNUNET_ARM_disconnect (h);
- GNUNET_ARM_monitor_disconnect (m);
- h = NULL;
- m = NULL;
- if ((end == GNUNET_YES) && (delete == GNUNET_YES))
- delete_files ();
- GNUNET_CONFIGURATION_destroy (cfg);
+ (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 (NULL != timeout_task)
+ {
+ GNUNET_SCHEDULER_cancel(timeout_task);
+ timeout_task = NULL;
+ }
+ if ((GNUNET_YES == end) && (GNUNET_YES == delete))
+ delete_files();
+ GNUNET_CONFIGURATION_destroy(cfg);
cfg = NULL;
}
+/**
+ * Returns a string interpretation of @a 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)
+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't 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_TOO_LONG:
- return _("Request doesn't fit into a message");
- case GNUNET_ARM_REQUEST_TIMEOUT:
- return _("Request timed out");
- default:
- return _("Unknown request status");
- }
+ {
+ case GNUNET_ARM_REQUEST_SENT_OK:
+ return _("Message was sent successfully");
+
+ case GNUNET_ARM_REQUEST_DISCONNECTED:
+ return _("We disconnected from ARM before we could send a request");
+ }
+ return _("Unknown request status");
}
+
+/**
+ * Returns a string interpretation of the @a result
+ *
+ * @param result the arm result
+ * @return a string interpretation
+ */
static const char *
-ret_string (enum GNUNET_ARM_Result result)
+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_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 can't be started because ARM is shutting down");
- default:
- return _("Unknown result code.");
- }
+ {
+ case GNUNET_ARM_RESULT_STOPPED:
+ return _("is stopped");
+
+ case GNUNET_ARM_RESULT_STARTING:
+ return _("is starting");
+
+ case GNUNET_ARM_RESULT_STOPPING:
+ return _("is stopping");
+
+ case GNUNET_ARM_RESULT_IS_STARTING_ALREADY:
+ return _("is starting already");
+
+ case GNUNET_ARM_RESULT_IS_STOPPING_ALREADY:
+ return _("is stopping already");
+
+ case GNUNET_ARM_RESULT_IS_STARTED_ALREADY:
+ return _("is started already");
+
+ case GNUNET_ARM_RESULT_IS_STOPPED_ALREADY:
+ return _("is stopped already");
+
+ case GNUNET_ARM_RESULT_IS_NOT_KNOWN:
+ return _("service is not known to ARM");
+
+ case GNUNET_ARM_RESULT_START_FAILED:
+ return _("service failed to start");
+
+ case GNUNET_ARM_RESULT_IN_SHUTDOWN:
+ return _("service cannot be manipulated because ARM is shutting down");
+ }
+ return _("Unknown result code.");
}
-static void action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc);
+
+/**
+ * Main task that runs our various operations in order.
+ *
+ * @param cls closure
+ */
+static void
+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
- * @param error GNUNET_YES if we encountered a permanent error, and there
- * will be no re-connection.
+ * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected,
+ * #GNUNET_SYSERR on error.
*/
-void
-conn_status (void *cls, struct GNUNET_ARM_Handle *arm, unsigned char connected, unsigned char error)
+static void
+conn_status(void *cls, int connected)
{
- if (GNUNET_YES == error)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Fatal error initializing ARM API.\n"));
- GNUNET_SCHEDULER_shutdown ();
- return;
- }
-/*
- if (connected)
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
-*/
+ static int once;
+
+ (void)cls;
+ if ((GNUNET_SYSERR == connected) && (0 == once))
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ _("Fatal error initializing ARM API.\n"));
+ GNUNET_SCHEDULER_shutdown();
+ return;
+ }
+ once = 1;
}
+/**
+ * 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 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, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, const char *service,
- enum GNUNET_ARM_Result result)
+start_callback(void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
+ (void)cls;
+ op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- char *msg;
- 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 ();
- }
- if ((GNUNET_ARM_RESULT_STOPPED == result) ||
- (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY == result))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service %s shutdown successful\n", term);
- term = NULL;
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
- }
- else
- {
- char *msg;
- GNUNET_asprintf (&msg, _("Failed to kill the `%s' service: %%s\n"), term);
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
- GNUNET_SCHEDULER_shutdown ();
- }
+ {
+ fprintf(stdout,
+ _("Failed to start the ARM service: %s\n"),
+ req_string(rs));
+ GNUNET_SCHEDULER_shutdown();
+ return;
+ }
+ if ((GNUNET_ARM_RESULT_STARTING != result) &&
+ (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result))
+ {
+ fprintf(stdout,
+ _("Failed to start the ARM service: %s\n"),
+ ret_string(result));
+ 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);
}
+
+/**
+ * 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 unused
+ * @param rs what happened to our request
+ * @param result if the request was processed, this is the result
+ * according to ARM
+ */
static void
-end_callback (void *cls, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, const char *service,
- enum GNUNET_ARM_Result result)
+stop_callback(void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
+ char *msg;
+
+ (void)cls;
+ op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- char *msg;
- 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 ();
- }
- if ((GNUNET_ARM_RESULT_STOPPING == result) ||
- (GNUNET_ARM_RESULT_STOPPED == result) ||
- (GNUNET_ARM_RESULT_IS_STOPPED_ALREADY == result))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM service shutdown successful\n");
- end = 0;
- if (restart)
+ {
+ 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))
+ {
+ fprintf(stdout,
+ _("Failed to stop the ARM service: %s\n"),
+ ret_string(result));
+ 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");
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Initiating an ARM restart\n");
}
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
- }
- else
- {
- char *msg;
- GNUNET_asprintf (&msg, "%s", _("Failed to stop the ARM service: %s\n"));
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
- GNUNET_SCHEDULER_shutdown ();
- }
+ al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
}
+
+/**
+ * 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
-start_callback (void *cls, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, const char *service,
- enum GNUNET_ARM_Result result)
+init_callback(void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
+ (void)cls;
+ op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- char *msg;
- GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n"));
- FPRINTF (stdout, msg, req_string (rs));
- GNUNET_free (msg);
- GNUNET_SCHEDULER_shutdown ();
- }
- if ((GNUNET_ARM_RESULT_STARTING == result) ||
- (GNUNET_ARM_RESULT_IS_STARTED_ALREADY == result))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM service [re]start successful\n");
- start = 0;
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
- }
- else
- {
- char *msg;
- GNUNET_asprintf (&msg, "%s", _("Failed to start the ARM service: %s\n"));
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
- GNUNET_SCHEDULER_shutdown ();
- }
+ {
+ fprintf(stdout,
+ _("Failed to send a request to start the `%s' service: %s\n"),
+ init,
+ req_string(rs));
+ GNUNET_SCHEDULER_shutdown();
+ return;
+ }
+ if ((GNUNET_ARM_RESULT_STARTING != result) &&
+ (GNUNET_ARM_RESULT_IS_STARTED_ALREADY != result))
+ {
+ fprintf(stdout,
+ _("Failed to start the `%s' service: %s\n"),
+ init,
+ ret_string(result));
+ 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);
}
+/**
+ * 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
-init_callback (void *cls, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, const char *service,
- enum GNUNET_ARM_Result result)
+term_callback(void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ enum GNUNET_ARM_Result result)
{
+ char *msg;
+
+ (void)cls;
+ op = NULL;
if (GNUNET_ARM_REQUEST_SENT_OK != rs)
- {
- char *msg;
- 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 ();
- }
- if ((GNUNET_ARM_RESULT_STARTING == result) ||
- (GNUNET_ARM_RESULT_IS_STARTED_ALREADY == result))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Service %s [re]start successful\n", init);
- init = NULL;
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
- }
- else
- {
- char *msg;
- GNUNET_asprintf (&msg, _("Failed to start the `%s' service: %%s\n"), init);
- FPRINTF (stdout, msg, ret_string (result));
- GNUNET_free (msg);
- GNUNET_SCHEDULER_shutdown ();
- }
+ {
+ 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))
+ {
+ fprintf(stdout,
+ _("Failed to kill the `%s' service: %s\n"),
+ term,
+ ret_string(result));
+ 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, struct GNUNET_ARM_Handle *arm,
- enum GNUNET_ARM_RequestStatus rs, unsigned int count,
- const char *const*list)
+list_callback(void *cls,
+ enum GNUNET_ARM_RequestStatus rs,
+ unsigned int count,
+ const char *const *list)
{
- unsigned int i;
+ (void)cls;
+ 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);
- GNUNET_SCHEDULER_shutdown ();
- }
+ {
+ 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"));
- return;
- }
- FPRINTF (stdout, "%s", _("Running services:\n"));
- for (i = 0; i < count; i++)
- FPRINTF (stdout, "%s\n", list[i]);
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
+ {
+ 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 (unsigned int i = 0; i < count; i++)
+ fprintf(stdout, "%s\n", list[i]);
+ al_task = GNUNET_SCHEDULER_add_now(&action_loop, NULL);
}
/**
- * Main action 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
-action_loop (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+action_loop(void *cls)
{
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Running requested actions\n");
- if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
- return;
+ (void)cls;
+ al_task = NULL;
+ GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Running requested actions\n");
while (1)
- {
- switch (phase++)
{
- case 0:
- if (NULL != term)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Termination action\n");
- GNUNET_ARM_request_service_stop (h, term, (0 ==
- timeout.rel_value) ? STOP_TIMEOUT : timeout,
- term_callback, NULL);
- return;
- }
- break;
- case 1:
- if (end || restart)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "End action\n");
- GNUNET_ARM_request_service_stop (h, "arm", (0 ==
- timeout.rel_value) ? STOP_TIMEOUT_ARM : timeout,
- end_callback, NULL);
- return;
- }
- break;
- case 2:
- if (start)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Start action\n");
- GNUNET_ARM_request_service_start (h, "arm",
- (no_stdout ? 0 : GNUNET_OS_INHERIT_STD_OUT) |
- (no_stderr ? 0 : GNUNET_OS_INHERIT_STD_ERR),
- (0 == timeout.rel_value) ? START_TIMEOUT: timeout,
- start_callback, NULL);
- return;
- }
- break;
- case 3:
- if (NULL != init)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Initialization action\n");
- GNUNET_ARM_request_service_start (h, init, GNUNET_OS_INHERIT_STD_NONE,
- (0 == timeout.rel_value) ? STOP_TIMEOUT : timeout,
- 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");
-
- GNUNET_ARM_request_service_list (h,
- (0 == timeout.rel_value) ? LIST_TIMEOUT : timeout,
- list_callback, &list);
- return;
- }
- /* Fall through */
- default: /* last phase */
- GNUNET_SCHEDULER_shutdown ();
- return;
+ 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)
+ {
+ 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;
+ }
}
- }
}
* @param status status of the service
*/
static void
-srv_status (void *cls, struct GNUNET_ARM_MonitorHandle *arm,
- const char *service, enum GNUNET_ARM_ServiceStatus status)
+srv_status(void *cls,
+ const char *service,
+ enum GNUNET_ARM_ServiceStatus status)
{
const char *msg;
+
+ (void)cls;
switch (status)
- {
- case GNUNET_ARM_SERVICE_MONITORING_STARTED:
- msg = _("Began monitoring ARM for service status changes\n");
- break;
- 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 (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 %u\n", service, 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);
+}
+
+
+/**
+ * Task run on timeout (if -T is given).
+ */
+static void
+timeout_task_cb(void *cls)
+{
+ (void)cls;
+ timeout_task = NULL;
+ ret = 2;
+ GNUNET_SCHEDULER_shutdown();
}
* @param c configuration
*/
static void
-run (void *cls, char *const *args, const char *cfgfile,
- const struct GNUNET_CONFIGURATION_Handle *c)
+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_CONFIGURATION_get_value_string
- (cfg, "PATHS", "SERVICEHOME", &dir) != GNUNET_OK)
- {
- GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "PATHS", "SERVICEHOME");
- return;
- }
- if (NULL != cfgfile)
- {
- if (GNUNET_OK !=
- GNUNET_CONFIGURATION_get_value_filename (cfg, "arm", "CONFIG",
- &armconfig))
+ (void)cls;
+ (void)args;
+ (void)cfgfile;
+ cfg = GNUNET_CONFIGURATION_dup(c);
+ if (GNUNET_OK !=
+ GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "GNUNET_HOME", &dir))
{
- GNUNET_CONFIGURATION_set_value_string (cfg, "arm", "CONFIG",
- cfgfile);
+ GNUNET_log_config_missing(GNUNET_ERROR_TYPE_ERROR, "PATHS", "GNUNET_HOME");
+ return;
}
- else
- GNUNET_free (armconfig);
- }
- h = GNUNET_ARM_alloc (cfg);
- m = GNUNET_ARM_monitor_alloc (cfg);
- GNUNET_ARM_connect (h, conn_status, NULL);
- GNUNET_ARM_monitor (m, srv_status, NULL);
- GNUNET_SCHEDULER_add_now (action_loop, NULL);
- GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
- shutdown_task, NULL);
+ (void)GNUNET_CONFIGURATION_get_value_filename(cfg,
+ "arm",
+ "CONFIG",
+ &config_file);
+ 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);
+ if (0 != timeout.rel_value_us)
+ timeout_task =
+ GNUNET_SCHEDULER_add_delayed(timeout, &timeout_task_cb, NULL);
}
*
* @param argc number of arguments from the command line
* @param argv command line arguments
- * @return 0 ok, 1 on error
+ * @return 0 ok, 1 on error, 2 on timeout
*/
int
-main (int argc, char *const *argv)
+main(int argc, char *const *argv)
{
- static const struct GNUNET_GETOPT_CommandLineOption options[] = {
- {'e', "end", NULL, gettext_noop ("stop all GNUnet services"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &end},
- {'i', "init", "SERVICE", gettext_noop ("start a particular service"),
- GNUNET_YES, &GNUNET_GETOPT_set_string, &init},
- {'k', "kill", "SERVICE", gettext_noop ("stop a particular service"),
- 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"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &restart},
- {'d', "delete", NULL,
- gettext_noop ("delete config file and directory on exit"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &delete},
- {'q', "quiet", NULL, gettext_noop ("don't print status messages"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
- {'T', "timeout", "MSECS",
- gettext_noop ("timeout in MSECS milliseconds for completing current operation"),
- 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 (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
+ struct GNUNET_GETOPT_CommandLineOption options[] =
+ { GNUNET_GETOPT_option_flag('e',
+ "end",
+ gettext_noop("stop all GNUnet services"),
+ &end),
+ GNUNET_GETOPT_option_string('i',
+ "init",
+ "SERVICE",
+ gettext_noop("start a particular service"),
+ &init),
+ GNUNET_GETOPT_option_string('k',
+ "kill",
+ "SERVICE",
+ gettext_noop("stop a particular service"),
+ &term),
+ GNUNET_GETOPT_option_flag('s',
+ "start",
+ gettext_noop(
+ "start all GNUnet default services"),
+ &start),
+ GNUNET_GETOPT_option_flag('r',
+ "restart",
+ gettext_noop(
+ "stop and start all GNUnet default services"),
+ &restart),
+ GNUNET_GETOPT_option_flag('d',
+ "delete",
+ gettext_noop(
+ "delete config file and directory on exit"),
+ &delete),
+ GNUNET_GETOPT_option_flag('m',
+ "monitor",
+ gettext_noop("monitor ARM activities"),
+ &monitor),
+ GNUNET_GETOPT_option_flag('q',
+ "quiet",
+ gettext_noop("don't print status messages"),
+ &quiet),
+ GNUNET_GETOPT_option_relative_time(
+ 'T',
+ "timeout",
+ "DELAY",
+ gettext_noop(
+ "exit with error status if operation does not finish after DELAY"),
+ &timeout),
+ GNUNET_GETOPT_option_flag('I',
+ "info",
+ gettext_noop(
+ "list currently running services"),
+ &list),
+ GNUNET_GETOPT_option_flag(
+ 'O',
+ "no-stdout",
+ gettext_noop("don't let gnunet-service-arm inherit standard output"),
+ &no_stdout),
+ GNUNET_GETOPT_option_flag(
+ 'E',
+ "no-stderr",
+ gettext_noop("don't let gnunet-service-arm inherit standard error"),
+ &no_stderr),
+ GNUNET_GETOPT_OPTION_END };
+ int lret;
+
+ 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))
+ (lret = GNUNET_PROGRAM_run(
+ argc,
+ argv,
+ "gnunet-arm",
+ gettext_noop(
+ "Control services and the Automated Restart Manager (ARM)"),
+ options,
+ &run,
+ NULL)))
{
- GNUNET_free ((void *) argv);
+ GNUNET_free((void *)argv);
return ret;
}
- GNUNET_free ((void*) argv);
- return 1;
+ GNUNET_free((void *)argv);
+ return lret;
}
/* end of gnunet-arm.c */
projects / oweals / gnunet.git / blobdiff