Gracefully exit through the main thread.

[oweals/tinc.git] / src / net.c

diff --git a/src/net.c b/src/net.c
index dbff75b9b1cfc95ced7c6522902ba5c9f17a5049..e52363e4a685f8586d6652639e452e9867df6e1c 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. */
 
@@ -157,7 +158,8 @@ void terminate_connection(connection_t *c, bool report) {
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void timeout_handler(int fd, short events, void *event) {
+static void timeout_handler(void *arg) {
+       event_t *event = arg;
        splay_node_t *node, *next;
        connection_t *c;
        time_t now = time(NULL);
@@ -197,7 +199,7 @@ static void timeout_handler(int fd, short events, void *event) {
 
                if(rand() % 3 == 0) {
                        logger(LOG_ERR, "Shutting down, check configuration of all nodes for duplicate Names!");
-                       event_loopexit(NULL);
+                       running = false;
                        return;
                }
 
@@ -205,7 +207,8 @@ static void timeout_handler(int fd, short events, void *event) {
                contradicting_del_edge = 0;
        }
 
-       event_add(event, &(struct timeval){pingtimeout, 0});
+       event->time = now + pingtimeout;
+       event_add(event);
 }
 
 void handle_meta_connection_data(void *data) {
@@ -218,14 +221,18 @@ void handle_meta_connection_data(void *data) {
 
                getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
-               if(!result)
+               if(!result) {
+                       mutex_lock(&mutex);
                        finish_connecting(c);
-               else {
+                       mutex_unlock(&mutex);
+               } else {
                        ifdebug(CONNECTIONS) logger(LOG_DEBUG,
                                           "Error while connecting to %s (%s): %s",
                                           c->name, c->hostname, sockstrerror(result));
                        closesocket(c->socket);
+                       mutex_lock(&mutex);
                        do_outgoing_connection(c);
+                       mutex_unlock(&mutex);
                        return;
                }
        }
@@ -233,21 +240,11 @@ void handle_meta_connection_data(void *data) {
        while(true) {
                if (!receive_meta(c)) {
                        terminate_connection(c, c->status.active);
-                       return;
+                       break;
                }
        }
 }
 
-static void sigterm_handler(int signal, short events, void *data) {
-       logger(LOG_NOTICE, "Got %s signal", strsignal(signal));
-       event_loopexit(NULL);
-}
-
-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;
@@ -262,7 +259,7 @@ int reload_configuration(void) {
 
        if(!read_server_config()) {
                logger(LOG_ERR, "Unable to reread configuration file, exitting.");
-               event_loopexit(NULL);
+               running = false;
                return EINVAL;
        }
 
@@ -334,8 +331,7 @@ void retry(void) {
                c = node->data;
                
                if(c->outgoing && !c->node) {
-                       if(timeout_initialized(&c->outgoing->ev))
-                               event_del(&c->outgoing->ev);
+                       event_del(&c->outgoing->ev);
                        if(c->status.connecting)
                                close(c->socket);
                        c->outgoing->timeout = 0;
@@ -349,34 +345,24 @@ void retry(void) {
 */
 int main_loop(void) {
        struct event timeout_event;
-       struct event sighup_event;
-       struct event sigterm_event;
-       struct event sigquit_event;
-
-       timeout_set(&timeout_event, timeout_handler, &timeout_event);
-       event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
-
-#ifdef SIGHUP
-       signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
-       signal_add(&sighup_event, NULL);
-#endif
-#ifdef SIGTERM
-       signal_set(&sigterm_event, SIGTERM, sigterm_handler, NULL);
-       signal_add(&sigterm_event, NULL);
-#endif
-#ifdef SIGQUIT
-       signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
-       signal_add(&sigquit_event, NULL);
-#endif
-
-       if(event_loop(0) < 0) {
-               logger(LOG_ERR, "Error while waiting for input: %s", strerror(errno));
-               return 1;
+
+       timeout_event.time = time(NULL) + pingtimeout;
+       timeout_event.handler = timeout_handler;
+       timeout_event.data = &timeout_event;
+
+       event_add(&timeout_event);
+
+       while(running) {
+               mutex_unlock(&mutex);
+               usleep(1000000);
+               mutex_lock(&mutex);
+
+               struct event *event;
+               while((event = get_expired_event())) {
+                       event->handler(event->data);
+               }
        }
 
-       signal_del(&sighup_event);
-       signal_del(&sigterm_event);
-       signal_del(&sigquit_event);
        event_del(&timeout_event);
 
        return 0;