X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Farm%2Fgnunet-arm.c;h=80b5ca3e296c43a19fdde106c6f6f1ffc8d89415;hb=6e626937fd5133188d2bd06f280a1b889219eef2;hp=49315687fed98881933d273bd29b5759ef84414d;hpb=0e4c7cdccfc4105f9c6e529cfa0e3722104b0ddf;p=oweals%2Fgnunet.git
diff --git a/src/arm/gnunet-arm.c b/src/arm/gnunet-arm.c
index 49315687f..80b5ca3e2 100644
--- a/src/arm/gnunet-arm.c
+++ b/src/arm/gnunet-arm.c
@@ -1,21 +1,21 @@
/*
This file is part of GNUnet.
- (C) 2009, 2012 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 Affero General Public License
+ along with this program. If not, see .
- 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.
+ SPDX-License-Identifier: AGPL3.0-or-later
*/
/**
@@ -28,28 +28,6 @@
#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).
*/
@@ -75,6 +53,11 @@ static int delete;
*/
static int quiet;
+/**
+ * Monitor ARM activity.
+ */
+static int monitor;
+
/**
* Set if we should print a list of currently running services.
*/
@@ -93,7 +76,7 @@ static char *term;
/**
* 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.
@@ -110,10 +93,15 @@ static int ret;
*/
static struct GNUNET_ARM_Handle *h;
+/**
+ * Monitor connection with ARM.
+ */
+static struct GNUNET_ARM_MonitorHandle *m;
+
/**
* Our configuration.
*/
-static const struct GNUNET_CONFIGURATION_Handle *cfg;
+static struct GNUNET_CONFIGURATION_Handle *cfg;
/**
* Processing stage that we are in. Simple counter.
@@ -125,15 +113,56 @@ static unsigned int phase;
*/
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 = 0;
+static int no_stdout;
/**
* Do we want to give our stderr to gnunet-service-arm?
*/
-static unsigned int no_stderr = 0;
+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 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);
+ }
+}
/**
@@ -141,171 +170,387 @@ static unsigned int no_stderr = 0;
* 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)
+{
+ (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;
+}
/**
- * Callback invoked with the status of the last operation. Reports to the
- * user and then runs the next phase in the FSM.
+ * Returns a string interpretation of 'rs'
*
- * @param cls pointer to "const char*" identifying service that was manipulated
- * @param result result of the operation
+ * @param rs the request status from ARM
+ * @return a string interpretation of the request status
*/
-static void
-confirm_cb (void *cls,
- enum GNUNET_ARM_ProcessStatus result)
+static const char *
+req_string (enum GNUNET_ARM_RequestStatus rs)
{
- const char *service = cls;
+ switch (rs)
+ {
+ 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 '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_PROCESS_UNKNOWN:
- FPRINTF (stderr, _("Service `%s' is unknown to ARM.\n"), service);
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_DOWN:
- if (quiet != GNUNET_YES)
- FPRINTF (stdout, _("Service `%s' has been stopped.\n"), service);
- break;
- case GNUNET_ARM_PROCESS_ALREADY_RUNNING:
- FPRINTF (stderr, _("Service `%s' was already running.\n"), service);
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_STARTING:
- if (quiet != GNUNET_YES)
- FPRINTF (stdout, _("Service `%s' has been started.\n"), service);
- break;
- case GNUNET_ARM_PROCESS_ALREADY_STOPPING:
- FPRINTF (stderr, _("Service `%s' was already being stopped.\n"), service);
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_ALREADY_DOWN:
- FPRINTF (stderr, _("Service `%s' was already not running.\n"), service);
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_SHUTDOWN:
- FPRINTF (stderr, "%s", _("Request ignored as ARM is shutting down.\n"));
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_COMMUNICATION_ERROR:
- FPRINTF (stderr, "%s", _("Error communicating with ARM service.\n"));
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_COMMUNICATION_TIMEOUT:
- FPRINTF (stderr, "%s", _("Timeout communicating with ARM service.\n"));
- ret = 1;
- break;
- case GNUNET_ARM_PROCESS_FAILURE:
- FPRINTF (stderr, "%s", _("Operation failed.\n"));
- ret = 1;
- break;
- default:
- FPRINTF (stderr, "%s", _("Unknown response code from ARM.\n"));
- break;
+ 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");
}
- GNUNET_SCHEDULER_add_continuation (&cps_loop, NULL,
- GNUNET_SCHEDULER_REASON_PREREQ_DONE);
+ return _("Unknown result code.");
}
/**
- * Callback invoked with the list of running services.
- * Reports to the user and then runs the next phase in the FSM.
+ * 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 currently not used
- * @param result result of the operation
- * @param count number of running services
- * @param list copy of the list of running services
+ * @param cls closure
+ * @param connected #GNUNET_YES if connected, #GNUNET_NO if disconnected,
+ * #GNUNET_SYSERR on error.
*/
static void
-list_cb (void *cls, int result, unsigned int count, const char *const*list)
+conn_status (void *cls,
+ int connected)
{
- unsigned int i;
+ static int once;
- if ( (result != GNUNET_YES) || (NULL == list) )
+ (void) cls;
+ if ( (GNUNET_SYSERR == connected) &&
+ (0 == once) )
{
- FPRINTF (stderr, "%s", _("Error communicating with ARM. ARM not running?\n"));
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Fatal error initializing ARM API.\n"));
+ GNUNET_SCHEDULER_shutdown ();
return;
}
- FPRINTF (stdout, "%s", _("Running services:\n"));
- for (i=0; i