X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=469f10fce94ae69827d640ec23365268a152e882;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=7513e3e5725c5aece365c50bae413f5fbb15c2bd;hpb=6d19ebd612e6387ba34419cce5cd4d5d861b9a9e;p=tinc diff --git a/src/net.c b/src/net.c index 7513e3e5..469f10fc 100644 --- a/src/net.c +++ b/src/net.c @@ -25,7 +25,7 @@ #include #include "utils.h" -#include "avl_tree.h" +#include "splay_tree.h" #include "conf.h" #include "connection.h" #include "device.h" @@ -36,19 +36,13 @@ #include "netutl.h" #include "process.h" #include "protocol.h" -#include "route.h" #include "subnet.h" #include "xalloc.h" -volatile bool running = false; - -time_t now = 0; - /* Purge edges and subnets of unreachable nodes. Use carefully. */ -static void purge(void) -{ - avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; +static void purge(void) { + splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; node_t *n; edge_t *e; subnet_t *s; @@ -110,9 +104,8 @@ static void purge(void) put all file descriptors into events While we're at it, purge stuf that needs to be removed. */ -static int build_fdset(void) -{ - avl_node_t *node, *next; +static int build_fdset(void) { + splay_node_t *node, *next; connection_t *c; int i, max = 0; @@ -139,8 +132,7 @@ static int build_fdset(void) - Check if we need to retry making an outgoing connection - Deactivate the host */ -void terminate_connection(connection_t *c, bool report) -{ +void terminate_connection(connection_t *c, bool report) { cp(); if(c->status.remove) @@ -205,10 +197,10 @@ void terminate_connection(connection_t *c, bool report) end does not reply in time, we consider them dead and close the connection. */ -static void check_dead_connections(void) -{ - avl_node_t *node, *next; +static void timeout_handler(int fd, short events, void *event) { + splay_node_t *node, *next; connection_t *c; + time_t now = time(NULL); cp(); @@ -244,21 +236,12 @@ static void check_dead_connections(void) } } } - - if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) { - if(c->status.active) { - ifdebug(CONNECTIONS) logger(LOG_INFO, - _("%s (%s) could not flush for %ld seconds (%d bytes remaining)"), - c->name, c->hostname, now - c->last_flushed_time, c->outbuflen); - c->status.timeout = true; - terminate_connection(c, true); - } - } } + + event_add(event, &(struct timeval){pingtimeout, 0}); } -void handle_meta_connection_data(int fd, short events, void *data) -{ +void handle_meta_connection_data(int fd, short events, void *data) { connection_t *c = data; int result; socklen_t len = sizeof(result); @@ -267,7 +250,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) @@ -276,6 +258,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; @@ -288,13 +271,8 @@ void handle_meta_connection_data(int fd, short events, void *data) } } -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); } @@ -337,7 +315,7 @@ static void sigwinch_handler(int signal, short events, void *data) { static void sighup_handler(int signal, short events, void *data) { connection_t *c; - avl_node_t *node; + splay_node_t *node; char *fname; struct stat s; static time_t last_config_check = 0; @@ -381,15 +359,33 @@ static void sighup_handler(int signal, short events, void *data) { try_outgoing_connections(); } +static void sigalrm_handler(int signal, short events, void *data) { + logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal)); + + connection_t *c; + splay_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... */ -int main_loop(void) -{ +int main_loop(void) { struct timeval tv; int r; - time_t last_ping_check; - struct event timeout; + struct event timeout_event; struct event sighup_event; struct event sigint_event; struct event sigterm_event; @@ -397,9 +393,12 @@ int main_loop(void) struct event sigusr1_event; struct event sigusr2_event; struct event sigwinch_event; + struct event sigalrm_event; cp(); + timeout_set(&timeout_event, timeout_handler, &timeout_event); + 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); @@ -414,74 +413,12 @@ int main_loop(void) 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; - - srand(now); - - running = true; - - while(running) { - now = time(NULL); - - // tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */ - tv.tv_sec = 1; - tv.tv_usec = 0; - - /* XXX: libevent transition: old timeout code in this loop */ - timeout_set(&timeout, dummy, NULL); - timeout_add(&timeout, &tv); - - r = build_fdset(); - if(r < 0) { - logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno)); - cp_trace(); - dump_connections(); - return 1; - } - - r = event_loop(EVLOOP_ONCE); - now = time(NULL); - if(r < 0) { - logger(LOG_ERR, _("Error while waiting for input: %s"), - strerror(errno)); - cp_trace(); - dump_connections(); - return 1; - } - - /* XXX: more libevent transition */ - timeout_del(&timeout); - - /* 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) { - ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key")); - - RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength); - if(myself->cipher) - EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len); - send_key_changed(broadcast, myself); - keyexpires = now + keylifetime; - } - } - - if(sigalrm) { - logger(LOG_INFO, _("Flushing event queue")); - // TODO: do this another way - sigalrm = false; - } + if(event_loop(0) < 0) { + logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); + return 1; } signal_del(&sighup_event); @@ -491,6 +428,8 @@ int main_loop(void) signal_del(&sigusr1_event); signal_del(&sigusr2_event); signal_del(&sigwinch_event); + signal_del(&sigalrm_event); + event_del(&timeout_event); return 0; }