for splay_each(subnet_t, s, n->subnet_tree) {
send_del_subnet(everyone, s);
- if(!strictsubnets)
+
+ if(!strictsubnets) {
subnet_del(n, s);
+ }
}
for splay_each(edge_t, e, n->edge_tree) {
- if(!tunnelserver)
+ if(!tunnelserver) {
send_del_edge(everyone, e);
+ }
+
edge_del(e);
}
}
for splay_each(node_t, n, node_tree) {
if(!n->status.reachable) {
for splay_each(edge_t, e, edge_weight_tree)
- if(e->to == n)
+ if(e->to == n) {
return;
+ }
if(!autoconnect && (!strictsubnets || !n->subnet_tree->head))
/* in strictsubnets mode do not delete nodes with subnets */
+ {
node_del(n);
+ }
}
}
}
logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Closing connection with %s (%s)", c->name, c->hostname);
if(c->node) {
- if(c->node->connection == c)
+ if(c->node->connection == c) {
c->node->connection = NULL;
+ }
if(c->edge) {
- if(report && !tunnelserver)
+ if(report && !tunnelserver) {
send_del_edge(everyone, c->edge);
+ }
edge_del(c->edge);
c->edge = NULL;
if(report && !c->node->status.reachable) {
edge_t *e;
e = lookup_edge(c->node, myself);
+
if(e) {
- if(!tunnelserver)
+ if(!tunnelserver) {
send_del_edge(everyone, e);
+ }
+
edge_del(e);
}
}
/* Check if this was our outgoing connection */
- if(outgoing)
+ if(outgoing) {
do_outgoing_connection(outgoing);
+ }
#ifndef HAVE_MINGW
/* Clean up dead proxy processes */
while(waitpid(-1, NULL, WNOHANG) > 0);
+
#endif
}
bool close_all_connections = false;
/*
- timeout_handler will start after 30 seconds from start of tincd
- hold information about the elapsed time since last time the handler
- has been run
+ timeout_handler will start after 30 seconds from start of tincd
+ hold information about the elapsed time since last time the handler
+ has been run
*/
long sleep_time = now.tv_sec - last_periodic_run_time.tv_sec;
+
/*
- It seems that finding sane default value is harder than expected
- Since we send every second a UDP packet to make holepunching work
- And default UDP state expire on firewalls is between 15-30 seconds
- we drop all connections after 60 Seconds - UDPDiscoveryTimeout=30
- by default
+ It seems that finding sane default value is harder than expected
+ Since we send every second a UDP packet to make holepunching work
+ And default UDP state expire on firewalls is between 15-30 seconds
+ we drop all connections after 60 Seconds - UDPDiscoveryTimeout=30
+ by default
*/
- if (sleep_time > 2 * udp_discovery_timeout) {
+ if(sleep_time > 2 * udp_discovery_timeout) {
logger(DEBUG_ALWAYS, LOG_ERR, "Awaking from dead after %ld seconds of sleep", sleep_time);
/*
- Do not send any packets to tinc after we wake up.
- The other node probably closed our connection but we still
- are holding context information to them. This may happen on
- laptops or any other hardware which can be suspended for some time.
- Sending any data to node that wasn't expecting it will produce
- annoying and misleading errors on the other side about failed signature
- verification and or about missing sptps context
+ Do not send any packets to tinc after we wake up.
+ The other node probably closed our connection but we still
+ are holding context information to them. This may happen on
+ laptops or any other hardware which can be suspended for some time.
+ Sending any data to node that wasn't expecting it will produce
+ annoying and misleading errors on the other side about failed signature
+ verification and or about missing sptps context
*/
close_all_connections = true;
}
+
last_periodic_run_time = now;
for list_each(connection_t, c, connection_list) {
// control connections (eg. tinc ctl) do not have any timeout
- if(c->status.control)
+ if(c->status.control) {
continue;
+ }
if(close_all_connections) {
logger(DEBUG_ALWAYS, LOG_ERR, "Forcing connection close after sleep time %s (%s)", c->name, c->hostname);
}
// Bail out early if we haven't reached the ping timeout for this node yet
- if(c->last_ping_time + pingtimeout > now.tv_sec)
+ if(c->last_ping_time + pingtimeout > now.tv_sec) {
continue;
+ }
// timeout during connection establishing
if(!c->edge) {
- if(c->status.connecting)
+ if(c->status.connecting) {
logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout while connecting to %s (%s)", c->name, c->hostname);
- else
+ } else {
logger(DEBUG_CONNECTIONS, LOG_WARNING, "Timeout from %s (%s) during authentication", c->name, c->hostname);
+ }
terminate_connection(c, c->edge);
continue;
}
// check whether we need to send a new ping
- if(c->last_ping_time + pinginterval <= now.tv_sec)
+ if(c->last_ping_time + pinginterval <= now.tv_sec) {
send_ping(c);
+ }
}
- timeout_set(data, &(struct timeval){1, rand() % 100000});
+ timeout_set(data, &(struct timeval) {
+ 1, rand() % 100000
+ });
}
static void periodic_handler(void *data) {
if(contradicting_del_edge > 100 && contradicting_add_edge > 100) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Possible node with same Name as us! Sleeping %d seconds.", sleeptime);
- nanosleep(&(struct timespec){sleeptime, 0}, NULL);
+ nanosleep(&(struct timespec) {
+ sleeptime, 0
+ }, NULL);
sleeptime *= 2;
- if(sleeptime < 0)
+
+ if(sleeptime < 0) {
sleeptime = 3600;
+ }
} else {
sleeptime /= 2;
- if(sleeptime < 10)
+
+ if(sleeptime < 10) {
sleeptime = 10;
+ }
}
contradicting_add_edge = 0;
/* If AutoConnect is set, check if we need to make or break connections. */
- if(autoconnect && node_tree->count > 1)
+ if(autoconnect && node_tree->count > 1) {
do_autoconnect();
+ }
- timeout_set(data, &(struct timeval){5, rand() % 100000});
+ timeout_set(data, &(struct timeval) {
+ 5, rand() % 100000
+ });
}
void handle_meta_connection_data(connection_t *c) {
- if (!receive_meta(c)) {
+ if(!receive_meta(c)) {
terminate_connection(c, c->edge);
return;
}
static void sighup_handler(void *data) {
logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
reopenlogger();
- if(reload_configuration())
+
+ if(reload_configuration()) {
exit(1);
+ }
}
static void sigalrm_handler(void *data) {
if(strictsubnets) {
for splay_each(subnet_t, subnet, subnet_tree)
- if (subnet->owner)
+ if(subnet->owner) {
subnet->expires = 1;
+ }
}
- for splay_each(node_t, n, node_tree)
+ for splay_each(node_t, n, node_tree) {
n->status.has_address = false;
+ }
load_all_nodes();
if(strictsubnets) {
for splay_each(subnet_t, subnet, subnet_tree) {
- if (!subnet->owner)
+ if(!subnet->owner) {
continue;
+ }
+
if(subnet->expires == 1) {
send_del_subnet(everyone, subnet);
- if(subnet->owner->status.reachable)
+
+ if(subnet->owner->status.reachable) {
subnet_update(subnet->owner, subnet, false);
+ }
+
subnet_del(subnet->owner, subnet);
} else if(subnet->expires == -1) {
subnet->expires = 0;
} else {
send_add_subnet(everyone, subnet);
- if(subnet->owner->status.reachable)
+
+ if(subnet->owner->status.reachable) {
subnet_update(subnet->owner, subnet, true);
+ }
}
}
} else { /* Only read our own subnets back in */
for splay_each(subnet_t, subnet, myself->subnet_tree)
- if(!subnet->expires)
+ if(!subnet->expires) {
subnet->expires = 1;
+ }
config_t *cfg = lookup_config(config_tree, "Subnet");
while(cfg) {
subnet_t *subnet, *s2;
- if(!get_config_subnet(cfg, &subnet))
+ if(!get_config_subnet(cfg, &subnet)) {
continue;
+ }
if((s2 = lookup_subnet(myself, subnet))) {
- if(s2->expires == 1)
+ if(s2->expires == 1) {
s2->expires = 0;
+ }
free_subnet(subnet);
} else {
/* Close connections to hosts that have a changed or deleted host config file */
for list_each(connection_t, c, connection_list) {
- if(c->status.control)
+ if(c->status.control) {
continue;
+ }
snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
struct stat s;
+
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->edge);
/* Reset the reconnection timers for all outgoing connections */
for list_each(outgoing_t, outgoing, outgoing_list) {
outgoing->timeout = 0;
+
if(outgoing->ev.cb)
- timeout_set(&outgoing->ev, &(struct timeval){0, 0});
+ timeout_set(&outgoing->ev, &(struct timeval) {
+ 0, 0
+ });
}
/* Check for outgoing connections that are in progress, and reset their ping timers */
for list_each(connection_t, c, connection_list) {
- if(c->outgoing && !c->node)
+ if(c->outgoing && !c->node) {
c->last_ping_time = 0;
+ }
}
/* Kick the ping timeout handler */
- timeout_set(&pingtimer, &(struct timeval){0, 0});
+ timeout_set(&pingtimer, &(struct timeval) {
+ 0, 0
+ });
}
/*
*/
int main_loop(void) {
last_periodic_run_time = now;
- timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000});
- timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){0, 0});
+ timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval) {
+ pingtimeout, rand() % 100000
+ });
+ timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval) {
+ 0, 0
+ });
#ifndef HAVE_MINGW
signal_t sighup = {0};
projects / tinc / blobdiff