aboutsummaryrefslogtreecommitdiff
path: root/networking/ping.c
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2016-11-23 09:25:57 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2016-11-23 09:25:57 +0100
commit83423978014bce3ef4d09022d3eb1a4a32f7ba6d (patch)
tree6cdf457419e4b99e9bb90103dc85b9f7b9831bd1 /networking/ping.c
parent6bfab0c49f45769920a380e2c7a5f42adeef0a12 (diff)
downloadbusybox-w32-83423978014bce3ef4d09022d3eb1a4a32f7ba6d.tar.gz
busybox-w32-83423978014bce3ef4d09022d3eb1a4a32f7ba6d.tar.bz2
busybox-w32-83423978014bce3ef4d09022d3eb1a4a32f7ba6d.zip
Make ping6 and traceroute6 selectable independently from ping/traceroute
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/ping.c')
-rw-r--r--networking/ping.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/networking/ping.c b/networking/ping.c
index 82d5b7a85..d0ef7ba62 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -57,14 +57,14 @@
57//config:config PING6 57//config:config PING6
58//config: bool "ping6" 58//config: bool "ping6"
59//config: default y 59//config: default y
60//config: depends on FEATURE_IPV6 && PING 60//config: depends on FEATURE_IPV6
61//config: help 61//config: help
62//config: This will give you a ping that can talk IPv6. 62//config: This will give you a ping that can talk IPv6.
63//config: 63//config:
64//config:config FEATURE_FANCY_PING 64//config:config FEATURE_FANCY_PING
65//config: bool "Enable fancy ping output" 65//config: bool "Enable fancy ping output"
66//config: default y 66//config: default y
67//config: depends on PING 67//config: depends on PING || PING6
68//config: help 68//config: help
69//config: Make the output from the ping applet include statistics, and at the 69//config: Make the output from the ping applet include statistics, and at the
70//config: same time provide full support for ICMP packets. 70//config: same time provide full support for ICMP packets.
@@ -907,15 +907,17 @@ static int common_ping_main(int opt, char **argv)
907#endif /* FEATURE_FANCY_PING */ 907#endif /* FEATURE_FANCY_PING */
908 908
909 909
910#if ENABLE_PING
910int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 911int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
911int ping_main(int argc UNUSED_PARAM, char **argv) 912int ping_main(int argc UNUSED_PARAM, char **argv)
912{ 913{
913#if !ENABLE_FEATURE_FANCY_PING 914# if !ENABLE_FEATURE_FANCY_PING
914 return common_ping_main(AF_UNSPEC, argv); 915 return common_ping_main(AF_UNSPEC, argv);
915#else 916# else
916 return common_ping_main(0, argv); 917 return common_ping_main(0, argv);
917#endif 918# endif
918} 919}
920#endif
919 921
920#if ENABLE_PING6 922#if ENABLE_PING6
921int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 923int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;