X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconf.c;h=4dd016cdf265a28356d4b606c8dcce4c1e13fb23;hb=7e09765003114ba37fed2851d9126924d0f813f1;hp=0b84ad71ee4a84aece0d2563c055a8ec74c7967a;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc diff --git a/src/conf.c b/src/conf.c index 0b84ad71..4dd016cd 100644 --- a/src/conf.c +++ b/src/conf.c @@ -4,7 +4,7 @@ 1998-2005 Ivo Timmermans 2000 Cris van Pelt 2010-2011 Julien Muchembled - 2000-2015 Guus Sliepen + 2000-2021 Guus Sliepen 2013 Florent Clairambault This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ #include "utils.h" /* for cp */ #include "xalloc.h" -splay_tree_t *config_tree; +splay_tree_t *config_tree = NULL; int pinginterval = 0; /* seconds between pings */ int pingtimeout = 0; /* seconds to wait for response */ @@ -80,18 +80,9 @@ config_t *new_config(void) { } void free_config(config_t *cfg) { - if(cfg->variable) { - free(cfg->variable); - } - - if(cfg->value) { - free(cfg->value); - } - - if(cfg->file) { - free(cfg->file); - } - + free(cfg->variable); + free(cfg->value); + free(cfg->file); free(cfg); } @@ -215,20 +206,14 @@ bool get_config_subnet(const config_t *cfg, subnet_t **result) { return false; } - /* Teach newbies what subnets are... */ - - if(((subnet.type == SUBNET_IPV4) - && !maskcheck(&subnet.net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(subnet.net.ipv4.address))) - || ((subnet.type == SUBNET_IPV6) - && !maskcheck(&subnet.net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(subnet.net.ipv6.address)))) { - logger(DEBUG_ALWAYS, LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d", - cfg->variable, cfg->file, cfg->line); - return false; + if(subnetcheck(subnet)) { + *(*result = new_subnet()) = subnet; + return true; } - *(*result = new_subnet()) = subnet; - - return true; + logger(DEBUG_ALWAYS, LOG_ERR, "Network address and prefix length do not match for configuration variable %s in %s line %d", + cfg->variable, cfg->file, cfg->line); + return false; } /*