projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove autotools configs
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
22c9d37
..
7efe7fa
100644
(file)
--- 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,
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-20
17
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
21
Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
@@
-23,19
+23,18
@@
#include "system.h"
#include "autoconnect.h"
#include "system.h"
#include "autoconnect.h"
+#include "conf_net.h"
#include "conf.h"
#include "connection.h"
#include "conf.h"
#include "connection.h"
-#include "
device
.h"
+#include "
crypto
.h"
#include "graph.h"
#include "logger.h"
#include "meta.h"
#include "names.h"
#include "net.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 "protocol.h"
#include "subnet.h"
#include "utils.h"
-#include "xalloc.h"
int contradicting_add_edge = 0;
int contradicting_del_edge = 0;
int contradicting_add_edge = 0;
int contradicting_del_edge = 0;
@@
-52,11
+51,11
@@
void purge(void) {
/* Remove all edges and subnets owned by unreachable nodes. */
/* 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);
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) {
send_del_subnet(everyone, s);
if(!strictsubnets) {
@@
-64,7
+63,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);
}
if(!tunnelserver) {
send_del_edge(everyone, e);
}
@@
-76,14
+75,14
@@
void purge(void) {
/* Check if anyone else claims to have an edge to an unreachable node. If not, delete node. */
/* 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) {
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(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);
/* in strictsubnets mode do not delete nodes with subnets */
{
node_del(n);
@@
-211,7
+210,7
@@
static void timeout_handler(void *data) {
last_periodic_run_time = now;
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;
// control connections (eg. tinc ctl) do not have any timeout
if(c->status.control) {
continue;
@@
-258,7
+257,7
@@
static void timeout_handler(void *data) {
}
timeout_set(data, &(struct timeval) {
}
timeout_set(data, &(struct timeval) {
- 1,
rand() % 100000
+ 1,
jitter()
});
}
});
}
@@
-291,12
+290,12
@@
static void periodic_handler(void *data) {
/* If AutoConnect is set, check if we need to make or break connections. */
/* 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) {
do_autoconnect();
}
timeout_set(data, &(struct timeval) {
- 5,
rand() % 100000
+ 5,
jitter()
});
}
});
}
@@
-337,18
+336,17
@@
int reload_configuration(void) {
/* Reread our own configuration file */
/* 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;
}
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);
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 */
/* Parse some options that are allowed to be changed while tinc is running */
@@
-357,20
+355,20
@@
int reload_configuration(void) {
/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
if(strictsubnets) {
/* 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;
}
}
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) {
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;
}
if(!subnet->owner) {
continue;
}
@@
-394,37
+392,34
@@
int reload_configuration(void) {
}
}
} else { /* Only read our own subnets back in */
}
}
} 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;
}
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;
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);
if(subnet->expires == 1) {
send_del_subnet(everyone, subnet);
subnet_update(myself, subnet, false);
@@
-439,7
+434,7
@@
int reload_configuration(void) {
/* Close connections to hosts that have a changed or deleted host config file */
/* 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;
}
if(c->status.control) {
continue;
}
@@
-460,7
+455,7
@@
int reload_configuration(void) {
void retry(void) {
/* Reset the reconnection timers for all outgoing connections */
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)
outgoing->timeout = 0;
if(outgoing->ev.cb)
@@
-470,7
+465,7
@@
void retry(void) {
}
/* Check for outgoing connections that are in progress, and reset their ping timers */
}
/* 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;
}
if(c->outgoing && !c->node) {
c->last_ping_time = 0;
}
@@
-488,7
+483,7
@@
void retry(void) {
int main_loop(void) {
last_periodic_run_time = now;
timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval) {
int main_loop(void) {
last_periodic_run_time = now;
timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval) {
- pingtimeout,
rand() % 100000
+ pingtimeout,
jitter()
});
timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval) {
0, 0
});
timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval) {
0, 0