/*
subnet.c -- handle subnet lookups and lists
- Copyright (C) 2000-2010 Guus Sliepen <guus@tinc-vpn.org>,
+ 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
result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
- if(result)
+ if(result) {
return result;
-
+ }
+
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);
}
result = b->net.ipv4.prefixlength - a->net.ipv4.prefixlength;
- if(result)
+ 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->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);
}
result = b->net.ipv6.prefixlength - a->net.ipv6.prefixlength;
- if(result)
+ 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->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);
}
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);
+ a->type);
exit(0);
}
/* Ascii representation of subnets */
bool str2net(subnet_t *subnet, const char *subnetstr) {
- int i, l;
- uint16_t x[8];
+ char str[64];
+ strncpy(str, subnetstr, sizeof(str));
+ str[sizeof(str) - 1] = 0;
+ int consumed;
+
int weight = 10;
+ char *weight_separator = strchr(str, '#');
- if(sscanf(subnetstr, "%hu.%hu.%hu.%hu/%d#%d",
- &x[0], &x[1], &x[2], &x[3], &l, &weight) >= 5) {
- if(l < 0 || l > 32)
- return false;
+ if(weight_separator) {
+ char *weight_str = weight_separator + 1;
- subnet->type = SUBNET_IPV4;
- subnet->net.ipv4.prefixlength = l;
- subnet->weight = weight;
+ if(sscanf(weight_str, "%d%n", &weight, &consumed) < 1) {
+ return false;
+ }
- for(i = 0; i < 4; i++) {
- if(x[i] > 255)
- return false;
- subnet->net.ipv4.address.x[i] = x[i];
+ if(weight_str[consumed]) {
+ return false;
}
- return true;
+ *weight_separator = 0;
}
- if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%d",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7],
- &l, &weight) >= 9) {
- if(l < 0 || l > 128)
+ int prefixlength = -1;
+ char *prefixlength_separator = strchr(str, '/');
+
+ if(prefixlength_separator) {
+ char *prefixlength_str = prefixlength_separator + 1;
+
+ if(sscanf(prefixlength_str, "%d%n", &prefixlength, &consumed) < 1) {
return false;
+ }
- subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.prefixlength = l;
- subnet->weight = weight;
+ if(prefixlength_str[consumed]) {
+ return false;
+ }
- for(i = 0; i < 8; i++)
- subnet->net.ipv6.address.x[i] = htons(x[i]);
+ *prefixlength_separator = 0;
- return true;
+ if(prefixlength < 0) {
+ return false;
+ }
}
- if(sscanf(subnetstr, "%hu.%hu.%hu.%hu#%d", &x[0], &x[1], &x[2], &x[3], &weight) >= 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++) {
- if(x[i] > 255)
- return false;
- 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(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], &weight) >= 8) {
- subnet->type = SUBNET_IPV6;
- subnet->net.ipv6.prefixlength = 128;
- subnet->weight = weight;
+ if(inet_pton(AF_INET, str, &subnet->net.ipv4.address)) {
+ if(prefixlength == -1) {
+ prefixlength = 32;
+ }
- for(i = 0; i < 8; i++)
- subnet->net.ipv6.address.x[i] = htons(x[i]);
+ if(prefixlength > 32) {
+ return false;
+ }
+
+ subnet->type = SUBNET_IPV4;
+ subnet->net.ipv4.prefixlength = prefixlength;
+ subnet->weight = weight;
return true;
}
- if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
- &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &weight) >= 6) {
- subnet->type = SUBNET_MAC;
- subnet->weight = weight;
+ if(inet_pton(AF_INET6, str, &subnet->net.ipv6.address)) {
+ if(prefixlength == -1) {
+ prefixlength = 128;
+ }
- for(i = 0; i < 6; i++)
- subnet->net.mac.address.x[i] = x[i];
+ if(prefixlength > 128) {
+ return false;
+ }
+
+ subnet->type = SUBNET_IPV6;
+ subnet->net.ipv6.prefixlength = prefixlength;
+ subnet->weight = weight;
return true;
}
bool net2str(char *netstr, int len, const subnet_t *subnet) {
if(!netstr || !subnet) {
- logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", netstr, subnet);
+ logger(LOG_ERR, "net2str() was called with netstr=%p, subnet=%p!", (void *)netstr, (void *)subnet);
return false;
}
- switch (subnet->type) {
- case SUBNET_MAC:
- snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx#%d",
- 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],
- subnet->weight);
- break;
-
- case SUBNET_IPV4:
- snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%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,
- subnet->weight);
- break;
-
- case SUBNET_IPV6:
- snprintf(netstr, len, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx/%d#%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,
- subnet->weight);
- break;
-
- default:
- logger(LOG_ERR,
- "net2str() was called with unknown subnet type %d, exiting!",
- subnet->type);
- exit(0);
+ int result;
+ int prefixlength = -1;
+
+ 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;
+ }
+
+ break;
+ }
+
+ default:
+ logger(LOG_ERR, "net2str() was called with unknown subnet type %d, exiting!", subnet->type);
+ exit(1);
+ }
+
+ size_t used = strlen(netstr);
+ netstr += used;
+ len -= used;
+
+ if(prefixlength >= 0) {
+ result = snprintf(netstr, len, "/%d", prefixlength);
+ netstr += result;
+ len -= result;
+ }
+
+ if(subnet->weight != 10) {
+ snprintf(netstr, len, "#%d", subnet->weight);
}
return true;
// Check if this address is cached
for(i = 0; i < 2; i++) {
- if(!cache_mac_valid[i])
+ if(!cache_mac_valid[i]) {
continue;
- if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner)
+ }
+
+ if(owner && cache_mac_subnet[i] && cache_mac_subnet[i]->owner != owner) {
continue;
- if(!memcmp(address, &cache_mac_address[i], sizeof *address))
+ }
+
+ if(!memcmp(address, &cache_mac_address[i], sizeof(*address))) {
return cache_mac_subnet[i];
+ }
}
// Search all subnets for a matching one
for(n = owner ? owner->subnet_tree->head : subnet_tree->head; n; n = n->next) {
p = n->data;
-
- if(!p || p->type != SUBNET_MAC)
+
+ if(!p || p->type != SUBNET_MAC) {
continue;
+ }
- if(!memcmp(address, &p->net.mac.address, sizeof *address)) {
+ if(!memcmp(address, &p->net.mac.address, sizeof(*address))) {
r = p;
- if(p->owner->status.reachable)
+
+ 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);
+ memcpy(&cache_mac_address[cache_mac_slot], address, sizeof(*address));
cache_mac_subnet[cache_mac_slot] = r;
cache_mac_valid[cache_mac_slot] = true;
// Check if this address is cached
for(i = 0; i < 2; i++) {
- if(!cache_ipv4_valid[i])
+ if(!cache_ipv4_valid[i]) {
continue;
- if(!memcmp(address, &cache_ipv4_address[i], sizeof *address))
+ }
+
+ if(!memcmp(address, &cache_ipv4_address[i], sizeof(*address))) {
return cache_ipv4_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_IPV4)
+
+ if(!p || p->type != SUBNET_IPV4) {
continue;
+ }
if(!maskcmp(address, &p->net.ipv4.address, p->net.ipv4.prefixlength)) {
r = p;
- if(p->owner->status.reachable)
+
+ if(p->owner->status.reachable) {
break;
+ }
}
}
// Cache the result
cache_ipv4_slot = !cache_ipv4_slot;
- memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof *address);
+ memcpy(&cache_ipv4_address[cache_ipv4_slot], address, sizeof(*address));
cache_ipv4_subnet[cache_ipv4_slot] = r;
cache_ipv4_valid[cache_ipv4_slot] = true;
// Check if this address is cached
for(i = 0; i < 2; i++) {
- if(!cache_ipv6_valid[i])
+ if(!cache_ipv6_valid[i]) {
continue;
- if(!memcmp(address, &cache_ipv6_address[i], sizeof *address))
+ }
+
+ 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)
+
+ if(!p || p->type != SUBNET_IPV6) {
continue;
+ }
if(!maskcmp(address, &p->net.ipv6.address, p->net.ipv6.prefixlength)) {
r = p;
- if(p->owner->status.reachable)
+
+ if(p->owner->status.reachable) {
break;
+ }
}
}
// Cache the result
cache_ipv6_slot = !cache_ipv6_slot;
- memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof *address);
+ memcpy(&cache_ipv6_address[cache_ipv6_slot], address, sizeof(*address));
cache_ipv6_subnet[cache_ipv6_slot] = r;
cache_ipv6_valid[cache_ipv6_slot] = true;
void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
avl_node_t *node;
int i;
- char *envp[9] = {NULL};
+ 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 ? : "");
- xasprintf(&envp[1], "DEVICE=%s", device ? : "");
- xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+ 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);
- // 4 and 5 are reserved for SUBNET and WEIGHT
- xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
- xasprintf(&envp[7], "REMOTEPORT=%s", 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);
}
name = up ? "subnet-up" : "subnet-down";
if(!subnet) {
for(node = owner->subnet_tree->head; node; node = node->next) {
subnet = node->data;
- if(!net2str(netstr, sizeof netstr, subnet))
+
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
continue;
+ }
+
// Strip the weight from the subnet, and put it in its own environment variable
char *weight = strchr(netstr, '#');
- if(weight)
+
+ if(weight) {
*weight++ = 0;
- else
+ } else {
weight = empty;
+ }
// Prepare the SUBNET and WEIGHT variables
- if(envp[4])
- free(envp[4]);
- if(envp[5])
- free(envp[5]);
- xasprintf(&envp[4], "SUBNET=%s", netstr);
- xasprintf(&envp[5], "WEIGHT=%s", weight);
+ free(envp[5]);
+ free(envp[6]);
+
+ xasprintf(&envp[5], "SUBNET=%s", netstr);
+ xasprintf(&envp[6], "WEIGHT=%s", weight);
execute_script(name, envp);
}
} else {
- if(net2str(netstr, sizeof netstr, subnet)) {
+ 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)
+
+ if(weight) {
*weight++ = 0;
- else
+ } else {
weight = empty;
+ }
// Prepare the SUBNET and WEIGHT variables
- xasprintf(&envp[4], "SUBNET=%s", netstr);
- xasprintf(&envp[5], "WEIGHT=%s", weight);
+ xasprintf(&envp[5], "SUBNET=%s", netstr);
+ xasprintf(&envp[6], "WEIGHT=%s", weight);
execute_script(name, envp);
}
}
- for(i = 0; envp[i] && i < 9; i++)
+ for(i = 0; i < 9; i++) {
free(envp[i]);
+ }
}
void dump_subnets(void) {
for(node = subnet_tree->head; node; node = node->next) {
subnet = node->data;
- if(!net2str(netstr, sizeof netstr, subnet))
+
+ if(!net2str(netstr, sizeof(netstr), subnet)) {
continue;
+ }
+
logger(LOG_DEBUG, " %s owner %s", netstr, subnet->owner->name);
}