/* Purge edges and subnets of unreachable nodes. Use carefully. */
-static void purge(void) {
+void purge(void) {
splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
node_t *n;
edge_t *e;
event_loopexit(NULL);
}
-static void sigint_handler(int signal, short events, void *data) {
- static int saved_debug_level = -1;
-
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-
- if(saved_debug_level != -1) {
- logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
- saved_debug_level);
- debug_level = saved_debug_level;
- saved_debug_level = -1;
- } else {
- logger(LOG_NOTICE,
- _("Temporarily setting debug level to 5. Kill me with SIGINT again to go back to level %d."),
- debug_level);
- saved_debug_level = debug_level;
- debug_level = 5;
- }
-}
-
-static void sigusr1_handler(int signal, short events, void *data) {
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- dump_connections();
-}
-
-static void sigusr2_handler(int signal, short events, void *data) {
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- dump_device_stats();
- dump_nodes();
- dump_edges();
- dump_subnets();
-}
-
-static void sigwinch_handler(int signal, short events, void *data) {
+static void sighup_handler(int signal, short events, void *data) {
logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
- purge();
+ reload_configuration();
}
-static void sighup_handler(int signal, short events, void *data) {
+int reload_configuration(void) {
connection_t *c;
splay_node_t *node, *next;
char *fname;
struct stat s;
static time_t last_config_check = 0;
-
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
/* Reread our own configuration file */
if(!read_server_config()) {
logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
event_loopexit(NULL);
- return;
+ return EINVAL;
}
/* Close connections to hosts that have a changed or deleted host config file */
/* Try to make outgoing connections */
try_outgoing_connections();
-}
-static void sigalrm_handler(int signal, short events, void *data) {
- logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+ return 0;
+}
+void retry(void) {
connection_t *c;
splay_node_t *node;
int main_loop(void) {
struct event timeout_event;
struct event sighup_event;
- struct event sigint_event;
struct event sigterm_event;
struct event sigquit_event;
- struct event sigusr1_event;
- struct event sigusr2_event;
- struct event sigwinch_event;
- struct event sigalrm_event;
cp();
event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
signal_add(&sighup_event, NULL);
- signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
- signal_add(&sigint_event, NULL);
signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
signal_add(&sigterm_event, NULL);
signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
signal_add(&sigquit_event, NULL);
- signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
- signal_add(&sigusr1_event, NULL);
- signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
- signal_add(&sigusr2_event, NULL);
- signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
- signal_add(&sigwinch_event, NULL);
- signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
- signal_add(&sigalrm_event, NULL);
if(event_loop(0) < 0) {
logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
}
signal_del(&sighup_event);
- signal_del(&sigint_event);
signal_del(&sigterm_event);
signal_del(&sigquit_event);
- signal_del(&sigusr1_event);
- signal_del(&sigusr2_event);
- signal_del(&sigwinch_event);
- signal_del(&sigalrm_event);
event_del(&timeout_event);
return 0;