projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make apt stop asking questions when building deb package.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
22c9d37
..
dffe0b4
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,17
@@
#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 "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;
@@
-211,7
+209,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;
@@
-340,7
+338,7
@@
int reload_configuration(void) {
exit_configuration(&config_tree);
init_configuration(&config_tree);
exit_configuration(&config_tree);
init_configuration(&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;
}
@@
-404,21
+402,18
@@
int reload_configuration(void) {
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);
@@
-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;
}