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 2, or (at your
+ by the Free Software Foundation; either version 3, or (at your
option) any later version.
GNUnet is distributed in the hope that it will be useful, but
#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, 360)
+#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, 30)
/**
* Timeout for starting services, very short because of the strange way start works
*/
#define START_TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS, 50)
+/**
+ * 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)
+
/**
* Set if we are to shutdown all services (including ARM).
*/
*/
static struct GNUNET_ARM_Handle *h;
-/**
- * Our scheduler.
- */
-static struct GNUNET_SCHEDULER_Handle *sched;
-
/**
* Our configuration.
*/
break;
}
- GNUNET_SCHEDULER_add_continuation (sched,
- &cps_loop,
+ GNUNET_SCHEDULER_add_continuation (&cps_loop,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
if (quiet != GNUNET_YES)
fprintf(stdout, _("Service `%s' is not running.\n"), service);
}
- GNUNET_SCHEDULER_add_continuation (sched,
- &cps_loop,
+ GNUNET_SCHEDULER_add_continuation (&cps_loop,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
* Main function that will be run by the scheduler.
*
* @param cls closure
- * @param s the scheduler to use
* @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,
- struct GNUNET_SCHEDULER_Handle *s,
char *const *args,
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- sched = s;
cfg = c;
config_file = cfgfile;
if (GNUNET_CONFIGURATION_get_value_string(cfg, "PATHS", "SERVICEHOME", &dir) != GNUNET_OK)
- {
- dir = NULL;
- }
-
- h = GNUNET_ARM_connect (cfg, sched, NULL);
+ {
+ 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,
ret = 1;
return;
}
- GNUNET_SCHEDULER_add_continuation (sched,
- &cps_loop,
+ GNUNET_SCHEDULER_add_continuation (&cps_loop,
NULL,
GNUNET_SCHEDULER_REASON_PREREQ_DONE);
}
case 1:
if ((end) || (restart))
{
- GNUNET_ARM_stop_service (h, "arm", STOP_TIMEOUT, &confirm_cb, "arm");
+ GNUNET_ARM_stop_service (h, "arm", STOP_TIMEOUT_ARM, &confirm_cb, "arm");
return;
}
break;
case 4:
if (test != NULL)
{
- GNUNET_CLIENT_service_test (sched, test, cfg, START_TIMEOUT, &confirm_task, test);
+ GNUNET_CLIENT_service_test (test, cfg, TEST_TIMEOUT, &confirm_task, test);
return;
}
break;
end = 0;
start = 1;
restart = 0;
- h = GNUNET_ARM_connect (cfg, sched, NULL);
+ h = GNUNET_ARM_connect (cfg, NULL);
if (h == NULL)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
ret = 1;
return;
}
- GNUNET_SCHEDULER_add_now(sched, &cps_loop, NULL);
+ GNUNET_SCHEDULER_add_now(&cps_loop, NULL);
return;
}
/* Fall through */
}
-/**
- * gnunet-arm command line options
- */
-static 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},
- {'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"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &delete},
- {'q', "quiet", NULL, gettext_noop ("don't print status messages"),
- GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
- GNUNET_GETOPT_OPTION_END
-};
-
-
/**
* The main function to obtain arm from gnunetd.
*
int
main (int argc, char *const *argv)
{
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc,
- argv,
- "gnunet-arm",
- gettext_noop
- ("Control services and the Automated Restart Manager (ARM)"),
- options, &run, NULL)) ? ret : 1;
+ 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},
+ {'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"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &delete},
+ {'q', "quiet", NULL, gettext_noop ("don't print status messages"),
+ GNUNET_NO, &GNUNET_GETOPT_set_one, &quiet},
+ GNUNET_GETOPT_OPTION_END
+ };
+
+ if (GNUNET_OK == GNUNET_PROGRAM_run (argc,
+ argv,
+ "gnunet-arm",
+ gettext_noop
+ ("Control services and the Automated Restart Manager (ARM)"),
+ options, &run, NULL))
+ {
+ return ret;
+ }
+
+ return 1;
}
/* end of gnunet-arm.c */
projects / oweals / gnunet.git / blobdiff