Skip to contentSkip to conversation

net/tst_net_vars: Fix IPv4 network computing on big endianness

PATCH New Petr Vorel 1 participant 2 messages Jun 14, 2019 – Jun 17, 2019

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 net/tst_net_vars: Fix IPv4 network computing on big endianness

by converting IP to network byte order and adjust printing.

---
 testcases/lib/tst_net_vars.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
testcases/lib/tst_net_vars.c +6 -10
index 43cd92bcf..b1ea99df6 100644
@@ -476,23 +476,19 @@ static char *get_ipv4_network(int ip, unsigned int prefix)
 	unsigned char byte;
 	unsigned int i;
 
+	ip = htonl(ip);
+
 	if (prefix > MAX_IPV4_PREFIX)
 		return NULL;
 
 	if (prefix == MAX_IPV4_PREFIX)
 		return strdup("\0");
 
-	prefix &= 0x18;
+	prefix &= MAX_IPV4_PREFIX - 8;
 
-	for (i = 0; i < MAX_IPV4_PREFIX && (prefix == 0 || i < prefix);
-	     i += 8) {
-		if (i == 0) {
-			byte = ip & 0xff;
-			sprintf(p_buf, "%d", byte);
-		} else {
-			byte = (ip >> i) & 0xff;
-			sprintf(p_buf, ".%d", byte);
-		}
+	for (i = prefix; i > 0; i -= 8) {
+		byte = (ip >> i) & 0xff;
+		sprintf(p_buf, i < prefix ? ".%d" : "%d", byte);
 		p_buf += strlen(p_buf);
 	}
 
Signature · 1 line
2.21.0
author
#1 lore raw

PATCH 1/1 net/tst_net_vars: Fix IPv4 network computing on big endianness

Hi,

Quoted 6 lines

by converting IP to network byte order and adjust printing.

---
 testcases/lib/tst_net_vars.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

Merged.

Kind regards,
Petr