/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
- 2000-2003 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-2019 Guus Sliepen <guus@tinc-vpn.org>,
+ 2000-2005 Ivo Timmermans
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id: subnet.c,v 1.1.2.49 2003/07/30 11:50:45 guus Exp $
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "system.h"
#include "avl_tree.h"
+#include "device.h"
#include "logger.h"
#include "net.h"
#include "netutl.h"
#include "node.h"
+#include "process.h"
#include "subnet.h"
#include "utils.h"
#include "xalloc.h"
avl_tree_t *subnet_tree;
+/* Subnet lookup cache */
+
+static ipv4_t cache_ipv4_address[2];
+static subnet_t *cache_ipv4_subnet[2];
+static bool cache_ipv4_valid[2];
+static int cache_ipv4_slot;
+
+static ipv6_t cache_ipv6_address[2];
+static subnet_t *cache_ipv6_subnet[2];
+static bool cache_ipv6_valid[2];
+static int cache_ipv6_slot;
+
+static mac_t cache_mac_address[2];
+static subnet_t *cache_mac_subnet[2];
+static bool cache_mac_valid[2];
+static int cache_mac_slot;
+
+void subnet_cache_flush(void) {
+ cache_ipv4_valid[0] = cache_ipv4_valid[1] = false;
+ cache_ipv6_valid[0] = cache_ipv6_valid[1] = false;
+ cache_mac_valid[0] = cache_mac_valid[1] = false;
+}
+
/* Subnet comparison */
-static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
int result;
result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
- if(result || !a->owner || !b->owner)
+ if(result) {
return result;
+ }
+
+ result = a->weight - b->weight;
+
+ if(result || !a->owner || !b->owner) {
+ return result;
+ }
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
int result;
+ result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
+
+ if(result) {
+ return result;
+ }
+
result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
- if(result)
+ if(result) {
return result;
+ }
- result = a->net.ipv4.prefixlength - b->net.ipv4.prefixlength;
+ result = a->weight - b->weight;
- if(result || !a->owner || !b->owner)
+ if(result || !a->owner || !b->owner) {
return result;
+ }
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
-{
+static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
int result;
+ result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
+
+ if(result) {
+ return result;
+ }
+
result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
- if(result)
+ if(result) {
return result;
+ }
- result = a->net.ipv6.prefixlength - b->net.ipv6.prefixlength;
+ result = a->weight - b->weight;
- if(result || !a->owner || !b->owner)
+ if(result || !a->owner || !b->owner) {
return result;
+ }
return strcmp(a->owner->name, b->owner->name);
}
-static int subnet_compare(const subnet_t *a, const subnet_t *b)
-{
+int subnet_compare(const subnet_t *a, const subnet_t *b) {
int result;
result = a->type - b->type;
- if(result)
+ if(result) {
return result;
+ }
- switch (a->type) {
+ switch(a->type) {
case SUBNET_MAC:
return subnet_compare_mac(a, b);
+
case SUBNET_IPV4:
return subnet_compare_ipv4(a, b);
+
case SUBNET_IPV6:
return subnet_compare_ipv6(a, b);
+
default:
- logger(LOG_ERR, _("subnet_compare() was called with unknown subnet type %d, exitting!"),
- a->type);
- cp_trace();
+ logger(LOG_ERR, "subnet_compare() was called with unknown subnet type %d, exitting!",
+ a->type);
exit(0);
}
/* Initialising trees */
-void init_subnets(void)
-{
- cp();
-
+void init_subnets(void) {
subnet_tree = avl_alloc_tree((avl_compare_t) subnet_compare, (avl_action_t) free_subnet);
-}
-void exit_subnets(void)
-{
- cp();
+ subnet_cache_flush();
+}
+void exit_subnets(void) {
avl_delete_tree(subnet_tree);
}
-avl_tree_t *new_subnet_tree(void)
-{
- cp();
-
+avl_tree_t *new_subnet_tree(void) {
return avl_alloc_tree((avl_compare_t) subnet_compare, NULL);
}
-void free_subnet_tree(avl_tree_t *subnet_tree)
-{
- cp();
-
+void free_subnet_tree(avl_tree_t *subnet_tree) {
avl_delete_tree(subnet_tree);
}
/* Allocating and freeing space for subnets */
-subnet_t *new_subnet(void)
-{
- cp();
-
- return (subnet_t *) xmalloc_and_zero(sizeof(subnet_t));
+subnet_t *new_subnet(void) {
+ return xmalloc_and_zero(sizeof(subnet_t));
}
-void free_subnet(subnet_t *subnet)
-{
- cp();
-
+void free_subnet(subnet_t *subnet) {
free(subnet);
}
/* Adding and removing subnets */
-void subnet_add(node_t *n, subnet_t *subnet)
-{
- cp();
-
+void subnet_add(node_t *n, subnet_t *subnet) {
subnet->owner = n;
avl_insert(subnet_tree, subnet);
avl_insert(n->subnet_tree, subnet);
-}
-void subnet_del(node_t *n, subnet_t *subnet)
-{
- cp();
+ subnet_cache_flush();
+}
+void subnet_del(node_t *n, subnet_t *subnet) {
avl_delete(n->subnet_tree, subnet);
avl_delete(subnet_tree, subnet);
+
+ subnet_cache_flush();
}
/* Ascii representation of subnets */
-subnet_t *str2net(const char *subnetstr)
-{
- int i, l;
- subnet_t *subnet;
- uint16_t x[8];
+bool str2net(subnet_t *subnet, const char *subnetstr) {
+ char str[64];
+ strncpy(str, subnetstr, sizeof(str));
+ str[sizeof(str) - 1] = 0;
+ int consumed;
- cp();
+ int weight = 10;
+ char *weight_separator = strchr(str, '#');
- subnet = new_subnet();
+ if(weight_separator) {
+ char *weight_str = weight_separator + 1;
- if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d",
- &x[0], &x[1], &x[2], &x[3], &l) == 5) {
- subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.prefixlength = l;
+ if(sscanf(weight_str, "%d%n", &weight, &consumed) < 1) {
+ return false;
+ }
- for(i = 0; i < 4; i++)
- subnet->net.ipv4.address.x[i] = x[i];
+ if(weight_str[consumed]) {
+ return false;
+ }
- return subnet;
+ *weight_separator = 0;
}
- if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
- &l) == 9) {
- subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.prefixlength = l;
+ int prefixlength = -1;
+ char *prefixlength_separator = strchr(str, '/');
- for(i = 0; i < 8; i++)
- subnet->net.ipv6.address.x[i] = htons(x[i]);
+ if(prefixlength_separator) {
+ char *prefixlength_str = prefixlength_separator + 1;
- return subnet;
+ if(sscanf(prefixlength_str, "%d%n", &prefixlength, &consumed) < 1) {
+ return false;
+ }
+
+ if(prefixlength_str[consumed]) {
+ return false;
+ }
+
+ *prefixlength_separator = 0;
+
+ if(prefixlength < 0) {
+ return false;
+ }
}
- if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
- subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.prefixlength = 32;
+ uint16_t x[8];
+
+ if(sscanf(str, "%hx:%hx:%hx:%hx:%hx:%hx%n", &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &consumed) >= 6 && !str[consumed]) {
+ /*
+ Normally we should check that each part has two digits to prevent ambiguities.
+ However, in old tinc versions net2str() will aggressively return MAC addresses with one-digit parts,
+ so we have to accept them otherwise we would be unable to parse ADD_SUBNET messages.
+ */
+ if(prefixlength >= 0) {
+ return false;
+ }
+
+ subnet->type = SUBNET_MAC;
+ subnet->weight = weight;
- for(i = 0; i < 4; i++)
- subnet->net.ipv4.address.x[i] = x[i];
+ for(int i = 0; i < 6; i++) {
+ subnet->net.mac.address.x[i] = x[i];
+ }
+
+ return true;
+ }
+
+ if(inet_pton(AF_INET, str, &subnet->net.ipv4.address)) {
+ if(prefixlength == -1) {
+ prefixlength = 32;
+ }
+
+ if(prefixlength > 32) {
+ return false;
+ }
+
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.prefixlength = prefixlength;
+ subnet->weight = weight;
- return subnet;
+ return true;
}
- if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8) {
+ if(inet_pton(AF_INET6, str, &subnet->net.ipv6.address)) {
+ if(prefixlength == -1) {
+ prefixlength = 128;
+ }
+
+ if(prefixlength > 128) {
+ return false;
+ }
+
subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.prefixlength = 128;
+ subnet->net.ipv6.prefixlength = prefixlength;
+ subnet->weight = weight;
- for(i = 0; i < 8; i++)
- subnet->net.ipv6.address.x[i] = htons(x[i]);
+ return true;
+ }
- return subnet;
+ return false;
+}
+
+bool net2str(char *netstr, int len, const subnet_t *subnet) {
+ if(!netstr || !subnet) {
+ logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", (void *)netstr, (void *)subnet);
+ return false;
}
- if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5]) == 6) {
- subnet->type = SUBNET_MAC;
+ int result;
+ int prefixlength = -1;
- for(i = 0; i < 6; i++)
- subnet->net.mac.address.x[i] = x[i];
+ switch(subnet->type) {
+ case SUBNET_MAC:
+ snprintf(netstr, len, "%02x:%02x:%02x:%02x:%02x:%02x",
+ subnet->net.mac.address.x[0],
+ subnet->net.mac.address.x[1],
+ subnet->net.mac.address.x[2],
+ subnet->net.mac.address.x[3],
+ subnet->net.mac.address.x[4],
+ subnet->net.mac.address.x[5]);
+ break;
+
+ case SUBNET_IPV4:
+ inet_ntop(AF_INET, &subnet->net.ipv4.address, netstr, len);
+ prefixlength = subnet->net.ipv4.prefixlength;
+
+ if(prefixlength == 32) {
+ prefixlength = -1;
+ }
+
+ break;
+
+ case SUBNET_IPV6: {
+ inet_ntop(AF_INET6, &subnet->net.ipv6.address, netstr, len);
+ prefixlength = subnet->net.ipv6.prefixlength;
+
+ if(prefixlength == 128) {
+ prefixlength = -1;
+ }
- return subnet;
+ break;
}
- free(subnet);
+ default:
+ logger(LOG_ERR, "net2str() was called with unknown subnet type %d, exiting!", subnet->type);
+ exit(1);
+ }
- return NULL;
-}
+ size_t used = strlen(netstr);
+ netstr += used;
+ len -= used;
-char *net2str(const subnet_t *subnet)
-{
- char *netstr;
-
- cp();
-
- switch (subnet->type) {
- case SUBNET_MAC:
- asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx",
- subnet->net.mac.address.x[0],
- subnet->net.mac.address.x[1],
- subnet->net.mac.address.x[2],
- subnet->net.mac.address.x[3],
- subnet->net.mac.address.x[4], subnet->net.mac.address.x[5]);
- break;
-
- case SUBNET_IPV4:
- asprintf(&netstr, "%hu.%hu.%hu.%hu/%d",
- subnet->net.ipv4.address.x[0],
- subnet->net.ipv4.address.x[1],
- subnet->net.ipv4.address.x[2],
- subnet->net.ipv4.address.x[3], subnet->net.ipv4.prefixlength);
- break;
-
- case SUBNET_IPV6:
- asprintf(&netstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d",
- ntohs(subnet->net.ipv6.address.x[0]),
- ntohs(subnet->net.ipv6.address.x[1]),
- ntohs(subnet->net.ipv6.address.x[2]),
- ntohs(subnet->net.ipv6.address.x[3]),
- ntohs(subnet->net.ipv6.address.x[4]),
- ntohs(subnet->net.ipv6.address.x[5]),
- ntohs(subnet->net.ipv6.address.x[6]),
- ntohs(subnet->net.ipv6.address.x[7]),
- subnet->net.ipv6.prefixlength);
- break;
-
- default:
- logger(LOG_ERR,
- _("net2str() was called with unknown subnet type %d, exiting!"),
- subnet->type);
- cp_trace();
- exit(0);
+ if(prefixlength >= 0) {
+ result = snprintf(netstr, len, "/%d", prefixlength);
+ netstr += result;
+ len -= result;
}
- return netstr;
+ if(subnet->weight != 10) {
+ snprintf(netstr, len, "#%d", subnet->weight);
+ }
+
+ return true;
}
/* Subnet lookup routines */
-subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet)
-{
- cp();
-
+subnet_t *lookup_subnet(const node_t *owner, const subnet_t *subnet) {
return avl_search(owner->subnet_tree, subnet);
}
-subnet_t *lookup_subnet_mac(const mac_t *address)
-{
- subnet_t *p, subnet = {0};
+subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
+ subnet_t *p, *r = NULL;
+ avl_node_t *n;
+ int i;
+
+ // Check if this address is cached
+
+ for(i = 0; i < 2; i++) {
+ if(!cache_mac_valid[i]) {
+ continue;
+ }
+
+ if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner) {
+ continue;
+ }
+
+ if(!memcmp(address, &cache_mac_address[i], sizeof(*address))) {
+ return cache_mac_subnet[i];
+ }
+ }
+
+ // Search all subnets for a matching one
- cp();
+ for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
+ p = n->data;
- subnet.type = SUBNET_MAC;
- subnet.net.mac.address = *address;
- subnet.owner = NULL;
+ if(!p || p->type != SUBNET_MAC) {
+ continue;
+ }
- p = (subnet_t *) avl_search(subnet_tree, &subnet);
+ if(!memcmp(address, &p->net.mac.address, sizeof(*address))) {
+ r = p;
- return p;
+ if(p->owner->status.reachable) {
+ break;
+ }
+ }
+ }
+
+ // Cache the result
+
+ cache_mac_slot = !cache_mac_slot;
+ memcpy(&cache_mac_address[cache_mac_slot], address, sizeof(*address));
+ cache_mac_subnet[cache_mac_slot] = r;
+ cache_mac_valid[cache_mac_slot] = true;
+
+ return r;
}
-subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
-{
- subnet_t *p, subnet = {0};
+subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
+ subnet_t *p, *r = NULL;
+ avl_node_t *n;
+ int i;
- cp();
+ // Check if this address is cached
+
+ for(i = 0; i < 2; i++) {
+ if(!cache_ipv4_valid[i]) {
+ continue;
+ }
+
+ if(!memcmp(address, &cache_ipv4_address[i], sizeof(*address))) {
+ return cache_ipv4_subnet[i];
+ }
+ }
- subnet.type = SUBNET_IPV4;
- subnet.net.ipv4.address = *address;
- subnet.net.ipv4.prefixlength = 32;
- subnet.owner = NULL;
+ // Search all subnets for a matching one
- do {
- /* Go find subnet */
+ for(n = subnet_tree->head; n; n = n->next) {
+ p = n->data;
- p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+ if(!p || p->type != SUBNET_IPV4) {
+ continue;
+ }
- /* Check if the found subnet REALLY matches */
+ if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
+ r = p;
- if(p) {
- if(p->type != SUBNET_IPV4) {
- p = NULL;
+ if(p->owner->status.reachable) {
break;
}
+ }
+ }
- if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength, sizeof(ipv4_t)))
- break;
- else {
- /* Otherwise, see if there is a bigger enclosing subnet */
+ // Cache the result
+
+ cache_ipv4_slot = !cache_ipv4_slot;
+ memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof(*address));
+ cache_ipv4_subnet[cache_ipv4_slot] = r;
+ cache_ipv4_valid[cache_ipv4_slot] = true;
+
+ return r;
+}
+
+subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
+ subnet_t *p, *r = NULL;
+ avl_node_t *n;
+ int i;
+
+ // Check if this address is cached
+
+ for(i = 0; i < 2; i++) {
+ if(!cache_ipv6_valid[i]) {
+ continue;
+ }
+
+ if(!memcmp(address, &cache_ipv6_address[i], sizeof(*address))) {
+ return cache_ipv6_subnet[i];
+ }
+ }
+
+ // Search all subnets for a matching one
+
+ for(n = subnet_tree->head; n; n = n->next) {
+ p = n->data;
+
+ if(!p || p->type != SUBNET_IPV6) {
+ continue;
+ }
- subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
- maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
+ if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
+ r = p;
+
+ if(p->owner->status.reachable) {
+ break;
}
}
- } while(p);
+ }
+
+ // Cache the result
+
+ cache_ipv6_slot = !cache_ipv6_slot;
+ memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof(*address));
+ cache_ipv6_subnet[cache_ipv6_slot] = r;
+ cache_ipv6_valid[cache_ipv6_slot] = true;
- return p;
+ return r;
}
-subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
-{
- subnet_t *p, subnet = {0};
+void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
+ avl_node_t *node;
+ int i;
+ char *envp[10] = {NULL};
+ char netstr[MAXNETSTR];
+ char *name, *address, *port;
+ char empty[] = "";
+
+ // Prepare environment variables to be passed to the script
+
+ xasprintf(&envp[0], "NETNAME=%s", netname ? netname : "");
+ xasprintf(&envp[1], "DEVICE=%s", device ? device : "");
+ xasprintf(&envp[2], "INTERFACE=%s", iface ? iface : "");
+ xasprintf(&envp[3], "NODE=%s", owner->name);
+ xasprintf(&envp[4], "NAME=%s", myself->name);
+
+ if(owner != myself) {
+ sockaddr2str(&owner->address, &address, &port);
+ // 5 and 6 are reserved for SUBNET and WEIGHT
+ xasprintf(&envp[7], "REMOTEADDRESS=%s", address);
+ xasprintf(&envp[8], "REMOTEPORT=%s", port);
+ free(port);
+ free(address);
+ }
- cp();
+ name = up ? "subnet-up" : "subnet-down";
- subnet.type = SUBNET_IPV6;
- subnet.net.ipv6.address = *address;
- subnet.net.ipv6.prefixlength = 128;
- subnet.owner = NULL;
+ if(!subnet) {
+ for(node = owner->subnet_tree->head; node; node = node->next) {
+ subnet = node->data;
- do {
- /* Go find subnet */
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
+ continue;
+ }
- p = (subnet_t *) avl_search_closest_smaller(subnet_tree, &subnet);
+ // Strip the weight from the subnet, and put it in its own environment variable
+ char *weight = strchr(netstr, '#');
- /* Check if the found subnet REALLY matches */
+ if(weight) {
+ *weight++ = 0;
+ } else {
+ weight = empty;
+ }
- if(p) {
- if(p->type != SUBNET_IPV6)
- return NULL;
+ // Prepare the SUBNET and WEIGHT variables
+ free(envp[5]);
+ free(envp[6]);
- if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength, sizeof(ipv6_t)))
- break;
- else {
- /* Otherwise, see if there is a bigger enclosing subnet */
+ xasprintf(&envp[5], "SUBNET=%s", netstr);
+ xasprintf(&envp[6], "WEIGHT=%s", weight);
- subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
- maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
+ execute_script(name, envp);
+ }
+ } else {
+ if(net2str(netstr, sizeof(netstr), subnet)) {
+ // Strip the weight from the subnet, and put it in its own environment variable
+ char *weight = strchr(netstr, '#');
+
+ if(weight) {
+ *weight++ = 0;
+ } else {
+ weight = empty;
}
+
+ // Prepare the SUBNET and WEIGHT variables
+ xasprintf(&envp[5], "SUBNET=%s", netstr);
+ xasprintf(&envp[6], "WEIGHT=%s", weight);
+
+ execute_script(name, envp);
}
- } while(p);
+ }
- return p;
+ for(i = 0; i < 9; i++) {
+ free(envp[i]);
+ }
}
-void dump_subnets(void)
-{
- char *netstr;
+void dump_subnets(void) {
+ char netstr[MAXNETSTR];
subnet_t *subnet;
avl_node_t *node;
- cp();
-
- logger(LOG_DEBUG, _("Subnet list:"));
+ logger(LOG_DEBUG, "Subnet list:");
for(node = subnet_tree->head; node; node = node->next) {
- subnet = (subnet_t *) node->data;
- netstr = net2str(subnet);
- logger(LOG_DEBUG, _(" %s owner %s"), netstr, subnet->owner->name);
- free(netstr);
+ subnet = node->data;
+
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
+ continue;
+ }
+
+ logger(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
}
- logger(LOG_DEBUG, _("End of subnet list."));
+ logger(LOG_DEBUG, "End of subnet list.");
}
projects / tinc / blobdiff