X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=384e878b9e96b7982e8dda33a51ce59a96a108b0;hp=1e37a798dd614736a55542a266b1f53a44c52482;hb=8910cbd67e13450e93816ecafa0cc5be5e4c2378;hpb=87ad5c97a9a73a65050ad7adce34503f856d8665 diff --git a/src/net.c b/src/net.c index 1e37a798..384e878b 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.142 2001/10/30 12:59:12 guus Exp $ + $Id: net.c,v 1.35.4.146 2001/11/03 21:21:04 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) @@ -363,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); @@ -438,8 +439,19 @@ 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); @@ -493,7 +505,6 @@ int read_rsa_public_key(connection_t *c) FILE *fp; char *fname; char *key; - void *result; cp if(!c->rsa_key) c->rsa_key = RSA_new(); @@ -519,9 +530,9 @@ cp fname); return -1; } - result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); + c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); fclose(fp); - if(!result) + if(!c->rsa_key) { syslog(LOG_ERR, _("Reading RSA public key file `%s' failed: %m"), fname); @@ -535,19 +546,16 @@ cp /* Else, check if a harnessed public key is in the config file */ - result = NULL; - asprintf(&fname, "%s/hosts/%s", confbase, c->name); if((fp = fopen(fname, "r"))) { - result = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); + c->rsa_key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL); fclose(fp); - free(fname); } free(fname); - if(result) + if(c->rsa_key) return 0; else { @@ -559,14 +567,11 @@ cp int read_rsa_private_key(void) { FILE *fp; - void *result; char *fname, *key; cp - if(!myself->connection->rsa_key) - myself->connection->rsa_key = RSA_new(); - if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) { + myself->connection->rsa_key = RSA_new(); BN_hex2bn(&myself->connection->rsa_key->d, key); BN_hex2bn(&myself->connection->rsa_key->e, "FFFF"); } @@ -578,9 +583,9 @@ cp fname); return -1; } - result = PEM_read_RSAPrivateKey(fp, &myself->connection->rsa_key, NULL, NULL); + myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL); fclose(fp); - if(!result) + if(!myself->connection->rsa_key) { syslog(LOG_ERR, _("Reading RSA private key file `%s' failed: %m"), fname); @@ -804,9 +809,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"); @@ -837,13 +846,13 @@ cp c->address = ntohl(ci.sin_addr.s_addr); c->hostname = hostlookup(ci.sin_addr.s_addr); - c->port = htons(ci.sin_port); /* This one will be overwritten later */ + c->port = htons(ci.sin_port); c->socket = sfd; c->last_ping_time = time(NULL); if(debug_lvl >= DEBUG_CONNECTIONS) syslog(LOG_NOTICE, _("Connection from %s port %d"), - c->hostname, htons(ci.sin_port)); + c->hostname, c->port); c->allow_request = ID; cp @@ -920,15 +929,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 } /* @@ -1046,6 +1100,12 @@ cp get_config_string(cfg, &name); cfg = lookup_config_next(config_tree, cfg); /* Next time skip to next ConnectTo line */ + 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; @@ -1104,6 +1164,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... */ @@ -1123,6 +1199,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)