Ensure past_request_event is initialized and registered properly.

[tinc] / src / net.c

diff --git a/src/net.c b/src/net.c
index 2ffe03a..e52363e 100644 (file)
--- a/src/net.c
+++ b/src/net.c
@@ -38,6 +38,7 @@
 
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
+bool running = true;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -198,7 +199,7 @@ static void timeout_handler(void *arg) {
 
                if(rand() % 3 == 0) {
                        logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
-                       abort();
+                       running = false;
                        return;
                }
 
@@ -244,16 +245,6 @@ void handle_meta_connection_data(void *data) {
        }
 }
 
-static void sigterm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
-       exit(0);
-}
-
-static void sighup_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
-       reload_configuration();
-}
-
 int reload_configuration(void) {
        connection_t *c;
        splay_node_t *node, *next;
@@ -268,7 +259,7 @@ int reload_configuration(void) {
 
        if(!read_server_config()) {
                logger(LOG_ERR, "Unable to reread configuration file, exitting.");
-               abort();
+               running = false;
                return EINVAL;
        }
 
@@ -361,17 +352,7 @@ int main_loop(void) {
 
        event_add(&timeout_event);
 
-#ifdef SIGHUP
-       signal(SIGHUP, sighup_handler);
-#endif
-#ifdef SIGTERM
-       signal(SIGTERM, sigterm_handler);
-#endif
-#ifdef SIGQUIT
-       signal(SIGQUIT, sigterm_handler);
-#endif
-
-       while(true) {
+       while(running) {
                mutex_unlock(&mutex);
                usleep(1000000);
                mutex_lock(&mutex);