X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=e9aed34c48ba74b72fd08f765427c628430bceb8;hp=0496a864e4dd4c028a07ab7bf4f52c353471c02e;hb=46f3eba7755089ff68fdc137b0754cae2fa523eb;hpb=80e15d8b96e5313b33c91003b1f75d7f6db9924e diff --git a/src/net.c b/src/net.c index 0496a864..e9aed34c 100644 --- a/src/net.c +++ b/src/net.c @@ -1,9 +1,9 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2012 Guus Sliepen + 2000-2017 Guus Sliepen 2006 Scott Lamb - 2011 Loïc Grenié + 2011 Loïc Grenié This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,69 +22,53 @@ #include "system.h" -#include - -#include "utils.h" -#include "avl_tree.h" +#include "autoconnect.h" #include "conf.h" #include "connection.h" #include "device.h" -#include "event.h" #include "graph.h" #include "logger.h" #include "meta.h" +#include "names.h" #include "net.h" #include "netutl.h" -#include "process.h" #include "protocol.h" -#include "route.h" #include "subnet.h" +#include "utils.h" #include "xalloc.h" -bool do_purge = false; -volatile bool running = false; -#ifdef HAVE_PSELECT -bool graph_dump = false; -#endif - -time_t now = 0; int contradicting_add_edge = 0; int contradicting_del_edge = 0; static int sleeptime = 10; +time_t last_config_check = 0; +static timeout_t pingtimer; +static timeout_t periodictimer; +static struct timeval last_periodic_run_time; /* Purge edges and subnets of unreachable nodes. Use carefully. */ -static void purge(void) { - avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; - node_t *n; - edge_t *e; - subnet_t *s; - - ifdebug(PROTOCOL) logger(LOG_DEBUG, "Purging unreachable nodes"); +void purge(void) { + logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes"); /* Remove all edges and subnets owned by unreachable nodes. */ - for(nnode = node_tree->head; nnode; nnode = nnext) { - nnext = nnode->next; - n = nnode->data; - + for splay_each(node_t, n, node_tree) { if(!n->status.reachable) { - ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Purging node %s (%s)", n->name, - n->hostname); + logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname); - for(snode = n->subnet_tree->head; snode; snode = snext) { - snext = snode->next; - s = snode->data; + for splay_each(subnet_t, s, n->subnet_tree) { send_del_subnet(everyone, s); - if(!strictsubnets) + + if(!strictsubnets) { subnet_del(n, s); + } } - for(enode = n->edge_tree->head; enode; enode = enext) { - enext = enode->next; - e = enode->data; - if(!tunnelserver) + for splay_each(edge_t, e, n->edge_tree) { + if(!tunnelserver) { send_del_edge(everyone, e); + } + edge_del(e); } } @@ -92,126 +76,97 @@ static void purge(void) { /* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */ - for(nnode = node_tree->head; nnode; nnode = nnext) { - nnext = nnode->next; - n = nnode->data; - + for splay_each(node_t, n, node_tree) { if(!n->status.reachable) { - for(enode = edge_weight_tree->head; enode; enode = enext) { - enext = enode->next; - e = enode->data; - - if(e->to == n) - break; - } + for splay_each(edge_t, e, edge_weight_tree) + if(e->to == n) { + return; + } - if(!enode && (!strictsubnets || !n->subnet_tree->head)) + if(!autoconnect && (!strictsubnets || !n->subnet_tree->head)) /* in strictsubnets mode do not delete nodes with subnets */ + { node_del(n); + } } } } -/* - put all file descriptors in an fd_set array - While we're at it, purge stuff that needs to be removed. -*/ -static int build_fdset(fd_set *readset, fd_set *writeset) { - avl_node_t *node, *next; - connection_t *c; - int i, max = 0; - - FD_ZERO(readset); - FD_ZERO(writeset); - - for(node = connection_tree->head; node; node = next) { - next = node->next; - c = node->data; - - if(c->status.remove) { - connection_del(c); - if(!connection_tree->head) - purge(); - } else { - FD_SET(c->socket, readset); - if(c->outbuflen > 0) - FD_SET(c->socket, writeset); - if(c->socket > max) - max = c->socket; - } - } +/* Put a misbehaving connection in the tarpit */ +void tarpit(int fd) { + static int pits[10] = {-1, -1, -1, -1, -1, -1, -1, -1, -1, -1}; + static int next_pit = 0; - for(i = 0; i < listen_sockets; i++) { - FD_SET(listen_socket[i].tcp, readset); - if(listen_socket[i].tcp > max) - max = listen_socket[i].tcp; - FD_SET(listen_socket[i].udp, readset); - if(listen_socket[i].udp > max) - max = listen_socket[i].udp; + if(pits[next_pit] != -1) { + closesocket(pits[next_pit]); } - if(device_fd >= 0) - FD_SET(device_fd, readset); - if(device_fd > max) - max = device_fd; - - return max; + pits[next_pit++] = fd; + + if(next_pit >= sizeof pits / sizeof pits[0]) { + next_pit = 0; + } } /* Terminate a connection: - - Close the socket - - Remove associated edge and tell other connections about it if report = true + - Mark it as inactive + - Remove the edge representing this connection + - Kill it with fire - Check if we need to retry making an outgoing connection - - Deactivate the host */ void terminate_connection(connection_t *c, bool report) { - if(c->status.remove) - return; + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname); - ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Closing connection with %s (%s)", - c->name, c->hostname); - - c->status.remove = true; - c->status.active = false; + if(c->node) { + if(c->node->connection == c) { + c->node->connection = NULL; + } - if(c->node) - c->node->connection = NULL; + if(c->edge) { + if(report && !tunnelserver) { + send_del_edge(everyone, c->edge); + } - if(c->socket) - closesocket(c->socket); + edge_del(c->edge); + c->edge = NULL; - if(c->edge) { - if(report && !tunnelserver) - send_del_edge(everyone, c->edge); + /* Run MST and SSSP algorithms */ - edge_del(c->edge); + graph(); - /* Run MST and SSSP algorithms */ + /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */ - graph(); + if(report && !c->node->status.reachable) { + edge_t *e; + e = lookup_edge(c->node, myself); - /* If the node is not reachable anymore but we remember it had an edge to us, clean it up */ + if(e) { + if(!tunnelserver) { + send_del_edge(everyone, e); + } - if(report && !c->node->status.reachable) { - edge_t *e; - e = lookup_edge(c->node, myself); - if(e) { - if(!tunnelserver) - send_del_edge(everyone, e); - edge_del(e); + edge_del(e); + } } } } - free_connection_partially(c); + outgoing_t *outgoing = c->outgoing; + connection_del(c); /* Check if this was our outgoing connection */ - if(c->outgoing) { - c->status.remove = false; - do_outgoing_connection(c); + if(outgoing) { + do_outgoing_connection(outgoing); } + +#ifndef HAVE_MINGW + /* Clean up dead proxy processes */ + + while(waitpid(-1, NULL, WNOHANG) > 0); + +#endif } /* @@ -222,387 +177,351 @@ 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; - connection_t *c; - - for(node = connection_tree->head; node; node = next) { - next = node->next; - c = node->data; - - if(c->last_ping_time + pingtimeout <= now) { - if(c->status.active) { - if(c->status.pinged) { - ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", - c->name, c->hostname, now - c->last_ping_time); - c->status.timeout = true; - terminate_connection(c, true); - } else if(c->last_ping_time + pinginterval <= now) { - send_ping(c); - } +static void timeout_handler(void *data) { + + bool close_all_connections = false; + + /* + timeout_handler will start after 30 seconds from start of tincd + hold information about the elapsed time since last time the handler + has been run + */ + long sleep_time = now.tv_sec - last_periodic_run_time.tv_sec; + + /* + It seems that finding sane default value is harder than expected + Since we send every second a UDP packet to make holepunching work + And default UDP state expire on firewalls is between 15-30 seconds + we drop all connections after 60 Seconds - UDPDiscoveryTimeout=30 + by default + */ + if(sleep_time > 2 * udp_discovery_timeout) { + logger(DEBUG_ALWAYS, LOG_ERR, "Awaking from dead after %ld seconds of sleep", sleep_time); + /* + Do not send any packets to tinc after we wake up. + The other node probably closed our connection but we still + are holding context information to them. This may happen on + laptops or any other hardware which can be suspended for some time. + Sending any data to node that wasn't expecting it will produce + annoying and misleading errors on the other side about failed signature + verification and or about missing sptps context + */ + close_all_connections = true; + } + + last_periodic_run_time = now; + + for list_each(connection_t, c, connection_list) { + // control connections (eg. tinc ctl) do not have any timeout + if(c->status.control) { + continue; + } + + if(close_all_connections) { + logger(DEBUG_ALWAYS, LOG_ERR, "Forcing connection close after sleep time %s (%s)", c->name, c->hostname); + terminate_connection(c, c->edge); + continue; + } + + // Bail out early if we haven't reached the ping timeout for this node yet + if(c->last_ping_time + pingtimeout > now.tv_sec) { + continue; + } + + // timeout during connection establishing + if(!c->edge) { + if(c->status.connecting) { + logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname); } else { - if(c->status.remove) { - logger(LOG_WARNING, "Old connection_t for %s (%s) status %04x still lingering, deleting...", - c->name, c->hostname, bitfield_to_int(&c->status, sizeof c->status)); - connection_del(c); - continue; - } - ifdebug(CONNECTIONS) logger(LOG_WARNING, "Timeout from %s (%s) during authentication", - c->name, c->hostname); - if(c->status.connecting) { - c->status.connecting = false; - closesocket(c->socket); - do_outgoing_connection(c); - } else { - terminate_connection(c, false); - } + logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname); + c->status.tarpit = true; } + + terminate_connection(c, c->edge); + continue; } - 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); - } + // helps in UDP holepunching + try_tx(c->node, false); + + // timeout during ping + if(c->status.pinged) { + logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)(now.tv_sec - c->last_ping_time)); + terminate_connection(c, c->edge); + continue; + } + + // check whether we need to send a new ping + if(c->last_ping_time + pinginterval <= now.tv_sec) { + send_ping(c); } } + + timeout_set(data, &(struct timeval) { + 1, rand() % 100000 + }); } -/* - check all connections to see if anything - happened on their sockets -*/ -static void check_network_activity(fd_set * readset, fd_set * writeset) { - connection_t *c; - avl_node_t *node; - int result, i; - socklen_t len = sizeof(result); - vpn_packet_t packet; - static int errors = 0; - - /* check input from kernel */ - if(device_fd >= 0 && FD_ISSET(device_fd, readset)) { - if(devops.read(&packet)) { - errors = 0; - packet.priority = 0; - route(myself, &packet); - } else { - usleep(errors * 50000); - errors++; - if(errors > 10) { - logger(LOG_ERR, "Too many errors from %s, exiting!", device); - running = false; - } +static void periodic_handler(void *data) { + /* Check if there are too many contradicting ADD_EDGE and DEL_EDGE messages. + This usually only happens when another node has the same Name as this node. + If so, sleep for a short while to prevent a storm of contradicting messages. + */ + + if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { + logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); + nanosleep(&(struct timespec) { + sleeptime, 0 + }, NULL); + sleeptime *= 2; + + if(sleeptime < 0) { + sleeptime = 3600; + } + } else { + sleeptime /= 2; + + if(sleeptime < 10) { + sleeptime = 10; } } - /* check meta connections */ - for(node = connection_tree->head; node; node = node->next) { - c = node->data; + contradicting_add_edge = 0; + contradicting_del_edge = 0; - if(c->status.remove) - continue; + /* If AutoConnect is set, check if we need to make or break connections. */ - if(FD_ISSET(c->socket, readset)) { - if(c->status.connecting) { - c->status.connecting = false; - getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len); - - if(!result) - finish_connecting(c); - else { - ifdebug(CONNECTIONS) logger(LOG_DEBUG, - "Error while connecting to %s (%s): %s", - c->name, c->hostname, sockstrerror(result)); - closesocket(c->socket); - do_outgoing_connection(c); - continue; - } - } + if(autoconnect && node_tree->count > 1) { + do_autoconnect(); + } - if(!receive_meta(c)) { - terminate_connection(c, c->status.active); - continue; - } - } + timeout_set(data, &(struct timeval) { + 5, rand() % 100000 + }); +} - if(FD_ISSET(c->socket, writeset)) { - if(!flush_meta(c)) { - terminate_connection(c, c->status.active); - continue; - } +void handle_meta_connection_data(connection_t *c) { + if(!receive_meta(c)) { + if(!c->status.control) { + c->status.tarpit = true; } + + terminate_connection(c, c->edge); + return; } +} - for(i = 0; i < listen_sockets; i++) { - if(FD_ISSET(listen_socket[i].udp, readset)) - handle_incoming_vpn_data(i); +#ifndef HAVE_MINGW +static void sigterm_handler(void *data) { + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); + event_exit(); +} + +static void sighup_handler(void *data) { + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); + reopenlogger(); - if(FD_ISSET(listen_socket[i].tcp, readset)) - handle_new_meta_connection(listen_socket[i].tcp); + if(reload_configuration()) { + exit(1); } } -/* - this is where it all happens... -*/ -int main_loop(void) { - fd_set readset, writeset; -#ifdef HAVE_PSELECT - struct timespec tv; - sigset_t omask, block_mask; - time_t next_event; -#else - struct timeval tv; -#endif - int r, maxfd; - time_t last_ping_check, last_config_check, last_graph_dump; - event_t *event; - - last_ping_check = now; - last_config_check = now; - last_graph_dump = now; - - srand(now); - -#ifdef HAVE_PSELECT - if(lookup_config(config_tree, "GraphDumpFile")) - graph_dump = true; - /* Block SIGHUP & SIGALRM */ - sigemptyset(&block_mask); - sigaddset(&block_mask, SIGHUP); - sigaddset(&block_mask, SIGALRM); - sigprocmask(SIG_BLOCK, &block_mask, &omask); +static void sigalrm_handler(void *data) { + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum)); + retry(); +} #endif - running = true; - - while(running) { -#ifdef HAVE_PSELECT - next_event = last_ping_check + pingtimeout; - if(graph_dump && next_event > last_graph_dump + 60) - next_event = last_graph_dump + 60; - - if((event = peek_next_event()) && next_event > event->time) - next_event = event->time; - - if(next_event <= now) - tv.tv_sec = 0; - else - tv.tv_sec = next_event - now; - tv.tv_nsec = 0; -#else - tv.tv_sec = 1; - tv.tv_usec = 0; -#endif +int reload_configuration(void) { + char fname[PATH_MAX]; - maxfd = build_fdset(&readset, &writeset); + /* Reread our own configuration file */ -#ifdef HAVE_MINGW - LeaveCriticalSection(&mutex); -#endif -#ifdef HAVE_PSELECT - r = pselect(maxfd + 1, &readset, &writeset, NULL, &tv, &omask); -#else - r = select(maxfd + 1, &readset, &writeset, NULL, &tv); -#endif - now = time(NULL); -#ifdef HAVE_MINGW - EnterCriticalSection(&mutex); -#endif + exit_configuration(&config_tree); + init_configuration(&config_tree); - if(r < 0) { - if(!sockwouldblock(sockerrno)) { - logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno)); - dump_connections(); - return 1; - } - } + if(!read_server_config()) { + logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file."); + return EINVAL; + } - if(r > 0) - check_network_activity(&readset, &writeset); + read_config_options(config_tree, NULL); - if(do_purge) { - purge(); - do_purge = false; - } + snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, myself->name); + read_config_file(config_tree, fname, true); - /* Let's check if everybody is still alive */ + /* Parse some options that are allowed to be changed while tinc is running */ - if(last_ping_check + pingtimeout <= now) { - check_dead_connections(); - last_ping_check = now; + setup_myself_reloadable(); - if(routing_mode == RMODE_SWITCH) - age_subnets(); + /* If StrictSubnet is set, expire deleted Subnets and read new ones in */ - age_past_requests(); + if(strictsubnets) { + for splay_each(subnet_t, subnet, subnet_tree) + if(subnet->owner) { + subnet->expires = 1; + } + } - /* Should we regenerate our key? */ + for splay_each(node_t, n, node_tree) { + n->status.has_address = false; + } - if(keyexpires <= now) { - avl_node_t *node; - node_t *n; + load_all_nodes(); - ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys"); + if(strictsubnets) { + for splay_each(subnet_t, subnet, subnet_tree) { + if(!subnet->owner) { + continue; + } - for(node = node_tree->head; node; node = node->next) { - n = node->data; - if(n->inkey) { - free(n->inkey); - n->inkey = NULL; - } - } + if(subnet->expires == 1) { + send_del_subnet(everyone, subnet); - send_key_changed(); - keyexpires = now + keylifetime; - } + if(subnet->owner->status.reachable) { + subnet_update(subnet->owner, subnet, false); + } - /* Detect ADD_EDGE/DEL_EDGE storms that are caused when - * two tinc daemons with the same name are on the VPN. - * If so, sleep a while. If this happens multiple times - * in a row, sleep longer. */ - - if(contradicting_del_edge > 100 && contradicting_add_edge > 100) { - logger(LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime); - usleep(sleeptime * 1000000LL); - sleeptime *= 2; - if(sleeptime < 0) - sleeptime = 3600; + subnet_del(subnet->owner, subnet); + } else if(subnet->expires == -1) { + subnet->expires = 0; } else { - sleeptime /= 2; - if(sleeptime < 10) - sleeptime = 10; - } + send_add_subnet(everyone, subnet); - contradicting_add_edge = 0; - contradicting_del_edge = 0; - } - - if(sigalrm) { - avl_node_t *node; - logger(LOG_INFO, "Flushing event queue"); - expire_events(); - for(node = connection_tree->head; node; node = node->next) { - connection_t *c = node->data; - send_ping(c); + if(subnet->owner->status.reachable) { + subnet_update(subnet->owner, subnet, true); + } } - sigalrm = false; - } - - while((event = get_expired_event())) { - event->handler(event->data); - free_event(event); } + } else { /* Only read our own subnets back in */ + for splay_each(subnet_t, subnet, myself->subnet_tree) + if(!subnet->expires) { + subnet->expires = 1; + } - if(sighup) { - connection_t *c; - avl_node_t *node, *next; - char *fname; - struct stat s; - - sighup = false; - - reopenlogger(); - - /* Reread our own configuration file */ + config_t *cfg = lookup_config(config_tree, "Subnet"); - exit_configuration(&config_tree); - init_configuration(&config_tree); + while(cfg) { + subnet_t *subnet, *s2; - if(!read_server_config()) { - logger(LOG_ERR, "Unable to reread configuration file, exitting."); - return 1; + if(!get_config_subnet(cfg, &subnet)) { + continue; } - /* Cancel non-active outgoing connections */ + if((s2 = lookup_subnet(myself, subnet))) { + if(s2->expires == 1) { + s2->expires = 0; + } - for(node = connection_tree->head; node; node = next) { - next = node->next; - c = node->data; + free_subnet(subnet); + } else { + subnet_add(myself, subnet); + send_add_subnet(everyone, subnet); + subnet_update(myself, subnet, true); + } - c->outgoing = NULL; + cfg = lookup_config_next(config_tree, cfg); + } - if(c->status.connecting) { - terminate_connection(c, false); - connection_del(c); - } + for splay_each(subnet_t, subnet, myself->subnet_tree) { + if(subnet->expires == 1) { + send_del_subnet(everyone, subnet); + subnet_update(myself, subnet, false); + subnet_del(myself, subnet); } + } + } - /* Wipe list of outgoing connections */ + /* Try to make outgoing connections */ - for(list_node_t *node = outgoing_list->head; node; node = node->next) { - outgoing_t *outgoing = node->data; + try_outgoing_connections(); - if(outgoing->event) - event_del(outgoing->event); - } + /* Close connections to hosts that have a changed or deleted host config file */ - list_delete_list(outgoing_list); - - /* 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; - - xasprintf(&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); - } + for list_each(connection_t, c, connection_list) { + if(c->status.control) { + continue; + } - last_config_check = now; + snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, c->name); + struct stat s; - /* If StrictSubnet is set, expire deleted Subnets and read new ones in */ + if(stat(fname, &s) || s.st_mtime > last_config_check) { + logger(DEBUG_CONNECTIONS, LOG_INFO, "Host config file of %s has been changed", c->name); + terminate_connection(c, c->edge); + } + } - if(strictsubnets) { - subnet_t *subnet; + last_config_check = now.tv_sec; - for(node = subnet_tree->head; node; node = node->next) { - subnet = node->data; - subnet->expires = 1; - } + return 0; +} - load_all_subnets(); - - for(node = subnet_tree->head; node; node = next) { - next = node->next; - subnet = node->data; - if(subnet->expires == 1) { - send_del_subnet(everyone, subnet); - if(subnet->owner->status.reachable) - subnet_update(subnet->owner, subnet, false); - subnet_del(subnet->owner, subnet); - } else if(subnet->expires == -1) { - subnet->expires = 0; - } else { - send_add_subnet(everyone, subnet); - if(subnet->owner->status.reachable) - subnet_update(subnet->owner, subnet, true); - } - } - } +void retry(void) { + /* Reset the reconnection timers for all outgoing connections */ + for list_each(outgoing_t, outgoing, outgoing_list) { + outgoing->timeout = 0; - /* Try to make outgoing connections */ - - try_outgoing_connections(); - } - - /* Dump graph if wanted every 60 seconds*/ + if(outgoing->ev.cb) + timeout_set(&outgoing->ev, &(struct timeval) { + 0, 0 + }); + } - if(last_graph_dump + 60 <= now) { - dump_graph(); - last_graph_dump = now; + /* Check for outgoing connections that are in progress, and reset their ping timers */ + for list_each(connection_t, c, connection_list) { + if(c->outgoing && !c->node) { + c->last_ping_time = 0; } } -#ifdef HAVE_PSELECT - /* Restore SIGHUP & SIGALARM mask */ - sigprocmask(SIG_SETMASK, &omask, NULL); + /* Kick the ping timeout handler */ + timeout_set(&pingtimer, &(struct timeval) { + 0, 0 + }); +} + +/* + this is where it all happens... +*/ +int main_loop(void) { + last_periodic_run_time = now; + timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval) { + pingtimeout, rand() % 100000 + }); + timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval) { + 0, 0 + }); + +#ifndef HAVE_MINGW + signal_t sighup = {0}; + signal_t sigterm = {0}; + signal_t sigquit = {0}; + signal_t sigint = {0}; + signal_t sigalrm = {0}; + + signal_add(&sighup, sighup_handler, &sighup, SIGHUP); + signal_add(&sigterm, sigterm_handler, &sigterm, SIGTERM); + signal_add(&sigquit, sigterm_handler, &sigquit, SIGQUIT); + signal_add(&sigint, sigterm_handler, &sigint, SIGINT); + signal_add(&sigalrm, sigalrm_handler, &sigalrm, SIGALRM); +#endif + + if(!event_loop()) { + logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno)); + return 1; + } + +#ifndef HAVE_MINGW + signal_del(&sighup); + signal_del(&sigterm); + signal_del(&sigquit); + signal_del(&sigint); + signal_del(&sigalrm); #endif + timeout_del(&periodictimer); + timeout_del(&pingtimer); + return 0; }