X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet.c;h=d7b9f470bffe3d68c2e3c2383504d008a716badd;hp=47f14366c10127b1d30f488eea79662e5bb85836;hb=3bd810ea79d6933839ddac4a2cf1445c51947d38;hpb=5cff8c47c1781a88123c128a4cec6cdd39925aa5

diff --git a/src/subnet.c b/src/subnet.c
index 47f14366..d7b9f470 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -268,6 +268,78 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 		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;
+		}
+
+		p++;
+		colons -= i;
+		if(!i) {
+			p++;
+			colons--;
+		}
+
+		if(!*p || *p == '/' || *p == '#')
+			colons--;
+
+		// Fill in the blanks
+		for(; i < 8 - colons; i++)
+			x[i] = 0;
+
+		// 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;
+		}
+
+		l = 128;
+		if(*p == '/')
+			sscanf(p, "/%d#%d", &l, &weight);
+		else if(*p == '#')
+			sscanf(p, "#%d", &weight);
+
+		if(l < 0 || l > 128)
+			return false;
+
+		subnet->type = SUBNET_IPV6;
+		subnet->net.ipv6.prefixlength = l;
+		subnet->weight = weight;
+
+		for(i = 0; i < 8; i++)
+			subnet->net.ipv6.address.x[i] = htons(x[i]);
+
+		return true;
+	}
+
 	return false;
 }
 
@@ -468,6 +540,8 @@ void subnet_update(node_t *owner, subnet_t *subnet, bool up) {
 		// 4 and 5 are reserved for SUBNET and WEIGHT
 		xasprintf(&envp[6], "REMOTEADDRESS=%s", address);
 		xasprintf(&envp[7], "REMOTEPORT=%s", port);
+		free(port);
+		free(address);
 	}
 
 	name = up ? "subnet-up" : "subnet-down";