traceroute6: new applet by Leonid Lisovskiy. +1562 bytes

Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 25 insertions, 3 deletions

diff --git a/include/applets.h b/include/applets.h
index a2d1e95a5..d1a84eeaf 100644
--- a/include/applets.h
+++ b/include/applets.h
@@ -395,6 +395,7 @@ IF_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_DROP, touch))
 IF_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
+IF_TRACEROUTE6(APPLET(traceroute6, _BB_DIR_USR_BIN, _BB_SUID_MAYBE))
 IF_TRUE(APPLET_NOFORK(true, true, _BB_DIR_BIN, _BB_SUID_DROP, true))
 IF_TTY(APPLET(tty, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_TTYSIZE(APPLET(ttysize, _BB_DIR_USR_BIN, _BB_SUID_DROP))
diff --git a/include/usage.h b/include/usage.h
index 3ccf160bd..920f8e8c9 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -4648,17 +4648,18 @@
        "hello world\n"
 
 #define traceroute_trivial_usage \
-       "[-FIldnrv] [-f 1st_ttl] [-m max_ttl] [-p port#] [-q nqueries]\n" \
+       "[-46FIldnrv] [-f 1st_ttl] [-m max_ttl] [-p port#] [-q nqueries]\n" \
        "        [-s src_addr] [-t tos] [-w wait] [-g gateway] [-i iface]\n" \
        "        [-z pausemsecs] HOST [data size]"
 #define traceroute_full_usage "\n\n" \
        "Trace the route to HOST\n" \
      "\nOptions:" \
+     "\n        -4, -6  Force IPv4 or IPv6 hostname resolution" \
      "\n        -F      Set the don't fragment bit" \
      "\n        -I      Use ICMP ECHO instead of UDP datagrams" \
      "\n        -l      Display the ttl value of the returned packet" \
      "\n        -d      Set SO_DEBUG options to socket" \
-     "\n        -n      Print hop addresses numerically rather than symbolically" \
+     "\n        -n      Print numeric addresses" \
      "\n        -r      Bypass the normal routing tables and send directly to a host" \
      "\n        -v      Verbose" \
      "\n        -m max_ttl      Max time-to-live (max number of hops)" \
@@ -4668,9 +4669,29 @@
      "\n        -s src_addr     IP address to use as the source address" \
      "\n        -t tos          Type-of-service in probe packets (default 0)" \
      "\n        -w wait         Time in seconds to wait for a response" \
-     "\n                        (default 3 sec)" \
+     "\n                        (default 3)" \
      "\n        -g              Loose source route gateway (8 max)" \
 
+#define traceroute6_trivial_usage \
+       "[-dnrv] [-m max_ttl] [-p port#] [-q nqueries]\n" \
+       "        [-s src_addr] [-t tos] [-w wait] [-i iface]\n" \
+       "        HOST [data size]"
+#define traceroute6_full_usage "\n\n" \
+       "Trace the route to HOST\n" \
+     "\nOptions:" \
+     "\n        -d      Set SO_DEBUG options to socket" \
+     "\n        -n      Print numeric addresses" \
+     "\n        -r      Bypass the normal routing tables and send directly to a host" \
+     "\n        -v      Verbose" \
+     "\n        -m max_ttl      Max time-to-live (max number of hops)" \
+     "\n        -p port#        Base UDP port number used in probes" \
+     "\n                        (default is 33434)" \
+     "\n        -q nqueries     Number of probes per 'ttl' (default 3)" \
+     "\n        -s src_addr     IP address to use as the source address" \
+     "\n        -t tos          Type-of-service in probe packets (default 0)" \
+     "\n        -w wait         Time in seconds to wait for a response" \
+     "\n                        (default 3)" \
+
 #define true_trivial_usage \
        ""
 #define true_full_usage "\n\n" \