projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GitHub CI: run most tests as a non-privileged user.
[tinc]
/
src
/
net_setup.c
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
1ecb3c6
..
f1a70f3
100644
(file)
--- a/
src/net_setup.c
+++ b/
src/net_setup.c
@@
-52,10
+52,11
@@
static io_t device_io;
devops_t devops;
bool device_standby = false;
devops_t devops;
bool device_standby = false;
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
+char *proxyhost = NULL;
+char *proxyport = NULL;
+char *proxyuser = NULL;
+char *proxypass = NULL;
+
proxytype_t proxytype;
bool autoconnect;
bool disablebuggypeers;
proxytype_t proxytype;
bool autoconnect;
bool disablebuggypeers;
@@
-231,7
+232,7
@@
static bool read_ecdsa_private_key(void) {
return false;
}
return false;
}
- if(s.st_mode & ~0100700) {
+ if(s.st_mode & ~0100700
u
) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for Ed25519 private key file `%s'!", fname);
}
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for Ed25519 private key file `%s'!", fname);
}
@@
-323,7
+324,7
@@
static bool read_rsa_private_key(void) {
return false;
}
return false;
}
- if(s.st_mode & ~0100700) {
+ if(s.st_mode & ~0100700
u
) {
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
}
logger(DEBUG_ALWAYS, LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
}
@@
-435,18
+436,10
@@
char *get_name(void) {
}
bool setup_myself_reloadable(void) {
}
bool setup_myself_reloadable(void) {
- char *proxy = NULL;
- char *rmode = NULL;
- char *fmode = NULL;
- char *bmode = NULL;
- char *afname = NULL;
- char *space;
- bool choice;
-
free(scriptinterpreter);
scriptinterpreter = NULL;
free(scriptinterpreter);
scriptinterpreter = NULL;
- get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
+ get_config_string(lookup_config(config_tree, "ScriptsInterpreter"), &scriptinterpreter);
free(scriptextension);
free(scriptextension);
@@
-454,9
+447,13
@@
bool setup_myself_reloadable(void) {
scriptextension = xstrdup("");
}
scriptextension = xstrdup("");
}
+ char *proxy = NULL;
+
get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
if(proxy) {
get_config_string(lookup_config(config_tree, "Proxy"), &proxy);
if(proxy) {
+ char *space;
+
if((space = strchr(proxy, ' '))) {
*space++ = 0;
}
if((space = strchr(proxy, ' '))) {
*space++ = 0;
}
@@
-475,9
+472,22
@@
bool setup_myself_reloadable(void) {
proxytype = PROXY_EXEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
proxytype = PROXY_EXEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Unknown proxy type %s!", proxy);
+ free(proxy);
return false;
}
return false;
}
+ free(proxyhost);
+ proxyhost = NULL;
+
+ free(proxyport);
+ proxyport = NULL;
+
+ free(proxyuser);
+ proxyuser = NULL;
+
+ free(proxypass);
+ proxypass = NULL;
+
switch(proxytype) {
case PROXY_NONE:
default:
switch(proxytype) {
case PROXY_NONE:
default:
@@
-486,10
+496,11
@@
bool setup_myself_reloadable(void) {
case PROXY_EXEC:
if(!space || !*space) {
logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
case PROXY_EXEC:
if(!space || !*space) {
logger(DEBUG_ALWAYS, LOG_ERR, "Argument expected for proxy type exec!");
+ free(proxy);
return false;
}
return false;
}
- proxyhost =
xstrdup(space);
+ proxyhost = xstrdup(space);
break;
case PROXY_SOCKS4:
break;
case PROXY_SOCKS4:
@@
-502,6
+513,14
@@
bool setup_myself_reloadable(void) {
*space++ = 0, proxyport = space;
}
*space++ = 0, proxyport = space;
}
+ if(!proxyhost || !*proxyhost || !proxyport || !*proxyport) {
+ logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
+ proxyport = NULL;
+ proxyhost = NULL;
+ free(proxy);
+ return false;
+ }
+
if(space && (space = strchr(space, ' '))) {
*space++ = 0, proxyuser = space;
}
if(space && (space = strchr(space, ' '))) {
*space++ = 0, proxyuser = space;
}
@@
-510,11
+529,6
@@
bool setup_myself_reloadable(void) {
*space++ = 0, proxypass = space;
}
*space++ = 0, proxypass = space;
}
- if(!proxyhost || !*proxyhost || !proxyport || !*proxyport) {
- logger(DEBUG_ALWAYS, LOG_ERR, "Host and port argument expected for proxy!");
- return false;
- }
-
proxyhost = xstrdup(proxyhost);
proxyport = xstrdup(proxyport);
proxyhost = xstrdup(proxyhost);
proxyport = xstrdup(proxyport);
@@
-532,6
+546,8
@@
bool setup_myself_reloadable(void) {
free(proxy);
}
free(proxy);
}
+ bool choice;
+
if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice) {
myself->options |= OPTION_INDIRECT;
}
if(get_config_bool(lookup_config(config_tree, "IndirectData"), &choice) && choice) {
myself->options |= OPTION_INDIRECT;
}
@@
-555,6
+571,8
@@
bool setup_myself_reloadable(void) {
get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
get_config_bool(lookup_config(config_tree, "DirectOnly"), &directonly);
get_config_bool(lookup_config(config_tree, "LocalDiscovery"), &localdiscovery);
+ char *rmode = NULL;
+
if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
if(!strcasecmp(rmode, "router")) {
routing_mode = RMODE_ROUTER;
if(get_config_string(lookup_config(config_tree, "Mode"), &rmode)) {
if(!strcasecmp(rmode, "router")) {
routing_mode = RMODE_ROUTER;
@@
-564,12
+582,15
@@
bool setup_myself_reloadable(void) {
routing_mode = RMODE_HUB;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
routing_mode = RMODE_HUB;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid routing mode!");
+ free(rmode);
return false;
}
free(rmode);
}
return false;
}
free(rmode);
}
+ char *fmode = NULL;
+
if(get_config_string(lookup_config(config_tree, "Forwarding"), &fmode)) {
if(!strcasecmp(fmode, "off")) {
forwarding_mode = FMODE_OFF;
if(get_config_string(lookup_config(config_tree, "Forwarding"), &fmode)) {
if(!strcasecmp(fmode, "off")) {
forwarding_mode = FMODE_OFF;
@@
-579,6
+600,7
@@
bool setup_myself_reloadable(void) {
forwarding_mode = FMODE_KERNEL;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
forwarding_mode = FMODE_KERNEL;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid forwarding mode!");
+ free(fmode);
return false;
}
return false;
}
@@
-602,6
+624,8
@@
bool setup_myself_reloadable(void) {
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
get_config_bool(lookup_config(config_tree, "PriorityInheritance"), &priorityinheritance);
get_config_bool(lookup_config(config_tree, "DecrementTTL"), &decrement_ttl);
+ char *bmode = NULL;
+
if(get_config_string(lookup_config(config_tree, "Broadcast"), &bmode)) {
if(!strcasecmp(bmode, "no")) {
broadcast_mode = BMODE_NONE;
if(get_config_string(lookup_config(config_tree, "Broadcast"), &bmode)) {
if(!strcasecmp(bmode, "no")) {
broadcast_mode = BMODE_NONE;
@@
-611,12
+635,21
@@
bool setup_myself_reloadable(void) {
broadcast_mode = BMODE_DIRECT;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid broadcast mode!");
broadcast_mode = BMODE_DIRECT;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid broadcast mode!");
+ free(bmode);
return false;
}
free(bmode);
}
return false;
}
free(bmode);
}
+ /* Delete all broadcast subnets before re-adding them */
+
+ for splay_each(subnet_t, s, subnet_tree) {
+ if(!s->owner) {
+ splay_delete_node(subnet_tree, node);
+ }
+ }
+
const char *const DEFAULT_BROADCAST_SUBNETS[] = { "ff:ff:ff:ff:ff:ff", "255.255.255.255", "224.0.0.0/4", "ff00::/8" };
for(size_t i = 0; i < sizeof(DEFAULT_BROADCAST_SUBNETS) / sizeof(*DEFAULT_BROADCAST_SUBNETS); i++) {
const char *const DEFAULT_BROADCAST_SUBNETS[] = { "ff:ff:ff:ff:ff:ff", "255.255.255.255", "224.0.0.0/4", "ff00::/8" };
for(size_t i = 0; i < sizeof(DEFAULT_BROADCAST_SUBNETS) / sizeof(*DEFAULT_BROADCAST_SUBNETS); i++) {
@@
-668,6
+701,8
@@
bool setup_myself_reloadable(void) {
maxtimeout = 900;
}
maxtimeout = 900;
}
+ char *afname = NULL;
+
if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
if(!strcasecmp(afname, "IPv4")) {
addressfamily = AF_INET;
if(get_config_string(lookup_config(config_tree, "AddressFamily"), &afname)) {
if(!strcasecmp(afname, "IPv4")) {
addressfamily = AF_INET;
@@
-677,6
+712,7
@@
bool setup_myself_reloadable(void) {
addressfamily = AF_UNSPEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid address family!");
addressfamily = AF_UNSPEC;
} else {
logger(DEBUG_ALWAYS, LOG_ERR, "Invalid address family!");
+ free(afname);
return false;
}
return false;
}
@@
-762,6
+798,7
@@
static bool add_listen_address(char *address, bool bindto) {
if(listen_sockets >= MAXSOCKETS) {
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
if(listen_sockets >= MAXSOCKETS) {
logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+ freeaddrinfo(ai);
return false;
}
return false;
}
@@
-935,6
+972,8
@@
static bool setup_myself(void) {
logger(DEBUG_ALWAYS, LOG_ERR, "UDPRcvBuf cannot be negative!");
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "UDPRcvBuf cannot be negative!");
return false;
}
+
+ udp_rcvbuf_warnings = true;
}
if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
}
if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
@@
-942,6
+981,8
@@
static bool setup_myself(void) {
logger(DEBUG_ALWAYS, LOG_ERR, "UDPSndBuf cannot be negative!");
return false;
}
logger(DEBUG_ALWAYS, LOG_ERR, "UDPSndBuf cannot be negative!");
return false;
}
+
+ udp_sndbuf_warnings = true;
}
get_config_int(lookup_config(config_tree, "FWMark"), &fwmark);
}
get_config_int(lookup_config(config_tree, "FWMark"), &fwmark);
@@
-1326,7
+1367,7
@@
void close_network_connections(void) {
if(myself && myself->connection) {
subnet_update(myself, NULL, false);
if(myself && myself->connection) {
subnet_update(myself, NULL, false);
-
connection_del
(myself->connection);
+
free_connection
(myself->connection);
}
for(int i = 0; i < listen_sockets; i++) {
}
for(int i = 0; i < listen_sockets; i++) {