X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=57ac82429e6f97855799a3061c7912cbce4ce09d;hb=8852d4407d87cf5dcf2c212d352279015aa050c0;hp=a1ca9ab9c6891992b7a8f140f5920f0fc60466aa;hpb=4d0621b1f39537699b0ec4655b0c6e6b84581c9a;p=tinc diff --git a/src/net.c b/src/net.c index a1ca9ab9..57ac8242 100644 --- a/src/net.c +++ b/src/net.c @@ -29,7 +29,6 @@ #include "conf.h" #include "connection.h" #include "device.h" -#include "tevent.h" #include "graph.h" #include "logger.h" #include "meta.h" @@ -37,11 +36,9 @@ #include "netutl.h" #include "process.h" #include "protocol.h" -#include "route.h" #include "subnet.h" #include "xalloc.h" -bool do_purge = false; volatile bool running = false; time_t now = 0; @@ -269,7 +266,6 @@ void handle_meta_connection_data(int fd, short events, void *data) return; if(c->status.connecting) { - c->status.connecting = false; getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); if(!result) @@ -278,6 +274,7 @@ void handle_meta_connection_data(int fd, short events, void *data) ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(result)); + c->status.connecting = false; closesocket(c->socket); do_outgoing_connection(c); return; @@ -294,6 +291,115 @@ static void dummy(int a, short b, void *c) { } +static void sigterm_handler(int signal, short events, void *data) { + logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); + running = false; + 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) { + logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); + purge(); +} + +static void sighup_handler(int signal, short events, void *data) { + connection_t *c; + avl_node_t *node; + 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 */ + + exit_configuration(&config_tree); + init_configuration(&config_tree); + + if(!read_server_config()) { + logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); + event_loopexit(NULL); + return; + } + + /* Close connections to hosts that have a changed or deleted host config file */ + + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + + if(c->outgoing) { + free(c->outgoing->name); + if(c->outgoing->ai) + freeaddrinfo(c->outgoing->ai); + free(c->outgoing); + c->outgoing = NULL; + } + + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + if(stat(fname, &s) || s.st_mtime > last_config_check) + terminate_connection(c, c->status.active); + free(fname); + } + + last_config_check = time(NULL); + + /* 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)); + + connection_t *c; + avl_node_t *node; + + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + + if(c->outgoing && !c->node) { + if(timeout_initialized(&c->outgoing->ev)) + event_del(&c->outgoing->ev); + if(c->status.connecting) + close(c->socket); + c->outgoing->timeout = 0; + do_outgoing_connection(c); + } + } +} + /* this is where it all happens... */ @@ -301,14 +407,37 @@ int main_loop(void) { struct timeval tv; int r; - time_t last_ping_check, last_config_check; - tevent_t *event; + time_t last_ping_check; struct event timeout; + 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(); + 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); + last_ping_check = now; - last_config_check = now; srand(now); @@ -346,22 +475,12 @@ int main_loop(void) /* XXX: more libevent transition */ timeout_del(&timeout); - if(do_purge) { - purge(); - do_purge = false; - } - /* Let's check if everybody is still alive */ if(last_ping_check + pingtimeout < now) { check_dead_connections(); last_ping_check = now; - if(routing_mode == RMODE_SWITCH) - age_subnets(); - - age_past_requests(); - /* Should we regenerate our key? */ if(keyexpires < now) { @@ -374,63 +493,16 @@ int main_loop(void) keyexpires = now + keylifetime; } } - - - while((event = get_expired_tevent())) { - event->handler(event->data); - free_tevent(event); - } - - if(sigalrm) { - logger(LOG_INFO, _("Flushing event queue")); - flush_tevents(); - sigalrm = false; - } - - if(sighup) { - connection_t *c; - avl_node_t *node; - char *fname; - struct stat s; - - sighup = false; - - /* Reread our own configuration file */ - - exit_configuration(&config_tree); - init_configuration(&config_tree); - - if(!read_server_config()) { - logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); - return 1; - } - - /* Close connections to hosts that have a changed or deleted host config file */ - - for(node = connection_tree->head; node; node = node->next) { - c = node->data; - - if(c->outgoing) { - free(c->outgoing->name); - if(c->outgoing->ai) - freeaddrinfo(c->outgoing->ai); - free(c->outgoing); - c->outgoing = NULL; - } - - asprintf(&fname, "%s/hosts/%s", confbase, c->name); - if(stat(fname, &s) || s.st_mtime > last_config_check) - terminate_connection(c, c->status.active); - free(fname); - } - - last_config_check = now; - - /* Try to make outgoing connections */ - - try_outgoing_connections(); - } } + 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); + return 0; }