nettrace: use inet_pton() to parse ip address

Signed-off-by: Menglong Dong <imagedong@tencent.com>

Author: menglongdong

component/net_utils.c

@@ -148,39 +148,3 @@ int proto2i(char *proto, int *dest)
 		return 4;
 	return 0;
 }
-
-void i2ipv6(char *dest, __u8 ip[])
-{
-	int i = 0, offset = 0;
-
-	for (;  i < 16; i += 2) {
-		if (ip[i] || ip[i + 1])
-			offset += sprintf(dest + offset, "%02x%02x:",
-					  ip[i], ip[i + 1]);
-		else
-			offset += sprintf(dest + offset, ":");
-	}
-	*(dest + offset - 1) = '\0';
-}
-
-int ipv6toi(char *ip, __u8 *dest)
-{
-	u16 *c = (u16 *)dest;
-	u32 t[8] = {}, i = 0;
-
-	if (sscanf(ip, "%x:%x:%x:%x:%x:%x:%x:%x", t, t + 1, t + 2,
-		   t + 3, t + 4, t + 5, t + 6, t + 7) == 8)
-		goto is_valid;
-
-	memset(t, 0, sizeof(t));
-	if (sscanf(ip, "%x::%x:%x:%x:%x", t, t + 4, t + 5, t + 6,
-		   t + 7) == 5)
-		goto is_valid;
-
-	return -1;
-
-is_valid:
-	for (i = 0; i < 8; i++)
-		c[i] = htons(t[i]);
-	return 0;
-}

component/net_utils.h

@@ -27,36 +27,11 @@ typedef __u64 u64;
 
 extern char *l4_proto_names[];
 
-static inline void i2ip(char *dest, __u32 ip)
-{
-	u8 *t = (u8 *)&ip;
-	sprintf(dest, "%d.%d.%d.%d", t[0], t[1], t[2], t[3]);
-}
-
-static inline int ip2i(char *ip, __u32 *dest)
-{
-	u8 *c = (u8 *)dest;
-	u32 t[4] = {};
-
-	if (sscanf(ip, "%u.%u.%u.%u", t, t + 1, t + 2, t + 3) != 4)
-		return -EINVAL;
-
-#define C(index) c[index] = t[index] 
-	C(0);
-	C(1);
-	C(2);
-	C(3);
-#undef C
-	return 0;
-}
-
 static inline char *i2l4(u8 num)
 {
 	return l4_proto_names[num];
 }
 
 int proto2i(char *proto, int *dest);
-void i2ipv6(char *dest, u8 ip[]);
-int ipv6toi(char *ip, u8 *dest);
 
 #endif

shared/pkt_utils.c

@@ -6,6 +6,7 @@
 #include <linux/icmpv6.h>
 #define _LINUX_IN_H
 #include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include "pkt_utils.h"
 
@@ -56,12 +57,16 @@ int ts_print_packet(char *buf, packet_t *pkt, char *minfo,
 
 	switch (pkt->proto_l3) {
 	case ETH_P_IP:
-		i2ip(saddr, pkt->l3.ipv4.saddr);
-		i2ip(daddr, pkt->l3.ipv4.daddr);
+		inet_ntop(AF_INET, (void *)&pkt->l3.ipv4.saddr, saddr,
+			  sizeof(saddr));
+		inet_ntop(AF_INET, (void *)&pkt->l3.ipv4.daddr, daddr,
+			  sizeof(daddr));
 		goto print_ip;
 	case ETH_P_IPV6:
-		i2ipv6(saddr, pkt->l3.ipv6.saddr);
-		i2ipv6(daddr, pkt->l3.ipv6.daddr);
+		inet_ntop(AF_INET6, (void *)pkt->l3.ipv6.saddr, saddr,
+			  sizeof(saddr));
+		inet_ntop(AF_INET6, (void *)pkt->l3.ipv6.daddr, daddr,
+			  sizeof(daddr));
 		goto print_ip;
 	case ETH_P_ARP:
 		goto print_arp;