j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Correctly add/remove outgoing connections when reloading configuration.

Browse source
This commit is contained in:
Guus Sliepen 2012-09-28 17:05:01 +02:00
parent f417271ea1
commit c5325ffdd1
4 changed files with 76 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/net.c
View file

@ -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. */
@ -263,7 +264,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 +286,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) {
@ -387,6 +362,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) {
fprintf(stderr, "ZOMG %ld > %ld\n", s.st_mtime, last_config_check);
terminate_connection(c, c->status.active);
}
free(fname);
}
last_config_check = time(NULL);
return 0;
}