X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet_parse.c;h=1d54c1344746031bcef3e339b5354256de04c5f3;hb=6e221a828f87a511aecee9d9263a1db0836701c4;hp=592283117f8df39cf1e18f0ab9209526249fbeb1;hpb=d0d01a44485ee04f60a8fccf9bdf8311e23ffa43;p=tinc

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 59228311..1d54c134 100644
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -255,17 +255,18 @@ bool str2net(subnet_t *subnet, const char *subnetstr) {
 		for (int i = 0; i < 4; i++)
 			if (x[i] > 255)
 				return false;
-		sprintf(last_colon, ":%02hx%02hx:%02hx%02hx", x[0], x[1], x[2], x[3]);
+		sprintf(last_colon, ":%02x%02x:%02x%02x", x[0], x[1], x[2], x[3]);
 	}
 
 	char* double_colon = strstr(str, "::");
 	if (double_colon) {
 		/* Figure out how many zero groups we need to expand */
 		int zero_group_count = 8;
-		for (const char* cur = str; *cur; *cur && cur++)
+		for (const char* cur = str; *cur; cur++)
 			if (*cur != ':') {
 				zero_group_count--;
-				for (; *cur && *cur != ':'; cur++);
+				while(cur[1] && cur[1] != ':')
+					cur++;
 			}
 		if (zero_group_count < 1)
 			return false;
@@ -313,20 +314,19 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 	int prefixlength = -1;
 	switch (subnet->type) {
 		case SUBNET_MAC:
-			result = snprintf(netstr, len, "%02hx:%02hx:%02hx:%02hx:%02hx:%02hx",
+			result = 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],
-					 subnet->weight);
+					 subnet->net.mac.address.x[5]);
 			netstr += result;
 			len -= result;
 			break;
 
 		case SUBNET_IPV4:
-			result = snprintf(netstr, len, "%hu.%hu.%hu.%hu",
+			result = snprintf(netstr, len, "%u.%u.%u.%u",
 					 subnet->net.ipv4.address.x[0],
 					 subnet->net.ipv4.address.x[1],
 					 subnet->net.ipv4.address.x[2],