X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=97ca2dba7dff7f5cbe8402c15a773eb8605595b8;hb=914d1be411229c28e6e8e4a0df99afa076a8b448;hp=22c9d3727f70b43c89241e2c4a1806a091d23d14;hpb=f1baecb98b5cd78356acc590cea9c79d36d81be3;p=tinc diff --git a/src/net.c b/src/net.c index 22c9d372..97ca2dba 100644 --- a/src/net.c +++ b/src/net.c @@ -1,7 +1,7 @@ /* net.c -- most of the network code Copyright (C) 1998-2005 Ivo Timmermans, - 2000-2017 Guus Sliepen + 2000-2021 Guus Sliepen 2006 Scott Lamb 2011 Loïc Grenié @@ -23,19 +23,17 @@ #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; @@ -52,11 +50,11 @@ void purge(void) { /* 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) { @@ -64,7 +62,7 @@ void purge(void) { } } - 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); } @@ -76,14 +74,14 @@ void purge(void) { /* 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); @@ -211,7 +209,7 @@ static void timeout_handler(void *data) { 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; @@ -291,7 +289,7 @@ static void periodic_handler(void *data) { /* 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(); } @@ -337,18 +335,17 @@ int reload_configuration(void) { /* 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 */ @@ -357,20 +354,20 @@ int reload_configuration(void) { /* 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; } @@ -394,37 +391,34 @@ int reload_configuration(void) { } } } 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)) { - cfg = lookup_config_next(config_tree, cfg); - 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); @@ -439,7 +433,7 @@ int reload_configuration(void) { /* 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; } @@ -460,7 +454,7 @@ int reload_configuration(void) { 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) @@ -470,7 +464,7 @@ void retry(void) { } /* 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; }