X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=9a32d628957238daa5df7c97408afa24c522e6b2;hb=ce059e36fdb3d3049c278e8b2f36b03c93778996;hp=11fbcb1ce4ff5b0414be47d35f8e0206e9b2b4f8;hpb=e9de08be0dab58a48f9a8ce3d250516cf05d6b8e;p=tinc diff --git a/src/net.c b/src/net.c index 11fbcb1c..9a32d628 100644 --- a/src/net.c +++ b/src/net.c @@ -40,6 +40,7 @@ int contradicting_add_edge = 0; int contradicting_del_edge = 0; static int sleeptime = 10; +time_t last_config_check = 0; /* Purge edges and subnets of unreachable nodes. Use carefully. */ @@ -102,14 +103,13 @@ void purge(void) { /* Terminate a connection: - - Close the socket - - Remove associated edge and tell other connections about it if report = true + - Mark it as inactive + - Remove the edge representing this connection + - Kill it with fire - Check if we need to retry making an outgoing connection - - Deactivate the host */ void terminate_connection(connection_t *c, bool report) { - logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", - c->name, c->hostname); + logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname); c->status.active = false; @@ -140,15 +140,13 @@ void terminate_connection(connection_t *c, bool report) { } } - free_connection_partially(c); + outgoing_t *outgoing = c->outgoing; + connection_del(c); /* Check if this was our outgoing connection */ - if(c->outgoing) { - do_outgoing_connection(c); - } else { - connection_del(c); - } + if(outgoing) + do_outgoing_connection(outgoing); } /* @@ -174,25 +172,20 @@ static void timeout_handler(int fd, short events, void *event) { if(c->last_ping_time + pingtimeout <= now) { if(c->status.active) { if(c->status.pinged) { - logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", - c->name, c->hostname, (long)now - c->last_ping_time); - terminate_connection(c, true); - continue; + logger(DEBUG_CONNECTIONS, LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds", c->name, c->hostname, (long)now - c->last_ping_time); } else if(c->last_ping_time + pinginterval <= now) { send_ping(c); + continue; + } else { + continue; } } else { - if(c->status.connecting) { + if(c->status.connecting) logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname); - c->status.connecting = false; - closesocket(c->socket); - do_outgoing_connection(c); - } else { + else logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname); - terminate_connection(c, false); - continue; - } } + terminate_connection(c, c->status.active); } } @@ -227,11 +220,8 @@ void handle_meta_connection_data(int fd, short events, void *data) { if(!result) finish_connecting(c); else { - logger(DEBUG_CONNECTIONS, LOG_DEBUG, - "Error while connecting to %s (%s): %s", - c->name, c->hostname, sockstrerror(result)); - closesocket(c->socket); - do_outgoing_connection(c); + logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result)); + terminate_connection(c, false); return; } } @@ -263,7 +253,6 @@ int reload_configuration(void) { splay_node_t *node, *next; char *fname; struct stat s; - static time_t last_config_check = 0; /* Reread our own configuration file */ @@ -286,31 +275,6 @@ int reload_configuration(void) { setup_myself_reloadable(); - /* Close connections to hosts that have a changed or deleted host config file */ - - for(node = connection_tree->head; node; node = next) { - c = node->data; - next = node->next; - - if(c->status.control) - continue; - - if(c->outgoing) { - free(c->outgoing->name); - if(c->outgoing->ai) - freeaddrinfo(c->outgoing->ai); - free(c->outgoing); - c->outgoing = NULL; - } - - xasprintf(&fname, "%s" SLASH "hosts" SLASH "%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 = time(NULL); - /* If StrictSubnet is set, expire deleted Subnets and read new ones in */ if(strictsubnets) { @@ -344,7 +308,6 @@ int reload_configuration(void) { for(node = myself->subnet_tree->head; node; node = node->next) { subnet_t *subnet = node->data; - logger(DEBUG_ALWAYS, LOG_DEBUG, "subnet %p expires %d", subnet, (int)subnet->expires); if(!subnet->expires) subnet->expires = 1; } @@ -356,13 +319,11 @@ int reload_configuration(void) { continue; if((s2 = lookup_subnet(myself, subnet))) { - logger(DEBUG_ALWAYS, LOG_DEBUG, "read subnet that already exists: %p expires %d", s2, (int)s2->expires); if(s2->expires == 1) s2->expires = 0; free_subnet(subnet); } else { - logger(DEBUG_ALWAYS, LOG_DEBUG, "read new subnet %p", subnet); subnet_add(myself, subnet); send_add_subnet(everyone, subnet); subnet_update(myself, subnet, true); @@ -375,7 +336,6 @@ int reload_configuration(void) { next = node->next; subnet_t *subnet = node->data; if(subnet->expires == 1) { - logger(DEBUG_ALWAYS, LOG_DEBUG, "removed subnet %p", subnet); send_del_subnet(everyone, subnet); subnet_update(myself, subnet, false); subnet_del(myself, subnet); @@ -387,6 +347,25 @@ int reload_configuration(void) { try_outgoing_connections(); + /* Close connections to hosts that have a changed or deleted host config file */ + + for(node = connection_tree->head; node; node = next) { + c = node->data; + next = node->next; + + if(c->status.control) + continue; + + xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name); + if(stat(fname, &s) || s.st_mtime > last_config_check) { + logger(DEBUG_CONNECTIONS, LOG_INFO, "Host config file of %s has been changed", c->name); + terminate_connection(c, c->status.active); + } + free(fname); + } + + last_config_check = time(NULL); + return 0; } @@ -404,7 +383,7 @@ void retry(void) { if(c->status.connecting) close(c->socket); c->outgoing->timeout = 0; - do_outgoing_connection(c); + terminate_connection(c, c->status.active); } } }