X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet_parse.c;h=592283117f8df39cf1e18f0ab9209526249fbeb1;hb=fcf5b53e785fd191dd951b77ad831fe6ac78dce4;hp=5fac415b8b83eafa71ead0a2b53eea2a7a38095e;hpb=dc55691ca7399bab28963f92e4c3dea9d6bf8eb1;p=tinc

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 5fac415b..59228311 100644
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -27,6 +27,9 @@
 #include "utils.h"
 #include "xalloc.h"
 
+/* Changing this default will affect ADD_SUBNET messages - beware of inconsistencies between versions */
+static const int DEFAULT_WEIGHT = 10;
+
 /* Subnet mask handling */
 
 int maskcmp(const void *va, const void *vb, int masklen) {
@@ -185,7 +188,7 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 	strncpy(str, subnetstr, sizeof(str));
 	int consumed;
 
-	int weight = 10;
+	int weight = DEFAULT_WEIGHT;
 	char *weight_separator = strchr(str, '#');
 	if (weight_separator) {
 		char *weight_str = weight_separator + 1;
@@ -306,9 +309,11 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 		return false;
 	}
 
+	int result;
+	int prefixlength = -1;
 	switch (subnet->type) {
 		case SUBNET_MAC:
-			snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx#%d",
+			result = snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx",
 					 subnet->net.mac.address.x[0],
 					 subnet->net.mac.address.x[1],
 					 subnet->net.mac.address.x[2],
@@ -316,36 +321,90 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 					 subnet->net.mac.address.x[4],
 					 subnet->net.mac.address.x[5],
 					 subnet->weight);
+			netstr += result;
+			len -= result;
 			break;
 
 		case SUBNET_IPV4:
-			snprintf(netstr, len, "%hu.%hu.%hu.%hu/%d#%d",
+			result = snprintf(netstr, len, "%hu.%hu.%hu.%hu",
 					 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);
+					 subnet->net.ipv4.address.x[3]);
+			netstr += result;
+			len -= result;
+			prefixlength = subnet->net.ipv4.prefixlength;
+			if (prefixlength == 32)
+				prefixlength = -1;
 			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);
+		case SUBNET_IPV6: {
+			/* Find the longest sequence of consecutive zeroes */
+			int max_zero_length = 0;
+			int max_zero_length_index = 0;
+			int current_zero_length = 0;
+			int current_zero_length_index = 0;
+			for (int i = 0; i < 8; i++) {
+				if (subnet->net.ipv6.address.x[i] != 0)
+					current_zero_length = 0;
+				else {
+					if (current_zero_length == 0)
+						current_zero_length_index = i;
+					current_zero_length++;
+					if (current_zero_length > max_zero_length) {
+						max_zero_length = current_zero_length;
+						max_zero_length_index = current_zero_length_index;
+					}
+				}
+			}
+
+			/* Print the address */
+			for (int i = 0; i < 8;) {
+				if (max_zero_length > 1 && max_zero_length_index == i) {
+					/* Shorten the representation as per RFC 5952 */
+					const char* const FORMATS[] = { "%.1s", "%.2s", "%.3s" };
+					const char* const* format = &FORMATS[0];
+					if (i == 0)
+						format++;
+					if (i + max_zero_length == 8)
+						format++;
+					result = snprintf(netstr, len, *format, ":::");
+					i += max_zero_length;
+				} else {
+					result = snprintf(netstr, len, "%hx:", ntohs(subnet->net.ipv6.address.x[i]));
+					i++;
+				}
+				netstr += result;
+				len -= result;
+			}
+
+			/* Remove the trailing colon */
+			netstr--;
+			len++;
+			*netstr = 0;
+
+			prefixlength = subnet->net.ipv6.prefixlength;
+			if (prefixlength == 128)
+				prefixlength = -1;
 			break;
+		}
 
 		default:
 			logger(DEBUG_ALWAYS, LOG_ERR, "net2str() was called with unknown subnet type %d, exiting!", subnet->type);
 			exit(1);
 	}
 
+	if (prefixlength >= 0) {
+		result = snprintf(netstr, len, "/%d", prefixlength);
+		netstr += result;
+		len -= result;
+	}
+
+	if (subnet->weight != DEFAULT_WEIGHT) {
+		snprintf(netstr, len, "#%d", subnet->weight);
+		netstr += result;
+		len -= result;
+	}
+
 	return true;
 }