X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=8c3f9a08c4b7ae627753f632f91d1bdc78acc3cb;hp=fe9eed7846f40ddce15295f0af64c87a5aab9400;hb=ffb88ff6410f33de92db108bd1e0c3a915368214;hpb=ac066bb057dcb187bf91670793ba5e6ca456e052 diff --git a/src/net.c b/src/net.c index fe9eed78..8c3f9a08 100644 --- a/src/net.c +++ b/src/net.c @@ -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.138 2001/10/27 13:13:35 guus Exp $ + $Id: net.c,v 1.35.4.145 2001/10/31 20:22:52 guus Exp $ */ #include "config.h" @@ -81,6 +81,8 @@ int udp_socket = -1; int keylifetime = 0; int keyexpires = 0; +int do_prune = 0; + /* VPN packet I/O */ void receive_udppacket(node_t *n, vpn_packet_t *inpkt) @@ -192,32 +194,17 @@ cp return; } - if(!n->status.active) - { - if(debug_lvl >= DEBUG_TRAFFIC) - syslog(LOG_INFO, _("%s (%s) is not active, dropping packet"), - n->name, n->hostname); - - return; - } -/* FIXME - if(n->via == myself) - via = n->nexthop; - else - via = n->via; - - if(via != n && debug_lvl >= DEBUG_TRAFFIC) + if(n->via != n && debug_lvl >= DEBUG_TRAFFIC) syslog(LOG_ERR, _("Sending packet to %s via %s (%s)"), - n->name, via->name, via->hostname); + n->name, n->via->name, n->via->hostname); - if((myself->options | via->options) & OPTION_TCPONLY) + if((myself->options | n->via->options) & OPTION_TCPONLY) { - if(send_tcppacket(via->connection, packet)) - terminate_connection(via->connection, 1); + if(send_tcppacket(n->via->connection, packet)) + terminate_connection(n->via->connection, 1); } else - send_udppacket(via, packet); -*/ + send_udppacket(n->via, packet); } /* Broadcast a packet to all active direct connections */ @@ -378,7 +365,6 @@ int setup_outgoing_socket(connection_t *c) { int flags; struct sockaddr_in a; - int option; cp if(debug_lvl >= DEBUG_CONNECTIONS) syslog(LOG_INFO, _("Trying to connect to %s (%s)"), c->name, c->hostname); @@ -453,11 +439,23 @@ cp int setup_outgoing_connection(char *name) { connection_t *c; + node_t *n; struct hostent *h; cp + n = lookup_node(name); + + if(n) + if(n->connection) + { + if(debug_lvl >= DEBUG_CONNECTIONS) + syslog(LOG_INFO, _("Already connected to %s"), name); + return 0; + } + c = new_connection(); c->name = xstrdup(name); + init_configuration(&c->config_tree); read_connection_config(c); if(!get_config_string(lookup_config(c->config_tree, "Address"), &c->hostname)) @@ -622,6 +620,7 @@ int setup_myself(void) cp myself = new_node(); myself->connection = new_connection(); + init_configuration(&myself->connection->config_tree); asprintf(&myself->hostname, _("MYSELF")); asprintf(&myself->connection->hostname, _("MYSELF")); @@ -666,9 +665,11 @@ cp return -1; } */ - if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->connection->port)) + if(!get_config_port(lookup_config(myself->connection->config_tree, "Port"), &myself->port)) myself->port = 655; + myself->connection->port = myself->port; + /* Read in all the subnets specified in the host configuration file */ cfg = lookup_config(myself->connection->config_tree, "Subnet"); @@ -705,7 +706,7 @@ cp if(myself->options & OPTION_TCPONLY) myself->options |= OPTION_INDIRECT; - if(get_config_string(lookup_config(myself->connection->config_tree, "Mode"), &mode)) + if(get_config_string(lookup_config(config_tree, "Mode"), &mode)) { if(!strcasecmp(mode, "router")) routing_mode = RMODE_ROUTER; @@ -746,7 +747,7 @@ cp myself->key = (char *)xmalloc(myself->keylength); RAND_pseudo_bytes(myself->key, myself->keylength); - if(!get_config_int(lookup_config(myself->connection->config_tree, "KeyExpire"), &keylifetime)) + if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime)) keylifetime = 3600; keyexpires = time(NULL) + keylifetime; @@ -771,8 +772,10 @@ int setup_network_connections(void) cp init_connections(); init_subnets(); + init_nodes(); + init_edges(); - if(get_config_int(lookup_config(myself->connection->config_tree, "PingTimeout"), &timeout)) + if(get_config_int(lookup_config(config_tree, "PingTimeout"), &timeout)) { if(timeout < 1) { @@ -813,9 +816,13 @@ cp terminate_connection(c, 0); } -// terminate_connection(myself, 0); + terminate_connection(myself->connection, 0); // destroy_trees(); + exit_edges(); + exit_subnets(); + exit_nodes(); + exit_connections(); execute_script("tinc-down"); @@ -916,7 +923,7 @@ cp if(!n) { - syslog(LOG_WARNING, _("Received UDP packets on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); + syslog(LOG_WARNING, _("Received UDP packet on port %hd from unknown source %x:%hd"), myself->port, ntohl(from.sin_addr.s_addr), ntohs(from.sin_port)); return; } /* @@ -929,15 +936,60 @@ cp /* Terminate a connection: - - Close the sockets - - Remove associated hosts and subnets + - Close the socket + - Remove associated edge and tell other connections about it if report = 1 + - Check if we need to retry making an outgoing connection - Deactivate the host - - Since it might still be referenced, put it on the prune list. - - If report == 1, then send DEL_HOST messages to the other tinc daemons. */ void terminate_connection(connection_t *c, int report) { - /* Needs a serious rewrite. */ + 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); + } + + /* Check if this was our outgoing connection */ + + if(c->status.outgoing) + { + c->status.outgoing = 0; + signal(SIGALRM, try_outgoing_connections); + alarm(seconds_till_retry); + syslog(LOG_NOTICE, _("Trying to re-establish outgoing connection in %d seconds"), seconds_till_retry); + } + + /* Deactivate */ + + c->status.active = 0; + if(c->node) + c->node->connection = NULL; + do_prune = 1; +cp } /* @@ -1055,7 +1107,13 @@ cp get_config_string(cfg, &name); cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */ - if(!setup_outgoing_connection(name)) /* function returns 0 when there are no problems */ + if(check_id(name)) + { + syslog(LOG_ERR, _("Invalid name for outgoing connection in %s line %d"), cfg->file, cfg->line); + continue; + } + + if(setup_outgoing_connection(name)) /* function returns 0 when there are no problems */ retry = 1; } @@ -1113,6 +1171,22 @@ cp 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); + } +cp +} + /* this is where it all happens... */ @@ -1132,6 +1206,12 @@ cp tv.tv_sec = timeout; 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) @@ -1194,9 +1274,9 @@ cp if(FD_ISSET(device_fd, &fset)) { if(read_packet(&packet)) - route_outgoing(&packet); - else return; + else + route_outgoing(&packet); } } }