projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure $NAME is set correctly when executing tinc-down script.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
cb702cc
..
e0f1569
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-286,8
+286,6
@@
bool setup_myself(void)
if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
myself->options |= OPTION_TCPONLY;
if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
myself->options |= OPTION_TCPONLY;
- get_config_bool(lookup_config(config_tree, "BlockingTCP"), &blockingtcp);
-
if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
myself->options |= OPTION_PMTU_DISCOVERY;
if(get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice) && choice)
myself->options |= OPTION_PMTU_DISCOVERY;
@@
-536,12
+534,20
@@
bool setup_network_connections(void)
init_events();
init_requests();
init_events();
init_requests();
- if(get_config_int(lookup_config(config_tree, "Ping
Timeout"), &pingtimeout
)) {
- if(ping
timeout
< 1) {
- ping
timeout
= 86400;
+ if(get_config_int(lookup_config(config_tree, "Ping
Interval"), &pinginterval
)) {
+ if(ping
interval
< 1) {
+ ping
interval
= 86400;
}
} else
}
} else
- pingtimeout = 60;
+ pinginterval = 60;
+
+ if(!get_config_int(lookup_config(config_tree, "PingTimeout"), &pingtimeout))
+ pingtimeout = 5;
+ if(pingtimeout < 1 || pingtimeout > pinginterval)
+ pingtimeout = pinginterval;
+
+ if(!get_config_int(lookup_config(config_tree, "MaxOutputBufferSize"), &maxoutbufsize))
+ maxoutbufsize = 4 * MTU;
if(!setup_myself())
return false;
if(!setup_myself())
return false;
@@
-582,6
+588,12
@@
void close_network_connections(void)
close(listen_socket[i].udp);
}
close(listen_socket[i].udp);
}
+ asprintf(&envp[0], "NETNAME=%s", netname ? : "");
+ asprintf(&envp[1], "DEVICE=%s", device ? : "");
+ asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+ asprintf(&envp[3], "NAME=%s", myself->name);
+ envp[4] = NULL;
+
exit_requests();
exit_events();
exit_edges();
exit_requests();
exit_events();
exit_edges();
@@
-589,12
+601,6
@@
void close_network_connections(void)
exit_nodes();
exit_connections();
exit_nodes();
exit_connections();
- asprintf(&envp[0], "NETNAME=%s", netname ? : "");
- asprintf(&envp[1], "DEVICE=%s", device ? : "");
- asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
- asprintf(&envp[3], "NAME=%s", myself->name);
- envp[4] = NULL;
-
execute_script("tinc-down", envp);
for(i = 0; i < 4; i++)
execute_script("tinc-down", envp);
for(i = 0; i < 4; i++)