X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=154fd8048b16285ff79c8d8b3665ff72a5f84db4;hp=43a7ad218f10bb60b5c5bf38a442e0424fe8d85a;hb=HEAD;hpb=985d19caf20058db3c764f0f6fbeafa8bcc59fcc

diff --git a/src/subnet.c b/src/subnet.c
index 43a7ad21..da69810c 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -1,6 +1,6 @@
 /*
     subnet.c -- handle subnet lookups and lists
-    Copyright (C) 2000-2014 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
@@ -65,13 +65,15 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b) {
 
 	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);
 }
@@ -81,18 +83,21 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b) {
 
 	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);
 }
@@ -102,18 +107,21 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b) {
 
 	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);
 }
@@ -123,19 +131,23 @@ int subnet_compare(const subnet_t *a, const subnet_t *b) {
 
 	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);
 	}
 
@@ -193,150 +205,100 @@ void subnet_del(node_t *n, subnet_t *subnet) {
 /* 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)
-			return false;
+	int prefixlength = -1;
+	char *prefixlength_separator = strchr(str, '/');
 
-		subnet->type = SUBNET_IPV6;
-		subnet->net.ipv6.prefixlength = l;
-		subnet->weight = weight;
+	if(prefixlength_separator) {
+		char *prefixlength_str = prefixlength_separator + 1;
 
-		for(i = 0; i < 8; i++)
-			subnet->net.ipv6.address.x[i] = htons(x[i]);
+		if(sscanf(prefixlength_str, "%d%n", &prefixlength, &consumed) < 1) {
+			return false;
+		}
 
-		return true;
-	}
+		if(prefixlength_str[consumed]) {
+			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;
-		subnet->weight = weight;
+		*prefixlength_separator = 0;
 
-		for(i = 0; i < 4; i++) {
-			if(x[i] > 255)
-				return false;
-			subnet->net.ipv4.address.x[i] = x[i];
+		if(prefixlength < 0) {
+			return false;
 		}
-
-		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;
-
-		for(i = 0; i < 8; i++)
-			subnet->net.ipv6.address.x[i] = htons(x[i]);
+	uint16_t x[8];
 
-		return true;
-	}
+	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;
+		}
 
-	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;
 
-		for(i = 0; i < 6; i++)
+		for(int i = 0; i < 6; i++) {
 			subnet->net.mac.address.x[i] = x[i];
+		}
 
 		return true;
 	}
 
-	// IPv6 short form
-	if(strstr(subnetstr, "::")) {
-		const char *p;
-		char *q;
-		int colons = 0;
-
-		// Count number of colons
-		for(p = subnetstr; *p; p++)
-			if(*p == ':')
-				colons++;
-
-		if(colons > 7)
-			return false;
-
-		// Scan numbers before the double colon
-		p = subnetstr;
-		for(i = 0; i < colons; i++) {
-			if(*p == ':')
-				break;
-			x[i] = strtoul(p, &q, 0x10);
-			if(!q || p == q || *q != ':')
-				return false;
-			p = ++q;
+	if(inet_pton(AF_INET, str, &subnet->net.ipv4.address)) {
+		if(prefixlength == -1) {
+			prefixlength = 32;
 		}
 
-		p++;
-		colons -= i;
-		if(!i) {
-			p++;
-			colons--;
+		if(prefixlength > 32) {
+			return false;
 		}
 
-		if(!*p || *p == '/' || *p == '#')
-			colons--;
+		subnet->type = SUBNET_IPV4;
+		subnet->net.ipv4.prefixlength = prefixlength;
+		subnet->weight = weight;
 
-		// Fill in the blanks
-		for(; i < 8 - colons; i++)
-			x[i] = 0;
+		return true;
+	}
 
-		// Scan the remaining numbers
-		for(; i < 8; i++) {
-			x[i] = strtoul(p, &q, 0x10);
-			if(!q || p == q)
-				return false;
-			if(i == 7) {
-				p = q;
-				break;
-			}
-			if(*q != ':')
-				return false;
-			p = ++q;
+	if(inet_pton(AF_INET6, str, &subnet->net.ipv6.address)) {
+		if(prefixlength == -1) {
+			prefixlength = 128;
 		}
 
-		l = 128;
-		if(*p == '/')
-			sscanf(p, "/%d#%d", &l, &weight);
-		else if(*p == '#')
-			sscanf(p, "#%d", &weight);
-
-		if(l < 0 || l > 128)
+		if(prefixlength > 128) {
 			return false;
+		}
 
 		subnet->type = SUBNET_IPV6;
-		subnet->net.ipv6.prefixlength = l;
+		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;
 	}
 
@@ -345,51 +307,62 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 
 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, "%x:%x:%x:%x:%x:%x#%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, "%u.%u.%u.%u/%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, "%x:%x:%x:%x:%x:%x:%x:%x/%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;
@@ -409,26 +382,34 @@ subnet_t *lookup_subnet_mac(const node_t *owner, const mac_t *address) {
 	// 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))) {
 			r = p;
-			if(p->owner->status.reachable)
+
+			if(p->owner->status.reachable) {
 				break;
+			}
 		}
 	}
 
@@ -450,24 +431,30 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address) {
 	// 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;
+			}
 		}
 	}
 
@@ -489,24 +476,30 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address) {
 	// 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;
+			}
 		}
 	}
 
@@ -530,9 +523,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 
 	// 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);
 
@@ -550,20 +543,24 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 	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[5])
-				free(envp[5]);
-			if(envp[6])
-				free(envp[6]);
+			free(envp[5]);
+			free(envp[6]);
+
 			xasprintf(&envp[5], "SUBNET=%s", netstr);
 			xasprintf(&envp[6], "WEIGHT=%s", weight);
 
@@ -573,10 +570,12 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		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[5], "SUBNET=%s", netstr);
@@ -586,8 +585,9 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		}
 	}
 
-	for(i = 0; envp[i] && i < 9; i++)
+	for(i = 0; i < 9; i++) {
 		free(envp[i]);
+	}
 }
 
 void dump_subnets(void) {
@@ -599,8 +599,11 @@ 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);
 	}