projects
/
oweals
/
tinc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow Port and PMTUDiscovery options in tinc.conf, always enable PMTUDiscovery by...
[oweals/tinc.git]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index 0718a8c5725acd0576b32110e7600f28e57e0ea4..369c8a40017e14fb60c6d388665a4aaa7ceea073 100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-246,7
+246,8
@@
bool setup_myself(void) {
if(!read_rsa_private_key())
return false;
if(!read_rsa_private_key())
return false;
- if(!get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
+ if(!get_config_string(lookup_config(config_tree, "Port"), &myport)
+ && !get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
myport = xstrdup("655");
/* Read in all the subnets specified in the host configuration file */
myport = xstrdup("655");
/* Read in all the subnets specified in the host configuration file */
@@
-296,11
+297,10
@@
bool setup_myself(void) {
} else
routing_mode = RMODE_ROUTER;
} else
routing_mode = RMODE_ROUTER;
- // Enable PMTUDiscovery by default if we are in router mode.
-
- choice = routing_mode == RMODE_ROUTER;
+ choice = true;
get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
- if(choice)
+ get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
+ if(choice)
myself->options |= OPTION_PMTU_DISCOVERY;
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
myself->options |= OPTION_PMTU_DISCOVERY;
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);