summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2011-09-11 18:27:28 (GMT)
committer Denys Vlasenko <vda.linux@googlemail.com>2011-09-11 18:27:28 (GMT)
commit5126cf9a15f9e5c3986be0fc2743b63adcc6b1fb (patch)
tree4c1cffbbc5c0a142f6823d042f7efa0a14022eab
parent46aa5e0859646a1e8f96282b0ab2c362c7565a85 (diff)
downloadbusybox-5126cf9a15f9e5c3986be0fc2743b63adcc6b1fb.tar.gz
busybox-5126cf9a15f9e5c3986be0fc2743b63adcc6b1fb.tar.bz2
ping: display real IPv6 response address. Hopefully closes 3745.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--networking/ping.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/ping.c b/networking/ping.c
index a1fd9df..b8a438b 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -613,7 +613,7 @@ static void unpack4(char *buf, int sz, struct sockaddr_in *from)
}
}
#if ENABLE_PING6
-static void unpack6(char *packet, int sz, /*struct sockaddr_in6 *from,*/ int hoplimit)
+static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
{
struct icmp6_hdr *icmppkt;
char buf[INET6_ADDRSTRLEN];
@@ -633,7 +633,7 @@ static void unpack6(char *packet, int sz, /*struct sockaddr_in6 *from,*/ int hop
if (sz >= sizeof(struct icmp6_hdr) + sizeof(uint32_t))
tp = (uint32_t *) &icmppkt->icmp6_data8[4];
unpack_tail(sz, tp,
- inet_ntop(AF_INET6, &pingaddr.sin6.sin6_addr,
+ inet_ntop(AF_INET6, &from->sin6_addr,
buf, sizeof(buf)),
recv_seq, hoplimit);
} else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) {
@@ -783,7 +783,7 @@ static void ping6(len_and_sockaddr *lsa)
move_from_unaligned_int(hoplimit, CMSG_DATA(mp));
}
}
- unpack6(G.rcv_packet, c, /*&from,*/ hoplimit);
+ unpack6(G.rcv_packet, c, &from, hoplimit);
if (pingcount && nreceived >= pingcount)
break;
}