/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-2017 Guus Sliepen <guus@tinc-vpn.org>
+ 2000-2021 Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
#include "system.h"
#include "autoconnect.h"
+#include "conf_net.h"
#include "conf.h"
#include "connection.h"
-#include "device.h"
#include "graph.h"
#include "logger.h"
#include "meta.h"
#include "names.h"
#include "net.h"
-#include "netutl.h"
#include "protocol.h"
#include "subnet.h"
#include "utils.h"
-#include "xalloc.h"
int contradicting_add_edge = 0;
int contradicting_del_edge = 0;
/* Remove all edges and subnets owned by unreachable nodes. */
- for splay_each(node_t, n, node_tree) {
+ 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 splay_each(subnet_t, s, n->subnet_tree) {
+ for splay_each(subnet_t, s, &n->subnet_tree) {
send_del_subnet(everyone, s);
if(!strictsubnets) {
}
}
- for splay_each(edge_t, e, n->edge_tree) {
+ for splay_each(edge_t, e, &n->edge_tree) {
if(!tunnelserver) {
send_del_edge(everyone, e);
}
/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
- for splay_each(node_t, n, node_tree) {
+ for splay_each(node_t, n, &node_tree) {
if(!n->status.reachable) {
- for splay_each(edge_t, e, edge_weight_tree)
+ for splay_each(edge_t, e, &edge_weight_tree)
if(e->to == n) {
return;
}
- if(!autoconnect && (!strictsubnets || !n->subnet_tree->head))
+ if(!autoconnect && (!strictsubnets || !n->subnet_tree.head))
/* in strictsubnets mode do not delete nodes with subnets */
{
node_del(n);
last_periodic_run_time = now;
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
// control connections (eg. tinc ctl) do not have any timeout
if(c->status.control) {
continue;
/* 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();
}
/* Reread our own configuration file */
- exit_configuration(&config_tree);
- init_configuration(&config_tree);
+ splay_empty_tree(&config_tree);
- if(!read_server_config()) {
+ if(!read_server_config(&config_tree)) {
logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
return EINVAL;
}
- read_config_options(config_tree, NULL);
+ read_config_options(&config_tree, NULL);
snprintf(fname, sizeof(fname), "%s" SLASH "hosts" SLASH "%s", confbase, myself->name);
- read_config_file(config_tree, fname, true);
+ read_config_file(&config_tree, fname, true);
/* 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) {
- for splay_each(subnet_t, subnet, subnet_tree)
+ for splay_each(subnet_t, subnet, &subnet_tree)
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) {
+ for splay_each(subnet_t, subnet, &subnet_tree) {
if(!subnet->owner) {
continue;
}
}
}
} else { /* Only read our own subnets back in */
- for splay_each(subnet_t, subnet, myself->subnet_tree)
+ for splay_each(subnet_t, subnet, &myself->subnet_tree)
if(!subnet->expires) {
subnet->expires = 1;
}
- config_t *cfg = lookup_config(config_tree, "Subnet");
+ config_t *cfg = lookup_config(&config_tree, "Subnet");
while(cfg) {
subnet_t *subnet, *s2;
- if(!get_config_subnet(cfg, &subnet)) {
- continue;
- }
+ if(get_config_subnet(cfg, &subnet)) {
+ if((s2 = lookup_subnet(myself, subnet))) {
+ if(s2->expires == 1) {
+ s2->expires = 0;
+ }
- if((s2 = lookup_subnet(myself, subnet))) {
- if(s2->expires == 1) {
- s2->expires = 0;
+ free_subnet(subnet);
+ } else {
+ subnet_add(myself, subnet);
+ send_add_subnet(everyone, subnet);
+ subnet_update(myself, subnet, true);
}
-
- free_subnet(subnet);
- } else {
- subnet_add(myself, subnet);
- send_add_subnet(everyone, subnet);
- subnet_update(myself, subnet, true);
}
- cfg = lookup_config_next(config_tree, cfg);
+ cfg = lookup_config_next(&config_tree, cfg);
}
- for splay_each(subnet_t, subnet, myself->subnet_tree) {
+ for splay_each(subnet_t, subnet, &myself->subnet_tree) {
if(subnet->expires == 1) {
send_del_subnet(everyone, subnet);
subnet_update(myself, subnet, false);
/* Close connections to hosts that have a changed or deleted host config file */
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
if(c->status.control) {
continue;
}
void retry(void) {
/* Reset the reconnection timers for all outgoing connections */
- for list_each(outgoing_t, outgoing, outgoing_list) {
+ for list_each(outgoing_t, outgoing, &outgoing_list) {
outgoing->timeout = 0;
if(outgoing->ev.cb)
}
/* Check for outgoing connections that are in progress, and reset their ping timers */
- for list_each(connection_t, c, connection_list) {
+ for list_each(connection_t, c, &connection_list) {
if(c->outgoing && !c->node) {
c->last_ping_time = 0;
}
projects / tinc / blobdiff