X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fsubnet_parse.c;h=1d54c1344746031bcef3e339b5354256de04c5f3;hp=5b0b4822eed56d862aeef1ff3de35b94878d714b;hb=45a30f71572fab8e73c456737b7506b2cf12be25;hpb=d8ed5cf36d0c6d5a863497674248c8e8b63b9d98

diff --git a/src/subnet_parse.c b/src/subnet_parse.c
index 5b0b4822..1d54c134 100644
--- a/src/subnet_parse.c
+++ b/src/subnet_parse.c
@@ -255,7 +255,7 @@ 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, "::");
@@ -314,7 +314,7 @@ 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],
@@ -326,7 +326,7 @@ bool net2str(char *netstr, int len, const subnet_t *subnet) {
 			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],