X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=ee18037be4cdf14ace6e99b213979445e330368e;hp=acba5ad3902b97c01c6147be900d9833460406c6;hb=c08858baa91a00e38c0f5482dbb0817dbd0361f1;hpb=c2713ba7a5ff12e270d66a5d3188a3640873830e diff --git a/src/net.c b/src/net.c index acba5ad3..ee18037b 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-2002 Ivo Timmermans , + 2000-2002 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.163 2002/03/11 11:45:12 guus Exp $ + $Id: net.c,v 1.35.4.183 2003/01/17 00:37:18 guus Exp $ */ #include "config.h" @@ -25,11 +25,6 @@ #include #include #include -#include -#ifdef HAVE_LINUX - #include - #include -#endif #include #include #include @@ -44,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 @@ -68,97 +73,101 @@ #include "system.h" -int do_prune = 0; +#ifndef HAVE_RAND_PSEUDO_BYTES +#define RAND_pseudo_bytes RAND_bytes +#endif + int do_purge = 0; int sighup = 0; int sigalrm = 0; time_t now = 0; -/* - put all file descriptors in an fd_set array -*/ -void build_fdset(fd_set *fs) -{ - avl_node_t *node; - connection_t *c; - int i; -cp - FD_ZERO(fs); - - for(node = connection_tree->head; node; node = node->next) - { - c = (connection_t *)node->data; - FD_SET(c->socket, fs); - } - - for(i = 0; i < listen_sockets; i++) - { - FD_SET(tcp_socket[i], fs); - FD_SET(udp_socket[i], fs); - } - - FD_SET(device_fd, fs); -cp -} - /* Purge edges and subnets of unreachable nodes. Use carefully. */ void purge(void) { - avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext, *cnode; - node_t *n; - edge_t *e; - subnet_t *s; - connection_t *c; -cp - if(debug_lvl >= DEBUG_PROTOCOL) - syslog(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, n->hostname); - - for(snode = n->subnet_tree->head; snode; snode = snext) - { - snext = snode->next; - s = (subnet_t *)snode->data; - - for(cnode = connection_tree->head; cnode; cnode = cnode->next) - { - c = (connection_t *)cnode->data; - if(c->status.active) - send_del_subnet(c, s); - } - - subnet_del(n, s); - } - - for(enode = n->edge_tree->head; enode; enode = enext) - { - enext = enode->next; - e = (edge_t *)enode->data; - - for(cnode = connection_tree->head; cnode; cnode = cnode->next) - { - c = (connection_t *)cnode->data; - if(c->status.active) - send_del_edge(c, e); - } - - edge_del(e); - } - - node_del(n); - } - } -cp + avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; + node_t *n; + edge_t *e; + subnet_t *s; + + cp(); + + if(debug_lvl >= DEBUG_PROTOCOL) + syslog(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, + n->hostname); + + for(snode = n->subnet_tree->head; snode; snode = snext) { + snext = snode->next; + s = (subnet_t *) snode->data; + send_del_subnet(broadcast, s); + subnet_del(n, s); + } + + for(enode = n->edge_tree->head; enode; enode = enext) { + enext = enode->next; + e = (edge_t *) enode->data; + send_del_edge(broadcast, e); + edge_del(e); + } + + node_del(n); + } + } +} + +/* + put all file descriptors in an fd_set array + While we're at it, purge stuff that needs to be removed. +*/ +int build_fdset(fd_set * fs) +{ + avl_node_t *node, *next; + connection_t *c; + int i, max = 0; + + cp(); + + FD_ZERO(fs); + + for(node = connection_tree->head; node; node = next) { + next = node->next; + c = (connection_t *) node->data; + + if(c->status.remove) { + connection_del(c); + if(!connection_tree->head) + purge(); + } 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; } /* @@ -170,55 +179,41 @@ cp */ void terminate_connection(connection_t *c, int report) { - avl_node_t *node; - connection_t *other; -cp - if(c->status.remove) - return; - - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), - c->name, c->hostname); - - c->status.remove = 1; - - if(c->socket) - close(c->socket); - - if(c->edge) - { - if(report) - { - for(node = connection_tree->head; node; node = node->next) - { - other = (connection_t *)node->data; - if(other->status.active && other != c) - send_del_edge(other, c->edge); - } - } - - edge_del(c->edge); - } - - /* Run MST and SSSP algorithms */ - - graph(); - - /* Check if this was our outgoing connection */ - - if(c->outgoing) - { - retry_outgoing(c->outgoing); - c->outgoing = NULL; - } - - /* Deactivate */ - - c->status.active = 0; - if(c->node) - c->node->connection = NULL; - do_prune = 1; -cp + cp(); + + if(c->status.remove) + return; + + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_NOTICE, _("Closing connection with %s (%s)"), + c->name, c->hostname); + + c->status.remove = 1; + c->status.active = 0; + + if(c->node) + c->node->connection = NULL; + + if(c->socket) + close(c->socket); + + if(c->edge) { + if(report) + send_del_edge(broadcast, c->edge); + + edge_del(c->edge); + + /* Run MST and SSSP algorithms */ + + graph(); + } + + /* Check if this was our outgoing connection */ + + if(c->outgoing) { + retry_outgoing(c->outgoing); + c->outgoing = NULL; + } } /* @@ -231,119 +226,99 @@ cp */ void check_dead_connections(void) { - avl_node_t *node, *next; - connection_t *c; -cp - for(node = connection_tree->head; node; node = next) - { - next = node->next; - c = (connection_t *)node->data; - 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"), - c->name, c->hostname); - c->status.timeout = 1; - terminate_connection(c, 1); - } - else - { - send_ping(c); - } - } - else - { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_WARNING, _("Timeout from %s (%s) during authentication"), - c->name, c->hostname); - terminate_connection(c, 0); - } - } - } -cp + avl_node_t *node, *next; + connection_t *c; + + cp(); + + for(node = connection_tree->head; node; node = next) { + next = node->next; + c = (connection_t *) node->data; + + 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"), + c->name, c->hostname); + c->status.timeout = 1; + terminate_connection(c, 1); + } else { + send_ping(c); + } + } else { + if(c->status.remove) { + syslog(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"), + c->name, c->hostname); + terminate_connection(c, 0); + } + } + } } /* check all connections to see if anything happened on their sockets */ -void check_network_activity(fd_set *f) +void check_network_activity(fd_set * f) { - connection_t *c; - avl_node_t *node; - int result, i; - int len = sizeof(result); - vpn_packet_t packet; -cp - if(FD_ISSET(device_fd, f)) - { - if(!read_packet(&packet)) - route_outgoing(&packet); - } - - for(i = 0; i < listen_sockets; i++) - { - if(FD_ISSET(udp_socket[i], f)) - handle_incoming_vpn_data(udp_socket[i]); - if(FD_ISSET(tcp_socket[i], f)) - handle_new_meta_connection(tcp_socket[i]); - } - - for(node = connection_tree->head; node; node = node->next) - { - c = (connection_t *)node->data; - - if(c->status.remove) - return; - - if(FD_ISSET(c->socket, f)) - { - if(c->status.connecting) - { - c->status.connecting = 0; - getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); - if(!result) - finish_connecting(c); - else - { - if(debug_lvl >= DEBUG_CONNECTIONS) - syslog(LOG_DEBUG, _("Error while connecting to %s (%s): %s"), c->name, c->hostname, strerror(result)); - close(c->socket); - do_outgoing_connection(c); - continue; - } - } - if(receive_meta(c) < 0) - { - terminate_connection(c, c->status.active); - return; - } - } - } -cp -} - -void prune_connections(void) -{ - connection_t *c; - avl_node_t *node, *next; -cp - for(node = connection_tree->head; node; node = next) - { - next = node->next; - c = (connection_t *)node->data; - - if(c->status.remove) - connection_del(c); - } - - if(!connection_tree->head) - purge(); -cp + connection_t *c; + avl_node_t *node; + int result, i; + int len = sizeof(result); + vpn_packet_t packet; + + cp(); + + if(FD_ISSET(device_fd, f)) { + if(!read_packet(&packet)) + route_outgoing(&packet); + } + + for(node = connection_tree->head; node; node = node->next) { + c = (connection_t *) node->data; + + if(c->status.remove) + continue; + + if(FD_ISSET(c->socket, f)) { + if(c->status.connecting) { + c->status.connecting = 0; + getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len); + + if(!result) + finish_connecting(c); + else { + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_DEBUG, + _("Error while connecting to %s (%s): %s"), + c->name, c->hostname, strerror(result)); + close(c->socket); + do_outgoing_connection(c); + continue; + } + } + + if(receive_meta(c) < 0) { + terminate_connection(c, c->status.active); + continue; + } + } + } + + for(i = 0; i < listen_sockets; i++) { + if(FD_ISSET(listen_socket[i].udp, f)) + handle_incoming_vpn_data(listen_socket[i].udp); + + if(FD_ISSET(listen_socket[i].tcp, f)) + handle_new_meta_connection(listen_socket[i].tcp); + } } /* @@ -351,115 +326,106 @@ cp */ void main_loop(void) { - fd_set fset; - struct timeval tv; - int r; - time_t last_ping_check; - int t; - event_t *event; -cp - last_ping_check = now; - - srand(now); - - for(;;) - { - now = time(NULL); - - tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */ - tv.tv_usec = 0; - - if(do_prune) - { - prune_connections(); - do_prune = 0; - } - - build_fdset(&fset); - - if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0) - { - if(errno != EINTR) /* because of a signal */ - { - syslog(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); - return; - } - } - - if(r > 0) - check_network_activity(&fset); - - if(do_purge) - { - purge(); - do_purge = 0; - } - - /* 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_mac(); - - /* Should we regenerate our key? */ - - if(keyexpires < now) - { - if(debug_lvl >= DEBUG_STATUS) - syslog(LOG_INFO, _("Regenerating symmetric key")); - - RAND_pseudo_bytes(myself->key, myself->keylength); - send_key_changed(myself->connection, myself); - keyexpires = now + keylifetime; - } - } - - - while((event = get_expired_event())) - { - event->handler(event->data); - free(event); - } - - if(sigalrm) - { - syslog(LOG_INFO, _("Flushing event queue")); - - while(event_tree->head) - { - event = (event_t *)event_tree->head->data; - event->handler(event->data); - event_del(event); - } - sigalrm = 0; - } - - if(sighup) - { - sighup = 0; - close_network_connections(); - exit_configuration(&config_tree); - - syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds...")); - sleep(5); - - init_configuration(&config_tree); - - if(read_server_config()) - { - syslog(LOG_ERR, _("Unable to reread configuration file, exitting.")); - exit(1); - } - - if(setup_network_connections()) - return; - - continue; - } - } -cp + fd_set fset; + struct timeval tv; + int r, maxfd; + time_t last_ping_check; + event_t *event; + + cp(); + + last_ping_check = now; + srand(now); + + for(;;) { + now = time(NULL); + + tv.tv_sec = 1 + (rand() & 7); /* Approx. 5 seconds, randomized to prevent global synchronisation effects */ + tv.tv_usec = 0; + + maxfd = build_fdset(&fset); + + 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"), + strerror(errno)); + cp_trace(); + dump_connections(); + return; + } + + continue; + } + + check_network_activity(&fset); + + if(do_purge) { + purge(); + do_purge = 0; + } + + /* 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_mac(); + + age_past_requests(); + + /* Should we regenerate our key? */ + + if(keyexpires < now) { + if(debug_lvl >= DEBUG_STATUS) + syslog(LOG_INFO, _("Regenerating symmetric key")); + + RAND_pseudo_bytes(myself->key, myself->keylength); + send_key_changed(broadcast, myself); + keyexpires = now + keylifetime; + } + } + + + while((event = get_expired_event())) { + event->handler(event->data); + free(event); + } + + if(sigalrm) { + syslog(LOG_INFO, _("Flushing event queue")); + + while(event_tree->head) { + event = (event_t *) event_tree->head->data; + event->handler(event->data); + event_del(event); + } + sigalrm = 0; + } + + if(sighup) { + sighup = 0; + close_network_connections(); + exit_configuration(&config_tree); + + syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds...")); + sleep(5); + + init_configuration(&config_tree); + + if(read_server_config()) { + syslog(LOG_ERR, + _("Unable to reread configuration file, exitting.")); + exit(1); + } + + if(setup_network_connections()) + return; + + continue; + } + } }