X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=69a0133e652bcd399a63bf3d8e594d417559772e;hp=a1b170524e9c059695ed95334aee295dbd31fabd;hb=5638b9830f9cfe43f545c37cfd7ccf1d4b4bfcc6;hpb=14979f835df4214a7c2510852f7ffedc9e08c2c0 diff --git a/src/net.c b/src/net.c index a1b17052..69a0133e 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.160 2002/03/01 14:09:31 guus Exp $ + $Id: net.c,v 1.35.4.178 2002/09/06 21:22:35 guus Exp $ */ #include "config.h" @@ -26,8 +26,13 @@ #include #include #include -#ifdef HAVE_LINUX +#ifdef HAVE_NETINET_IN_SYSTM_H + #include +#endif +#ifdef HAVE_NETINET_IP_H #include +#endif +#ifdef HAVE_NETINET_TCP_H #include #endif #include @@ -68,49 +73,24 @@ #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; + avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext; node_t *n; edge_t *e; subnet_t *s; - connection_t *c; cp if(debug_lvl >= DEBUG_PROTOCOL) syslog(LOG_DEBUG, _("Purging unreachable nodes")); @@ -129,14 +109,7 @@ cp { 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); - } - + send_del_subnet(broadcast, s); subnet_del(n, s); } @@ -144,14 +117,7 @@ cp { 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); - } - + send_del_edge(broadcast, e); edge_del(e); } @@ -161,6 +127,43 @@ cp cp } +/* + 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) +{ + avl_node_t *node, *next; + connection_t *c; + int i; +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); + } + + for(i = 0; i < listen_sockets; i++) + { + FD_SET(listen_socket[i].tcp, fs); + FD_SET(listen_socket[i].udp, fs); + } + + FD_SET(device_fd, fs); +cp +} + /* Terminate a connection: - Close the socket @@ -170,8 +173,6 @@ cp */ void terminate_connection(connection_t *c, int report) { - avl_node_t *node; - connection_t *other; cp if(c->status.remove) return; @@ -181,6 +182,10 @@ cp 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); @@ -188,21 +193,14 @@ cp 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); - } - } + send_del_edge(broadcast, c->edge); edge_del(c->edge); - } - /* Run MST and SSSP algorithms */ + /* Run MST and SSSP algorithms */ - graph(); + graph(); + } /* Check if this was our outgoing connection */ @@ -211,13 +209,6 @@ cp retry_outgoing(c->outgoing); c->outgoing = NULL; } - - /* Deactivate */ - - c->status.active = 0; - if(c->node) - c->node->connection = NULL; - do_prune = 1; cp } @@ -257,6 +248,12 @@ cp } 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); @@ -285,20 +282,12 @@ cp 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; + continue; if(FD_ISSET(c->socket, f)) { @@ -320,29 +309,18 @@ cp if(receive_meta(c) < 0) { terminate_connection(c, c->status.active); - return; + continue; } } } -cp -} -void prune_connections(void) -{ - connection_t *c; - avl_node_t *node, *next; -cp - for(node = connection_tree->head; node; node = next) + for(i = 0; i < listen_sockets; i++) { - next = node->next; - c = (connection_t *)node->data; - - if(c->status.remove) - connection_del(c); + 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); } - - if(!connection_tree->head) - purge(); cp } @@ -355,7 +333,6 @@ void main_loop(void) struct timeval tv; int r; time_t last_ping_check; - int t; event_t *event; cp last_ping_check = now; @@ -373,23 +350,20 @@ cp if((r = select(FD_SETSIZE, &fset, NULL, NULL, &tv)) < 0) { - if(errno != EINTR) /* because of a signal */ + if(errno != EINTR && errno != EAGAIN) { syslog(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno)); + cp_trace(); + dump_connections(); return; } - } - - if(r > 0) - check_network_activity(&fset); - if(do_prune) - { - prune_connections(); - do_prune = 0; + continue; } - if(do_purge) + check_network_activity(&fset); + + if(do_purge) { purge(); do_purge = 0; @@ -402,9 +376,11 @@ cp check_dead_connections(); last_ping_check = now; - if(routing_mode != RMODE_ROUTER) + if(routing_mode== RMODE_SWITCH) age_mac(); + age_past_requests(); + /* Should we regenerate our key? */ if(keyexpires < now) @@ -413,7 +389,7 @@ cp syslog(LOG_INFO, _("Regenerating symmetric key")); RAND_pseudo_bytes(myself->key, myself->keylength); - send_key_changed(myself->connection, myself); + send_key_changed(broadcast, myself); keyexpires = now + keylifetime; } } @@ -444,14 +420,14 @@ cp close_network_connections(); exit_configuration(&config_tree); - syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds")); + 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, exiting")); + syslog(LOG_ERR, _("Unable to reread configuration file, exitting.")); exit(1); }