diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-13 15:53:06 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-13 15:53:06 +0100 |
commit | 623e55a396597be7d6f3be332f28c2f0e3b09a1d (patch) | |
tree | 85462a39fa7ca5edd8b5d8cf0eba8f104ece3c25 /networking/ping.c | |
parent | d067acb0052c20edbfe7f13c99b8947ce8911eb7 (diff) | |
download | busybox-w32-623e55a396597be7d6f3be332f28c2f0e3b09a1d.tar.gz busybox-w32-623e55a396597be7d6f3be332f28c2f0e3b09a1d.tar.bz2 busybox-w32-623e55a396597be7d6f3be332f28c2f0e3b09a1d.zip |
traceroute: even with -v, don't show other ping processes reply's
function old new delta
traceroute_init 1135 1151 +16
common_ping_main 1919 1935 +16
common_traceroute_main 1715 1668 -47
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/1 up/down: 32/-47) Total: -15 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/ping.c')
-rw-r--r-- | networking/ping.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/networking/ping.c b/networking/ping.c index 5f7e5b9b5..318d561bb 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -332,6 +332,11 @@ static int common_ping_main(sa_family_t af, char **argv) | |||
332 | 332 | ||
333 | create_icmp_socket(lsa); | 333 | create_icmp_socket(lsa); |
334 | G.myid = (uint16_t) getpid(); | 334 | G.myid = (uint16_t) getpid(); |
335 | /* we can use native-endian ident, but other Unix ping/traceroute | ||
336 | * utils use *big-endian pid*, and e.g. traceroute on our machine may be | ||
337 | * *not* from busybox, idents may collide. Follow the convention: | ||
338 | */ | ||
339 | G.myid = htons(G.myid); | ||
335 | #if ENABLE_PING6 | 340 | #if ENABLE_PING6 |
336 | if (lsa->u.sa.sa_family == AF_INET6) | 341 | if (lsa->u.sa.sa_family == AF_INET6) |
337 | ping6(lsa); | 342 | ping6(lsa); |
@@ -927,6 +932,11 @@ static int common_ping_main(int opt, char **argv) | |||
927 | G.interval_us = interval * 1000000; | 932 | G.interval_us = interval * 1000000; |
928 | 933 | ||
929 | myid = (uint16_t) getpid(); | 934 | myid = (uint16_t) getpid(); |
935 | /* we can use native-endian ident, but other Unix ping/traceroute | ||
936 | * utils use *big-endian pid*, and e.g. traceroute on our machine may be | ||
937 | * *not* from busybox, idents may collide. Follow the convention: | ||
938 | */ | ||
939 | myid = htons(myid); | ||
930 | hostname = argv[optind]; | 940 | hostname = argv[optind]; |
931 | #if ENABLE_PING6 | 941 | #if ENABLE_PING6 |
932 | { | 942 | { |