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>
This commit is contained in:
@@ -332,6 +332,11 @@ static int common_ping_main(sa_family_t af, char **argv)
|
||||
|
||||
create_icmp_socket(lsa);
|
||||
G.myid = (uint16_t) getpid();
|
||||
/* we can use native-endian ident, but other Unix ping/traceroute
|
||||
* utils use *big-endian pid*, and e.g. traceroute on our machine may be
|
||||
* *not* from busybox, idents may collide. Follow the convention:
|
||||
*/
|
||||
G.myid = htons(G.myid);
|
||||
#if ENABLE_PING6
|
||||
if (lsa->u.sa.sa_family == AF_INET6)
|
||||
ping6(lsa);
|
||||
@@ -927,6 +932,11 @@ static int common_ping_main(int opt, char **argv)
|
||||
G.interval_us = interval * 1000000;
|
||||
|
||||
myid = (uint16_t) getpid();
|
||||
/* we can use native-endian ident, but other Unix ping/traceroute
|
||||
* utils use *big-endian pid*, and e.g. traceroute on our machine may be
|
||||
* *not* from busybox, idents may collide. Follow the convention:
|
||||
*/
|
||||
myid = htons(myid);
|
||||
hostname = argv[optind];
|
||||
#if ENABLE_PING6
|
||||
{
|
||||
|
Reference in New Issue
Block a user