diff options
author | Ron Yorston <rmy@pobox.com> | 2017-05-29 14:20:10 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-05-29 14:34:28 +0100 |
commit | da4f331955bed8afda670afcd58d524a04a0faa9 (patch) | |
tree | f6a3879aefdd714240f8c022375f687b512d2238 /networking/ping.c | |
parent | 74163a535fd21f5fcca4c052d2e7c192d3e264fa (diff) | |
parent | 6683d1cbb44859f549f87f882545b84b9369585c (diff) | |
download | busybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.tar.gz busybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.tar.bz2 busybox-w32-da4f331955bed8afda670afcd58d524a04a0faa9.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'networking/ping.c')
-rw-r--r-- | networking/ping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ping.c b/networking/ping.c index ef31e000b..94fb007f5 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -478,7 +478,7 @@ static void sendping_tail(void (*sp)(int), int size_pkt) | |||
478 | } else { /* -c NN, and all NN are sent (and no deadline) */ | 478 | } else { /* -c NN, and all NN are sent (and no deadline) */ |
479 | /* Wait for the last ping to come back. | 479 | /* Wait for the last ping to come back. |
480 | * -W timeout: wait for a response in seconds. | 480 | * -W timeout: wait for a response in seconds. |
481 | * Affects only timeout in absense of any responses, | 481 | * Affects only timeout in absence of any responses, |
482 | * otherwise ping waits for two RTTs. */ | 482 | * otherwise ping waits for two RTTs. */ |
483 | unsigned expire = timeout; | 483 | unsigned expire = timeout; |
484 | 484 | ||
@@ -712,7 +712,7 @@ static void ping4(len_and_sockaddr *lsa) | |||
712 | 712 | ||
713 | if (opt_ttl != 0) { | 713 | if (opt_ttl != 0) { |
714 | setsockopt_int(pingsock, IPPROTO_IP, IP_TTL, opt_ttl); | 714 | setsockopt_int(pingsock, IPPROTO_IP, IP_TTL, opt_ttl); |
715 | /* above doesnt affect packets sent to bcast IP, so... */ | 715 | /* above doesn't affect packets sent to bcast IP, so... */ |
716 | setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); | 716 | setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); |
717 | } | 717 | } |
718 | 718 | ||