X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=8b2c9f03336cfb4e568f43bc7e46f2b4fcb2e923;hp=5cd3fa5efb4a81b72f1a816cbf313185faeb9219;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=f75dcef72a81a337e847adf0bae54198894f65b9 diff --git a/src/net.c b/src/net.c index 5cd3fa5e..8b2c9f03 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* net.c -- most of the network code - Copyright (C) 1998-2002 Ivo Timmermans , - 2000-2002 Guus Sliepen + Copyright (C) 1998-2003 Ivo Timmermans , + 2000-2003 Guus Sliepen 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 @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.180 2002/09/09 21:24:34 guus Exp $ + $Id: net.c,v 1.35.4.190 2003/07/12 17:41:45 guus Exp $ */ #include "config.h" @@ -25,23 +25,13 @@ #include #include #include -#include -#ifdef HAVE_NETINET_IN_SYSTM_H -#include -#endif -#ifdef HAVE_NETINET_IP_H -#include -#endif -#ifdef HAVE_NETINET_TCP_H -#include -#endif #include #include #include #include #include #include -#include +#include #include #include /* SunOS really wants sys/socket.h BEFORE net/if.h, @@ -49,6 +39,16 @@ #include #include #include +#ifdef HAVE_NETINET_IN_SYSTM_H +#include +#endif +#include +#ifdef HAVE_NETINET_IP_H +#include +#endif +#ifdef HAVE_NETINET_TCP_H +#include +#endif #include @@ -70,13 +70,10 @@ #include "route.h" #include "device.h" #include "event.h" +#include "logger.h" #include "system.h" -#ifndef HAVE_RAND_PSEUDO_BYTES -#define RAND_pseudo_bytes RAND_bytes -#endif - int do_purge = 0; int sighup = 0; int sigalrm = 0; @@ -85,7 +82,7 @@ time_t now = 0; /* Purge edges and subnets of unreachable nodes. Use carefully. */ -void purge(void) +static void purge(void) { avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; node_t *n; @@ -94,16 +91,14 @@ void purge(void) cp(); - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_DEBUG, _("Purging unreachable nodes")); + ifdebug(PROTOCOL) logger(LOG_DEBUG, _("Purging unreachable nodes")); for(nnode = node_tree->head; nnode; nnode = nnext) { nnext = nnode->next; n = (node_t *) nnode->data; if(!n->status.reachable) { - if(debug_lvl >= DEBUG_SCARY_THINGS) - syslog(LOG_DEBUG, _("Purging node %s (%s)"), n->name, + ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Purging node %s (%s)"), n->name, n->hostname); for(snode = n->subnet_tree->head; snode; snode = snext) { @@ -129,11 +124,11 @@ void purge(void) put all file descriptors in an fd_set array While we're at it, purge stuff that needs to be removed. */ -void build_fdset(fd_set * fs) +static int build_fdset(fd_set * fs) { avl_node_t *node, *next; connection_t *c; - int i; + int i, max = 0; cp(); @@ -147,16 +142,27 @@ void build_fdset(fd_set * fs) connection_del(c); if(!connection_tree->head) purge(); - } else + } else { FD_SET(c->socket, fs); + if(c->socket > max) + max = c->socket; + } } for(i = 0; i < listen_sockets; i++) { FD_SET(listen_socket[i].tcp, fs); + if(listen_socket[i].tcp > max) + max = listen_socket[i].tcp; FD_SET(listen_socket[i].udp, fs); + if(listen_socket[i].udp > max) + max = listen_socket[i].udp; } FD_SET(device_fd, fs); + if(device_fd > max) + max = device_fd; + + return max; } /* @@ -166,15 +172,14 @@ void build_fdset(fd_set * fs) - Check if we need to retry making an outgoing connection - Deactivate the host */ -void terminate_connection(connection_t * c, int report) +void terminate_connection(connection_t *c, int report) { cp(); if(c->status.remove) return; - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), + ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"), c->name, c->hostname); c->status.remove = 1; @@ -213,7 +218,7 @@ void terminate_connection(connection_t * c, int report) end does not reply in time, we consider them dead and close the connection. */ -void check_dead_connections(void) +static void check_dead_connections(void) { avl_node_t *node, *next; connection_t *c; @@ -227,8 +232,7 @@ void check_dead_connections(void) if(c->last_ping_time + pingtimeout < now) { if(c->status.active) { if(c->status.pinged) { - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(LOG_INFO, _("%s (%s) didn't respond to PING"), + ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING"), c->name, c->hostname); c->status.timeout = 1; terminate_connection(c, 1); @@ -237,13 +241,12 @@ void check_dead_connections(void) } } else { if(c->status.remove) { - syslog(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."), + logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."), c->name, c->hostname, c->status); connection_del(c); continue; } - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"), + ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname); terminate_connection(c, 0); } @@ -255,7 +258,7 @@ void check_dead_connections(void) check all connections to see if anything happened on their sockets */ -void check_network_activity(fd_set * f) +static void check_network_activity(fd_set * f) { connection_t *c; avl_node_t *node; @@ -284,8 +287,7 @@ void check_network_activity(fd_set * f) if(!result) finish_connecting(c); else { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_DEBUG, + ifdebug(CONNECTIONS) logger(LOG_DEBUG, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(result)); close(c->socket); @@ -317,13 +319,14 @@ void main_loop(void) { fd_set fset; struct timeval tv; - int r; - time_t last_ping_check; + int r, maxfd; + time_t last_ping_check, last_config_check; event_t *event; cp(); last_ping_check = now; + last_config_check = now; srand(now); for(;;) { @@ -332,13 +335,13 @@ void main_loop(void) tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */ tv.tv_usec = 0; - build_fdset(&fset); + maxfd = build_fdset(&fset); - r = select(FD_SETSIZE, &fset, NULL, NULL, &tv); + r = select(maxfd + 1, &fset, NULL, NULL, &tv); if(r < 0) { if(errno != EINTR && errno != EAGAIN) { - syslog(LOG_ERR, _("Error while waiting for input: %s"), + logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); cp_trace(); dump_connections(); @@ -369,10 +372,10 @@ void main_loop(void) /* Should we regenerate our key? */ if(keyexpires < now) { - if(debug_lvl >= DEBUG_STATUS) - syslog(LOG_INFO, _("Regenerating symmetric key")); + ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key")); RAND_pseudo_bytes(myself->key, myself->keylength); + EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len); send_key_changed(broadcast, myself); keyexpires = now + keylifetime; } @@ -385,7 +388,7 @@ void main_loop(void) } if(sigalrm) { - syslog(LOG_INFO, _("Flushing event queue")); + logger(LOG_INFO, _("Flushing event queue")); while(event_tree->head) { event = (event_t *) event_tree->head->data; @@ -396,24 +399,47 @@ void main_loop(void) } if(sighup) { + connection_t *c; + avl_node_t *node; + char *fname; + struct stat s; + sighup = 0; - close_network_connections(); - exit_configuration(&config_tree); - - syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds...")); - sleep(5); + + /* Reread our own configuration file */ + exit_configuration(&config_tree); init_configuration(&config_tree); if(read_server_config()) { - syslog(LOG_ERR, - _("Unable to reread configuration file, exitting.")); + logger(LOG_ERR, _("Unable to reread configuration file, exitting.")); exit(1); } - if(setup_network_connections()) - return; + /* Close connections to hosts that have a changed or deleted host config file */ + + for(node = connection_tree->head; node; node = node->next) { + c = (connection_t *) node->data; + + if(c->outgoing) { + free(c->outgoing->name); + 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(); + continue; } }