Copyright (C) 1998-2005 Ivo Timmermans,
2000-2012 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
- 2011 Loïc Grenié <loic.grenie@gmail.com>
+ 2011 Loïc Grenié <loic.grenie@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "system.h"
#include "utils.h"
-#include "splay_tree.h"
#include "conf.h"
#include "connection.h"
#include "device.h"
/* Purge edges and subnets of unreachable nodes. Use carefully. */
void purge(void) {
- splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
- node_t *n;
- edge_t *e;
- subnet_t *s;
-
logger(DEBUG_PROTOCOL, LOG_DEBUG, "Purging unreachable nodes");
/* Remove all edges and subnets owned by unreachable nodes. */
- for(nnode = node_tree->head; nnode; nnode = nnext) {
- nnext = nnode->next;
- n = nnode->data;
-
+ for splay_each(node_t, n, node_tree) {
if(!n->status.reachable) {
logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Purging node %s (%s)", n->name, n->hostname);
- for(snode = n->subnet_tree->head; snode; snode = snext) {
- snext = snode->next;
- s = snode->data;
+ for splay_each(subnet_t, s, n->subnet_tree) {
send_del_subnet(everyone, s);
if(!strictsubnets)
subnet_del(n, s);
}
- for(enode = n->edge_tree->head; enode; enode = enext) {
- enext = enode->next;
- e = enode->data;
+ for splay_each(edge_t, e, n->edge_tree) {
if(!tunnelserver)
send_del_edge(everyone, e);
edge_del(e);
/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
- for(nnode = node_tree->head; nnode; nnode = nnext) {
- nnext = nnode->next;
- n = nnode->data;
-
+ for splay_each(node_t, n, node_tree) {
if(!n->status.reachable) {
- for(enode = edge_weight_tree->head; enode; enode = enext) {
- enext = enode->next;
- e = enode->data;
-
+ for splay_each(edge_t, e, edge_weight_tree)
if(e->to == n)
- break;
- }
+ return;
- if(!enode && (!strictsubnets || !n->subnet_tree->head))
+ if(!strictsubnets || !n->subnet_tree->head)
/* in strictsubnets mode do not delete nodes with subnets */
node_del(n);
}
and close the connection.
*/
static void timeout_handler(int fd, short events, void *event) {
- splay_node_t *node, *next;
- connection_t *c;
time_t now = time(NULL);
- for(node = connection_tree->head; node; node = next) {
- next = node->next;
- c = node->data;
-
+ for list_each(connection_t, c, connection_list) {
if(c->status.control)
continue;
}
int reload_configuration(void) {
- connection_t *c;
- splay_node_t *node, *next;
char *fname;
- struct stat s;
/* Reread our own configuration file */
read_config_options(config_tree, NULL);
- xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
- read_config_file(config_tree, fname);
- free(fname);
+ xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
+ read_config_file(config_tree, fname);
+ free(fname);
/* Parse some options that are allowed to be changed while tinc is running */
/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
if(strictsubnets) {
- subnet_t *subnet;
-
- for(node = subnet_tree->head; node; node = node->next) {
- subnet = node->data;
+ for splay_each(subnet_t, subnet, subnet_tree)
subnet->expires = 1;
- }
load_all_subnets();
- for(node = subnet_tree->head; node; node = next) {
- next = node->next;
- subnet = node->data;
+ for splay_each(subnet_t, subnet, subnet_tree) {
if(subnet->expires == 1) {
send_del_subnet(everyone, subnet);
if(subnet->owner->status.reachable)
}
}
} else { /* Only read our own subnets back in */
- subnet_t *subnet, *s2;
-
- for(node = myself->subnet_tree->head; node; node = node->next) {
- subnet_t *subnet = node->data;
+ for splay_each(subnet_t, subnet, myself->subnet_tree)
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))
continue;
cfg = lookup_config_next(config_tree, cfg);
}
- for(node = myself->subnet_tree->head; node; node = next) {
- next = node->next;
- subnet_t *subnet = node->data;
+ for splay_each(subnet_t, subnet, myself->subnet_tree) {
if(subnet->expires == 1) {
send_del_subnet(everyone, subnet);
subnet_update(myself, subnet, false);
}
/* Try to make outgoing connections */
-
+
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;
-
+ for list_each(connection_t, c, connection_list) {
if(c->status.control)
continue;
xasprintf(&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->status.active);
}
void retry(void) {
- connection_t *c;
- splay_node_t *node, *next;
-
- for(node = connection_tree->head; node; node = next) {
- next = node->next;
- c = node->data;
-
+ for list_each(connection_t, c, connection_list) {
if(c->outgoing && !c->node) {
if(timeout_initialized(&c->outgoing->ev))
event_del(&c->outgoing->ev);
projects / tinc / blobdiff