From 3065fb3642c8e554432059629808a62560e2184f Mon Sep 17 00:00:00 2001 From: Ting-Wei Lan Date: Fri, 20 Jun 2014 18:26:59 +0800 Subject: extra: use inet_ntop instead of inet_ntoa The result of inet_ntoa() will be overwritten by the next call to inet_ntoa(), so using it twice in the same snprintf() call causes wrong result. Signed-off-by: Pablo Neira Ayuso --- src/extra/ipv4.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c index 0fe716b..a93d113 100644 --- a/src/extra/ipv4.c +++ b/src/extra/ipv4.c @@ -134,9 +134,13 @@ int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph) struct in_addr src = { iph->saddr }; struct in_addr dst = { iph->daddr }; + char src_str[INET_ADDRSTRLEN]; + char dst_str[INET_ADDRSTRLEN]; + ret = snprintf(buf, size, "SRC=%s DST=%s LEN=%u TOS=0x%X " "PREC=0x%X TTL=%u ID=%u PROTO=%u ", - inet_ntoa(src), inet_ntoa(dst), + inet_ntop(AF_INET, &src, src_str, INET_ADDRSTRLEN), + inet_ntop(AF_INET, &dst, dst_str, INET_ADDRSTRLEN), ntohs(iph->tot_len), IPTOS_TOS(iph->tos), IPTOS_PREC(iph->tos), iph->ttl, ntohs(iph->id), iph->protocol); -- cgit v1.2.3