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-83423978014bce3ef4d09022d3eb1a4a32f7ba6d.tar.gz
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 @@
//config:config PING6
//config: bool "ping6"
//config: default y
-//config: depends on FEATURE_IPV6 && PING
+//config: depends on FEATURE_IPV6
//config: help
//config: This will give you a ping that can talk IPv6.
//config:
//config:config FEATURE_FANCY_PING
//config: bool "Enable fancy ping output"
//config: default y
-//config: depends on PING
+//config: depends on PING || PING6
//config: help
//config: Make the output from the ping applet include statistics, and at the
//config: same time provide full support for ICMP packets.
@@ -907,15 +907,17 @@ static int common_ping_main(int opt, char **argv)
#endif /* FEATURE_FANCY_PING */
+#if ENABLE_PING
int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ping_main(int argc UNUSED_PARAM, char **argv)
{
-#if !ENABLE_FEATURE_FANCY_PING
+# if !ENABLE_FEATURE_FANCY_PING
return common_ping_main(AF_UNSPEC, argv);
-#else
+# else
return common_ping_main(0, argv);
-#endif
+# endif
}
+#endif
#if ENABLE_PING6
int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;