emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ping6 and traceroute6 selectable independently from ping/traceroute

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-11-23 09:25:57 +01:00
parent 6bfab0c49f
commit 8342397801
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/ping.c
View File

@ -57,14 +57,14 @@
//config:config PING6 //config:config PING6
//config: bool "ping6" //config: bool "ping6"
//config: default y //config: default y
//config: depends on FEATURE_IPV6 && PING //config: depends on FEATURE_IPV6
//config: help //config: help
//config: This will give you a ping that can talk IPv6. //config: This will give you a ping that can talk IPv6.
//config: //config:
//config:config FEATURE_FANCY_PING //config:config FEATURE_FANCY_PING
//config: bool "Enable fancy ping output" //config: bool "Enable fancy ping output"
//config: default y //config: default y
//config: depends on PING //config: depends on PING || PING6
//config: help //config: help
//config: Make the output from the ping applet include statistics, and at the //config: Make the output from the ping applet include statistics, and at the
//config: same time provide full support for ICMP packets. //config: same time provide full support for ICMP packets.
@ -907,6 +907,7 @@ static int common_ping_main(int opt, char **argv)
#endif /* FEATURE_FANCY_PING */ #endif /* FEATURE_FANCY_PING */
#if ENABLE_PING
int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ping_main(int argc UNUSED_PARAM, char **argv) int ping_main(int argc UNUSED_PARAM, char **argv)
{ {
@ -916,6 +917,7 @@ int ping_main(int argc UNUSED_PARAM, char **argv)
return common_ping_main(0, argv); return common_ping_main(0, argv);
# endif # endif
} }
#endif
#if ENABLE_PING6 #if ENABLE_PING6
int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;

9
networking/traceroute.c
View File

@ -219,14 +219,14 @@
//config:config TRACEROUTE6 //config:config TRACEROUTE6
//config: bool "traceroute6" //config: bool "traceroute6"
//config: default y //config: default y
//config: depends on FEATURE_IPV6 && TRACEROUTE //config: depends on FEATURE_IPV6
//config: help //config: help
//config: Utility to trace the route of IPv6 packets. //config: Utility to trace the route of IPv6 packets.
//config: //config:
//config:config FEATURE_TRACEROUTE_VERBOSE //config:config FEATURE_TRACEROUTE_VERBOSE
//config: bool "Enable verbose output" //config: bool "Enable verbose output"
//config: default y //config: default y
//config: depends on TRACEROUTE //config: depends on TRACEROUTE || TRACEROUTE6
//config: help //config: help
//config: Add some verbosity to traceroute. This includes among other things //config: Add some verbosity to traceroute. This includes among other things
//config: hostnames and ICMP response types. //config: hostnames and ICMP response types.
@ -234,7 +234,7 @@
//config:config FEATURE_TRACEROUTE_USE_ICMP //config:config FEATURE_TRACEROUTE_USE_ICMP
//config: bool "Enable -I option (use ICMP instead of UDP)" //config: bool "Enable -I option (use ICMP instead of UDP)"
//config: default y //config: default y
//config: depends on TRACEROUTE //config: depends on TRACEROUTE || TRACEROUTE6
//config: help //config: help
//config: Add option -I to use ICMP ECHO instead of UDP datagrams. //config: Add option -I to use ICMP ECHO instead of UDP datagrams.
@ -243,6 +243,7 @@
//applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE)) //applet:IF_TRACEROUTE6(APPLET(traceroute6, BB_DIR_USR_BIN, BB_SUID_MAYBE))
//kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o //kbuild:lib-$(CONFIG_TRACEROUTE) += traceroute.o
//kbuild:lib-$(CONFIG_TRACEROUTE6) += traceroute.o
//usage:#define traceroute_trivial_usage //usage:#define traceroute_trivial_usage
//usage: "[-"IF_TRACEROUTE6("46")"FIlnrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n" //usage: "[-"IF_TRACEROUTE6("46")"FIlnrv] [-f 1ST_TTL] [-m MAXTTL] [-q PROBES] [-p PORT]\n"
@ -1204,11 +1205,13 @@ common_traceroute_main(int op, char **argv)
return 0; return 0;
} }
#if ENABLE_TRACEROUTE
int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int traceroute_main(int argc UNUSED_PARAM, char **argv) int traceroute_main(int argc UNUSED_PARAM, char **argv)
{ {
return common_traceroute_main(0, argv); return common_traceroute_main(0, argv);
} }
#endif
#if ENABLE_TRACEROUTE6 #if ENABLE_TRACEROUTE6
int traceroute6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int traceroute6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;