projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
ad9398d
..
455f66c
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-637,7
+637,7
@@
bool setup_myself_reloadable(void) {
subnet_add(NULL, s);
}
subnet_add(NULL, s);
}
-#if !defined(IP
PROTO_IP) || !defined(IP
_TOS)
+#if !defined(IP_TOS)
if(priorityinheritance) {
logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv4 connections", "PriorityInheritance");
if(priorityinheritance) {
logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv4 connections", "PriorityInheritance");
@@
-645,7
+645,7
@@
bool setup_myself_reloadable(void) {
#endif
#endif
-#if !defined(IP
PROTO_IPV6) || !defined(IP
V6_TCLASS)
+#if !defined(IPV6_TCLASS)
if(priorityinheritance) {
logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv6 connections", "PriorityInheritance");
if(priorityinheritance) {
logger(DEBUG_ALWAYS, LOG_WARNING, "%s not supported on this platform for IPv6 connections", "PriorityInheritance");
@@
-902,6
+902,7
@@
static bool setup_myself(void) {
free(myport);
memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
free(myport);
memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
+ freeaddrinfo(ai);
sockaddr2str(&sa, NULL, &myport);
}
sockaddr2str(&sa, NULL, &myport);
}
@@
-948,6
+949,16
@@
static bool setup_myself(void) {
}
}
}
}
+ get_config_int(lookup_config(config_tree, "FWMark"), &fwmark);
+#ifndef SO_MARK
+
+ if(fwmark) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "FWMark not supported on this platform!");
+ return false;
+ }
+
+#endif
+
int replaywin_int;
if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {
int replaywin_int;
if(get_config_int(lookup_config(config_tree, "ReplayWindow"), &replaywin_int)) {