fix assorted unused code and wrong format specs found by cppchekc (bug 6716)
[platform/upstream/busybox.git] / networking / traceroute.c
index 15d55e7..97a7a19 100644 (file)
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Copyright (c) 1988, 1989, 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000
  *      The Regents of the University of California.  All rights reserved.
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-//#define version "1.4a12"
-
+/*
+ *     traceroute6
+ *
+ *      Modified for NRL 4.4BSD IPv6 release.
+ *      07/31/96 bgp
+ *
+ *     Modified for Linux IPv6 by Pedro Roque <roque@di.fc.ul.pt>
+ *     31/07/1996
+ *
+ *     As ICMP error messages for IPv6 now include more than 8 bytes
+ *     UDP datagrams are now sent via an UDP socket instead of magic
+ *     RAW socket tricks.
+ *
+ *     Converted to busybox applet by Leonid Lisovskiy <lly@sf.net>
+ *     2009-11-16
+ */
 
 /*
  * traceroute host  - trace the route ip packets follow going to "host".
  *     Tue Dec 20 03:50:13 PST 1988
  */
 
-#undef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+//usage:#define traceroute_trivial_usage
+//usage:       "[-"IF_TRACEROUTE6("46")"FIldnrv] [-f 1ST_TTL] [-m MAXTTL] [-p PORT] [-q PROBES]\n"
+//usage:       "       [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-g GATEWAY] [-i IFACE]\n"
+//usage:       "       [-z PAUSE_MSEC] HOST [BYTES]"
+//usage:#define traceroute_full_usage "\n\n"
+//usage:       "Trace the route to HOST\n"
+//usage:       IF_TRACEROUTE6(
+//usage:     "\n       -4,-6   Force IP or IPv6 name resolution"
+//usage:       )
+//usage:     "\n       -F      Set the don't fragment bit"
+//usage:     "\n       -I      Use ICMP ECHO instead of UDP datagrams"
+//usage:     "\n       -l      Display the TTL value of the returned packet"
+//usage:     "\n       -d      Set SO_DEBUG options to socket"
+//usage:     "\n       -n      Print numeric addresses"
+//usage:     "\n       -r      Bypass routing tables, send directly to HOST"
+//usage:     "\n       -v      Verbose"
+//usage:     "\n       -m      Max time-to-live (max number of hops)"
+//usage:     "\n       -p      Base UDP port number used in probes"
+//usage:     "\n               (default 33434)"
+//usage:     "\n       -q      Number of probes per TTL (default 3)"
+//usage:     "\n       -s      IP address to use as the source address"
+//usage:     "\n       -t      Type-of-service in probe packets (default 0)"
+//usage:     "\n       -w      Time in seconds to wait for a response (default 3)"
+//usage:     "\n       -g      Loose source route gateway (8 max)"
+//usage:
+//usage:#define traceroute6_trivial_usage
+//usage:       "[-dnrv] [-m MAXTTL] [-p PORT] [-q PROBES]\n"
+//usage:       "       [-s SRC_IP] [-t TOS] [-w WAIT_SEC] [-i IFACE]\n"
+//usage:       "       HOST [BYTES]"
+//usage:#define traceroute6_full_usage "\n\n"
+//usage:       "Trace the route to HOST\n"
+//usage:     "\n       -d      Set SO_DEBUG options to socket"
+//usage:     "\n       -n      Print numeric addresses"
+//usage:     "\n       -r      Bypass routing tables, send directly to HOST"
+//usage:     "\n       -v      Verbose"
+//usage:     "\n       -m      Max time-to-live (max number of hops)"
+//usage:     "\n       -p      Base UDP port number used in probes"
+//usage:     "\n               (default is 33434)"
+//usage:     "\n       -q      Number of probes per TTL (default 3)"
+//usage:     "\n       -s      IP address to use as the source address"
+//usage:     "\n       -t      Type-of-service in probe packets (default 0)"
+//usage:     "\n       -w      Time in seconds to wait for a response (default 3)"
+
+#define TRACEROUTE_SO_DEBUG 0
+
+/* TODO: undefs were uncommented - ??! we have config system for that! */
+/* probably ok to remove altogether */
+//#undef CONFIG_FEATURE_TRACEROUTE_VERBOSE
 //#define CONFIG_FEATURE_TRACEROUTE_VERBOSE
-#undef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG   /* not in documentation man */
-#undef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
+//#undef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
 //#define CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-#undef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
+//#undef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 //#define CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 
-#include <errno.h>
-#include <memory.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <malloc.h>
-#include <netdb.h>
-#include <endian.h>
-#include <getopt.h>
-
-#include <sys/param.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/time.h>                           /* concession to AIX */
-#include <sys/select.h>
-#include "inet_common.h"
 
 #include <net/if.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
+#include <netinet/in.h>
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
+#if ENABLE_FEATURE_IPV6
+# include <netinet/ip6.h>
+# include <netinet/icmp6.h>
+# ifndef SOL_IPV6
+#  define SOL_IPV6 IPPROTO_IPV6
+# endif
+#endif
 
-#include "busybox.h"
+#include "libbb.h"
+#include "inet_common.h"
 
+#ifndef IPPROTO_ICMP
+# define IPPROTO_ICMP 1
+#endif
+#ifndef IPPROTO_IP
+# define IPPROTO_IP 0
+#endif
 
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define IPVERSION       4
 
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-       u_char  ih_x1[9];               /* (unused) */
-       u_char  ih_pr;                  /* protocol */
-       short   ih_len;                 /* protocol length */
-       struct  in_addr ih_src;         /* source internet address */
-       struct  in_addr ih_dst;         /* destination internet address */
+#define OPT_STRING \
+       "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
+       IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
+       "4" IF_TRACEROUTE6("6")
+enum {
+       OPT_DONT_FRAGMNT = (1 << 0),    /* F */
+       OPT_USE_ICMP     = (1 << 1) * ENABLE_FEATURE_TRACEROUTE_USE_ICMP, /* I */
+       OPT_TTL_FLAG     = (1 << 2),    /* l */
+       OPT_ADDR_NUM     = (1 << 3),    /* n */
+       OPT_BYPASS_ROUTE = (1 << 4),    /* r */
+       OPT_DEBUG        = (1 << 5),    /* d */
+       OPT_VERBOSE      = (1 << 6) * ENABLE_FEATURE_TRACEROUTE_VERBOSE, /* v */
+       OPT_IP_CHKSUM    = (1 << 7),    /* x */
+       OPT_TOS          = (1 << 8),    /* t */
+       OPT_DEVICE       = (1 << 9),    /* i */
+       OPT_MAX_TTL      = (1 << 10),   /* m */
+       OPT_PORT         = (1 << 11),   /* p */
+       OPT_NPROBES      = (1 << 12),   /* q */
+       OPT_SOURCE       = (1 << 13),   /* s */
+       OPT_WAITTIME     = (1 << 14),   /* w */
+       OPT_PAUSE_MS     = (1 << 15),   /* z */
+       OPT_FIRST_TTL    = (1 << 16),   /* f */
+       OPT_SOURCE_ROUTE = (1 << 17) * ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE, /* g */
+       OPT_IPV4         = (1 << (17+ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE)),   /* 4 */
+       OPT_IPV6         = (1 << (18+ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE)) * ENABLE_TRACEROUTE6, /* 6 */
 };
+#define verbose (option_mask32 & OPT_VERBOSE)
 
-/*
- * UDP kernel structures and variables.
- */
-struct  udpiphdr {
-       struct  ipovly ui_i;            /* overlaid ip structure */
-       struct  udphdr ui_u;            /* udp header */
-};
-#define ui_next         ui_i.ih_next
-#define ui_prev         ui_i.ih_prev
-#define ui_x1           ui_i.ih_x1
-#define ui_pr           ui_i.ih_pr
-#define ui_len          ui_i.ih_len
-#define ui_src          ui_i.ih_src
-#define ui_dst          ui_i.ih_dst
-#define ui_sport        ui_u.uh_sport
-#define ui_dport        ui_u.uh_dport
-#define ui_ulen         ui_u.uh_ulen
-#define ui_sum          ui_u.uh_sum
-
-
-/* Host name and address list */
-struct hostinfo {
-       char *name;
-       int n;
-       u_int32_t *addrs;
+enum {
+       SIZEOF_ICMP_HDR = 8,
+       rcvsock = 3, /* receive (icmp) socket file descriptor */
+       sndsock = 4, /* send (udp/icmp) socket file descriptor */
 };
 
 /* Data section of the probe packet */
-struct outdata {
-       u_char seq;             /* sequence number of this packet */
-       u_char ttl;             /* ttl packet left with */
-       struct timeval tv __attribute__((packed)); /* time packet left */
+struct outdata_t {
+       unsigned char seq;             /* sequence number of this packet */
+       unsigned char ttl;             /* ttl packet left with */
+// UNUSED. Retaining to have the same packet size.
+       struct timeval tv_UNUSED PACKED; /* time packet left */
 };
 
-struct IFADDRLIST {
-       u_int32_t addr;
-       char device[sizeof(struct ifreq)];
+#if ENABLE_TRACEROUTE6
+struct outdata6_t {
+       uint32_t ident6;
+       uint32_t seq6;
+       struct timeval tv_UNUSED PACKED; /* time packet left */
 };
-
-
-static const char route[] = "/proc/net/route";
-
-/* last inbound (icmp) packet */
-static u_char  packet[512] __attribute__((align (32)));
-
-static struct ip *outip;               /* last output (udp) packet */
-static struct udphdr *outudp;          /* last output (udp) packet */
-static struct outdata *outdata;        /* last output (udp) packet */
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-static struct icmp *outicmp;           /* last output (icmp) packet */
 #endif
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-/* Maximum number of gateways (include room for one noop) */
-#define NGATEWAYS ((int)((MAX_IPOPTLEN - IPOPT_MINOFF - 1) / sizeof(u_int32_t)))
-/* loose source route gateway list (including room for final destination) */
-static u_int32_t gwlist[NGATEWAYS + 1];
-#endif
-
-static int s;                          /* receive (icmp) socket file descriptor */
-static int sndsock;                    /* send (udp/icmp) socket file descriptor */
-
-static struct sockaddr_storage whereto;        /* Who to try to reach */
-static struct sockaddr_storage wherefrom;      /* Who we are */
-static int packlen;                    /* total length of packet */
-static int minpacket;                  /* min ip packet size */
-static int maxpacket = 32 * 1024;      /* max ip packet size */
-static int pmtu;                       /* Path MTU Discovery (RFC1191) */
-
-static char *hostname;
-static const char devnull[] = "/dev/null";
-
-static u_short ident;
-static u_short port = 32768 + 666;     /* start udp dest port # for probe packets */
-
-static int waittime = 5;               /* time to wait for response (in seconds) */
-static int nflag;                      /* print addresses numerically */
-static int doipcksum = 1;              /* calculate ip checksums by default */
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-static int optlen;                     /* length of ip options */
+struct globals {
+       struct ip *outip;
+       struct outdata_t *outdata;
+       len_and_sockaddr *dest_lsa;
+       int packlen;                    /* total length of packet */
+       int pmtu;                       /* Path MTU Discovery (RFC1191) */
+       uint32_t ident;
+       uint16_t port; // 32768 + 666;  /* start udp dest port # for probe packets */
+       int waittime; // 5;             /* time to wait for response (in seconds) */
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       int optlen;                     /* length of ip options */
 #else
 #define optlen 0
 #endif
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-static int useicmp;                    /* use icmp echo instead of udp packets */
+       unsigned char recv_pkt[512];    /* last inbound (icmp) packet */
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       /* Maximum number of gateways (include room for one noop) */
+#define NGATEWAYS ((int)((MAX_IPOPTLEN - IPOPT_MINOFF - 1) / sizeof(uint32_t)))
+       /* loose source route gateway list (including room for final destination) */
+       uint32_t gwlist[NGATEWAYS + 1];
 #endif
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
-static int verbose;
-#endif
-
-/*
- * Return the interface list
- */
-static int
-ifaddrlist(struct IFADDRLIST **ipaddrp)
-{
-       int fd, nipaddr;
-#ifdef HAVE_SOCKADDR_SA_LEN
-       int n;
-#endif
-       struct ifreq *ifrp, *ifend, *ifnext;
-       struct sockaddr_in *addr_sin;
-       struct IFADDRLIST *al;
-       struct ifconf ifc;
-       struct ifreq ibuf[(32 * 1024) / sizeof(struct ifreq)], ifr;
-       struct IFADDRLIST *st_ifaddrlist;
-
-       fd = socket(AF_INET, SOCK_DGRAM, 0);
-       if (fd < 0)
-               bb_perror_msg_and_die("socket");
-
-       ifc.ifc_len = sizeof(ibuf);
-       ifc.ifc_buf = (caddr_t)ibuf;
-
-       if (ioctl(fd, SIOCGIFCONF, (char *)&ifc) < 0 ||
-           ifc.ifc_len < sizeof(struct ifreq)) {
-               if (errno == EINVAL)
-                       bb_error_msg_and_die(
-                           "SIOCGIFCONF: ifreq struct too small (%d bytes)",
-                           sizeof(ibuf));
-               else
-                       bb_perror_msg_and_die("SIOCGIFCONF");
-       }
-       ifrp = ibuf;
-       ifend = (struct ifreq *)((char *)ibuf + ifc.ifc_len);
-
-       nipaddr = 1 + (ifc.ifc_len / sizeof(struct ifreq));
-       st_ifaddrlist = xcalloc(nipaddr, sizeof(struct IFADDRLIST));
-       al = st_ifaddrlist;
-       nipaddr = 0;
-
-       for (; ifrp < ifend; ifrp = ifnext) {
-#ifdef HAVE_SOCKADDR_SA_LEN
-               n = ifrp->ifr_addr.sa_len + sizeof(ifrp->ifr_name);
-               if (n < sizeof(*ifrp))
-                       ifnext = ifrp + 1;
-               else
-                       ifnext = (struct ifreq *)((char *)ifrp + n);
-               if (ifrp->ifr_addr.sa_family != AF_INET)
-                       continue;
-#else
-               ifnext = ifrp + 1;
-#endif
-               /*
-                * Need a template to preserve address info that is
-                * used below to locate the next entry.  (Otherwise,
-                * SIOCGIFFLAGS stomps over it because the requests
-                * are returned in a union.)
-                */
-               strncpy(ifr.ifr_name, ifrp->ifr_name, sizeof(ifr.ifr_name));
-               if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifr) < 0) {
-                       if (errno == ENXIO)
-                               continue;
-                       bb_perror_msg_and_die("SIOCGIFFLAGS: %.*s",
-                           (int)sizeof(ifr.ifr_name), ifr.ifr_name);
-               }
-
-               /* Must be up */
-               if ((ifr.ifr_flags & IFF_UP) == 0)
-                       continue;
-
-               safe_strncpy(al->device, ifr.ifr_name, sizeof(ifr.ifr_name) + 1);
-#ifdef sun
-               /* Ignore sun virtual interfaces */
-               if (strchr(al->device, ':') != NULL)
-                       continue;
-#endif
-               if (ioctl(fd, SIOCGIFADDR, (char *)&ifr) < 0)
-                       bb_perror_msg_and_die("SIOCGIFADDR: %s", al->device);
-
-               addr_sin = (struct sockaddr_in *)&ifr.ifr_addr;
-               al->addr = addr_sin->sin_addr.s_addr;
-               ++al;
-               ++nipaddr;
-       }
-       if(nipaddr == 0)
-           bb_error_msg_and_die ("Can't find any network interfaces");
-       (void)close(fd);
-
-       *ipaddrp = st_ifaddrlist;
-       return nipaddr;
-}
-
+};
 
-static void
-setsin(struct sockaddr_in *addr_sin, u_int32_t addr)
-{
-       memset(addr_sin, 0, sizeof(*addr_sin));
-#ifdef HAVE_SOCKADDR_SA_LEN
-       addr_sin->sin_len = sizeof(*addr_sin);
+#define G (*ptr_to_globals)
+#define outip     (G.outip    )
+#define outdata   (G.outdata  )
+#define dest_lsa  (G.dest_lsa )
+#define packlen   (G.packlen  )
+#define pmtu      (G.pmtu     )
+#define ident     (G.ident    )
+#define port      (G.port     )
+#define waittime  (G.waittime )
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+# define optlen   (G.optlen   )
 #endif
-       addr_sin->sin_family = AF_INET;
-       addr_sin->sin_addr.s_addr = addr;
-}
-
-
-/*
- * Return the source address for the given destination address
- */
-static void
-findsaddr(const struct sockaddr_in *to, struct sockaddr_in *from)
-{
-       int i, n;
-       FILE *f;
-       u_int32_t mask;
-       u_int32_t dest, tmask;
-       struct IFADDRLIST *al;
-       char buf[256], tdevice[256], device[256];
-
-       f = bb_xfopen(route, "r");
-
-       /* Find the appropriate interface */
-       n = 0;
-       mask = 0;
-       device[0] = '\0';
-       while (fgets(buf, sizeof(buf), f) != NULL) {
-               ++n;
-               if (n == 1 && strncmp(buf, "Iface", 5) == 0)
-                       continue;
-               if ((i = sscanf(buf, "%255s %x %*s %*s %*s %*s %*s %x",
-                   tdevice, &dest, &tmask)) != 3)
-                       bb_error_msg_and_die ("junk in buffer");
-               if ((to->sin_addr.s_addr & tmask) == dest &&
-                   (tmask > mask || mask == 0)) {
-                       mask = tmask;
-                       strcpy(device, tdevice);
-               }
-       }
-       fclose(f);
-
-       if (device[0] == '\0')
-               bb_error_msg_and_die ("Can't find interface");
-
-       /* Get the interface address list */
-       n = ifaddrlist(&al);
-
-       /* Find our appropriate source address */
-       for (i = n; i > 0; --i, ++al)
-               if (strcmp(device, al->device) == 0)
-                       break;
-       if (i <= 0)
-               bb_error_msg_and_die("Can't find interface %s", device);
-
-       setsin(from, al->addr);
-}
+#define recv_pkt  (G.recv_pkt )
+#define gwlist    (G.gwlist   )
+#define INIT_G() do { \
+       SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+       port = 32768 + 666; \
+       waittime = 5; \
+} while (0)
 
-/*
-"Usage: %s [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]\n"
-"\t[-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]\n"
-"\t[-w waittime] [-z pausemsecs] host [packetlen]"
+#define outicmp ((struct icmp *)(outip + 1))
+#define outudp  ((struct udphdr *)(outip + 1))
 
-*/
 
-/* String to value with optional min and max. Handles decimal and hex. */
-static int
-str2val(const char *str, const char *what, int mi, int ma)
+/* libbb candidate? tftp uses this idiom too */
+static len_and_sockaddr* dup_sockaddr(const len_and_sockaddr *lsa)
 {
-       const char *cp;
-       int val;
-       char *ep;
-
-       if (str[0] == '0' && (str[1] == 'x' || str[1] == 'X')) {
-               cp = str + 2;
-               val = (int)strtol(cp, &ep, 16);
-       } else
-               val = (int)strtol(str, &ep, 10);
-       if (*ep != '\0') {
-               bb_error_msg_and_die("\"%s\" bad value for %s \n", str, what);
-       }
-       if (val < mi && mi >= 0) {
-               if (mi == 0)
-                       bb_error_msg_and_die("%s must be >= %d\n", what, mi);
-               else
-                       bb_error_msg_and_die("%s must be > %d\n", what, mi - 1);
-       }
-       if (val > ma && ma >= 0)
-               bb_error_msg_and_die("%s must be <= %d\n", what, ma);
-       return val;
+       len_and_sockaddr *new_lsa = xzalloc(LSA_LEN_SIZE + lsa->len);
+       memcpy(new_lsa, lsa, LSA_LEN_SIZE + lsa->len);
+       return new_lsa;
 }
 
 
-/*
- * Subtract 2 timeval structs:  out = out - in.
- * Out is assumed to be >= in.
- */
-static inline void
-tvsub(struct timeval *out, struct timeval *in)
-{
-
-       if ((out->tv_usec -= in->tv_usec) < 0)   {
-               --out->tv_sec;
-               out->tv_usec += 1000000;
-       }
-       out->tv_sec -= in->tv_sec;
-}
-
 static int
-wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp)
-{
-       fd_set fds;
-       struct timeval now, wait;
-       struct timezone tz;
-       int cc = 0;
-       socklen_t fromlen = sizeof(*fromp);
-
-       FD_ZERO(&fds);
-       FD_SET(sock, &fds);
-
-       wait.tv_sec = tp->tv_sec + waittime;
-       wait.tv_usec = tp->tv_usec;
-       (void)gettimeofday(&now, &tz);
-       tvsub(&wait, &now);
-
-       if (select(sock + 1, &fds, NULL, NULL, &wait) > 0)
-               cc = recvfrom(sock, (char *)packet, sizeof(packet), 0,
-                           (struct sockaddr *)fromp, &fromlen);
-
-       return cc;
-}
-
-/*
- * Checksum routine for Internet Protocol family headers (C Version)
- */
-static u_short
-in_cksum(u_short *addr, int len)
+wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
 {
-       int nleft = len;
-       u_short *w = addr;
-       u_short answer;
-       int sum = 0;
-
-       /*
-        *  Our algorithm is simple, using a 32 bit accumulator (sum),
-        *  we add sequential 16 bit words to it, and at the end, fold
-        *  back all the carry bits from the top 16 bits into the lower
-        *  16 bits.
-        */
-       while (nleft > 1)  {
-               sum += *w++;
-               nleft -= 2;
+       struct pollfd pfd[1];
+       int read_len = 0;
+
+       pfd[0].fd = rcvsock;
+       pfd[0].events = POLLIN;
+       if (*left_ms >= 0 && safe_poll(pfd, 1, *left_ms) > 0) {
+               unsigned t;
+
+               read_len = recv_from_to(rcvsock,
+                               recv_pkt, sizeof(recv_pkt),
+                               /*flags:*/ MSG_DONTWAIT,
+                               &from_lsa->u.sa, to, from_lsa->len);
+               t = monotonic_us();
+               *left_ms -= (t - *timestamp_us) / 1000;
+               *timestamp_us = t;
        }
 
-       /* mop up an odd byte, if necessary */
-       if (nleft == 1)
-               sum += *(u_char *)w;
-
-       /*
-        * add back carry outs from top 16 bits to low 16 bits
-        */
-       sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
-       sum += (sum >> 16);                     /* add carry */
-       answer = ~sum;                          /* truncate to 16 bits */
-       return answer;
+       return read_len;
 }
 
-
 static void
-send_probe(int seq, int ttl, struct timeval *tp)
+send_probe(int seq, int ttl)
 {
-       int cc;
-       struct udpiphdr *ui, *oui;
-       struct ip tip;
-
-       outip->ip_ttl = ttl;
-       outip->ip_id = htons(ident + seq);
-
-       /*
-        * In most cases, the kernel will recalculate the ip checksum.
-        * But we must do it anyway so that the udp checksum comes out
-        * right.
-        */
-       if (doipcksum) {
-               outip->ip_sum =
-                   in_cksum((u_short *)outip, sizeof(*outip) + optlen);
-               if (outip->ip_sum == 0)
-                       outip->ip_sum = 0xffff;
-       }
+       int len, res;
+       void *out;
 
        /* Payload */
-       outdata->seq = seq;
-       outdata->ttl = ttl;
-       memcpy(&outdata->tv, tp, sizeof(outdata->tv));
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp)
-               outicmp->icmp_seq = htons(seq);
-       else
-#endif
-               outudp->dest = htons(port + seq);
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp) {
-               /* Always calculate checksum for icmp packets */
-               outicmp->icmp_cksum = 0;
-               outicmp->icmp_cksum = in_cksum((u_short *)outicmp,
-                   packlen - (sizeof(*outip) + optlen));
-               if (outicmp->icmp_cksum == 0)
-                       outicmp->icmp_cksum = 0xffff;
+#if ENABLE_TRACEROUTE6
+       if (dest_lsa->u.sa.sa_family == AF_INET6) {
+               struct outdata6_t *pkt = (struct outdata6_t *) outip;
+               pkt->ident6 = htonl(ident);
+               pkt->seq6   = htonl(seq);
+               /*gettimeofday(&pkt->tv, &tz);*/
        } else
 #endif
-              if (doipcksum) {
-               /* Checksum (we must save and restore ip header) */
-               tip = *outip;
-               ui = (struct udpiphdr *)outip;
-               oui = (struct udpiphdr *)&tip;
-               /* Easier to zero and put back things that are ok */
-               memset((char *)ui, 0, sizeof(ui->ui_i));
-               ui->ui_src = oui->ui_src;
-               ui->ui_dst = oui->ui_dst;
-               ui->ui_pr = oui->ui_pr;
-               ui->ui_len = outudp->len;
-               outudp->check = 0;
-               outudp->check = in_cksum((u_short *)ui, packlen);
-               if (outudp->check == 0)
-                       outudp->check = 0xffff;
-               *outip = tip;
+       {
+               outdata->seq = seq;
+               outdata->ttl = ttl;
+// UNUSED: was storing gettimeofday's result there, but never ever checked it
+               /*memcpy(&outdata->tv, tp, sizeof(outdata->tv));*/
+
+               if (option_mask32 & OPT_USE_ICMP) {
+                       outicmp->icmp_seq = htons(seq);
+
+                       /* Always calculate checksum for icmp packets */
+                       outicmp->icmp_cksum = 0;
+                       outicmp->icmp_cksum = inet_cksum((uint16_t *)outicmp,
+                                               packlen - (sizeof(*outip) + optlen));
+                       if (outicmp->icmp_cksum == 0)
+                               outicmp->icmp_cksum = 0xffff;
+               }
        }
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+//BUG! verbose is (x & OPT_VERBOSE), not a counter!
+#if 0 //ENABLE_FEATURE_TRACEROUTE_VERBOSE
        /* XXX undocumented debugging hack */
        if (verbose > 1) {
-               const u_short *sp;
+               const uint16_t *sp;
                int nshorts, i;
 
-               sp = (u_short *)outip;
-               nshorts = (u_int)packlen / sizeof(u_short);
+               sp = (uint16_t *)outip;
+               nshorts = (unsigned)packlen / sizeof(uint16_t);
                i = 0;
                printf("[ %d bytes", packlen);
                while (--nshorts >= 0) {
@@ -690,718 +472,778 @@ send_probe(int seq, int ttl, struct timeval *tp)
                if (packlen & 1) {
                        if ((i % 8) == 0)
                                printf("\n\t");
-                       printf(" %02x", *(u_char *)sp);
+                       printf(" %02x", *(unsigned char *)sp);
                }
                printf("]\n");
        }
 #endif
 
-#if !defined(IP_HDRINCL) && defined(IP_TTL)
-       if (setsockopt(sndsock, IPPROTO_IP, IP_TTL,
-           (char *)&ttl, sizeof(ttl)) < 0) {
-               bb_perror_msg_and_die("setsockopt ttl %d", ttl);
-       }
+#if ENABLE_TRACEROUTE6
+       if (dest_lsa->u.sa.sa_family == AF_INET6) {
+               res = setsockopt(sndsock, SOL_IPV6, IPV6_UNICAST_HOPS, &ttl, sizeof(ttl));
+               if (res < 0)
+                       bb_perror_msg_and_die("setsockopt UNICAST_HOPS %d", ttl);
+               out = outip;
+               len = packlen;
+       } else
 #endif
-
-       cc = sendto(sndsock, (char *)outip,
-           packlen, 0, (struct sockaddr *)&whereto, sizeof(whereto));
-       if (cc < 0 || cc != packlen)  {
-               if (cc < 0)
-                       bb_perror_msg_and_die("sendto");
-               printf("%s: wrote %s %d chars, ret=%d\n",
-                   bb_applet_name, hostname, packlen, cc);
-               (void)fflush(stdout);
+       {
+#if defined IP_TTL
+               res = setsockopt(sndsock, IPPROTO_IP, IP_TTL, &ttl, sizeof(ttl));
+               if (res < 0)
+                       bb_perror_msg_and_die("setsockopt ttl %d", ttl);
+#endif
+               out = outicmp;
+               len = packlen - sizeof(*outip);
+               if (!(option_mask32 & OPT_USE_ICMP)) {
+                       out = outdata;
+                       len -= sizeof(*outudp);
+                       set_nport(&dest_lsa->u.sa, htons(port + seq));
+               }
        }
-}
 
-static inline double
-deltaT(struct timeval *t1p, struct timeval *t2p)
-{
-       double dt;
-
-       dt = (double)(t2p->tv_sec - t1p->tv_sec) * 1000.0 +
-            (double)(t2p->tv_usec - t1p->tv_usec) / 1000.0;
-       return dt;
+       res = xsendto(sndsock, out, len, &dest_lsa->u.sa, dest_lsa->len);
+       if (res != len)
+               bb_info_msg("sent %d octets, ret=%d", len, res);
 }
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
 /*
  * Convert an ICMP "type" field to a printable string.
  */
-static inline const char *
-pr_type(u_char t)
+static const char *
+pr_type(unsigned char t)
 {
-       static const char * const ttab[] = {
+       static const char *const ttab[] = {
        "Echo Reply",   "ICMP 1",       "ICMP 2",       "Dest Unreachable",
        "Source Quench", "Redirect",    "ICMP 6",       "ICMP 7",
        "Echo",         "Router Advert", "Router Solicit", "Time Exceeded",
        "Param Problem", "Timestamp",   "Timestamp Reply", "Info Request",
        "Info Reply",   "Mask Request", "Mask Reply"
        };
+# if ENABLE_TRACEROUTE6
+       static const char *const ttab6[] = {
+[0]    "Error", "Dest Unreachable", "Packet Too Big", "Time Exceeded",
+[4]    "Param Problem",
+[8]    "Echo Request", "Echo Reply", "Membership Query", "Membership Report",
+[12]   "Membership Reduction", "Router Solicit", "Router Advert", "Neighbor Solicit",
+[16]   "Neighbor Advert", "Redirect",
+       };
 
-       if (t > 18)
+       if (dest_lsa->u.sa.sa_family == AF_INET6) {
+               if (t < 5)
+                       return ttab6[t];
+               if (t < 128 || t > ND_REDIRECT)
+                       return "OUT-OF-RANGE";
+               return ttab6[(t & 63) + 8];
+       }
+# endif
+       if (t >= ARRAY_SIZE(ttab))
                return "OUT-OF-RANGE";
 
        return ttab[t];
 }
 #endif
 
+#if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+#define packet4_ok(read_len, from, seq) \
+       packet4_ok(read_len, seq)
+#endif
 static int
-packet_ok(u_char *buf, int cc, struct sockaddr_in *from, int seq)
+packet4_ok(int read_len, const struct sockaddr_in *from, int seq)
 {
-       struct icmp *icp;
-       u_char type, code;
+       const struct icmp *icp;
+       unsigned char type, code;
        int hlen;
-       struct ip *ip;
+       const struct ip *ip;
 
-       ip = (struct ip *) buf;
+       ip = (struct ip *) recv_pkt;
        hlen = ip->ip_hl << 2;
-       if (cc < hlen + ICMP_MINLEN) {
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+       if (read_len < hlen + ICMP_MINLEN) {
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
                if (verbose)
-                       printf("packet too short (%d bytes) from %s\n", cc,
+                       printf("packet too short (%d bytes) from %s\n", read_len,
                                inet_ntoa(from->sin_addr));
 #endif
                return 0;
        }
-       cc -= hlen;
-       icp = (struct icmp *)(buf + hlen);
+       read_len -= hlen;
+       icp = (struct icmp *)(recv_pkt + hlen);
        type = icp->icmp_type;
        code = icp->icmp_code;
        /* Path MTU Discovery (RFC1191) */
-       if (code != ICMP_UNREACH_NEEDFRAG)
-               pmtu = 0;
-       else {
+       pmtu = 0;
+       if (code == ICMP_UNREACH_NEEDFRAG)
                pmtu = ntohs(icp->icmp_nextmtu);
-       }
-       if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS) ||
-           type == ICMP_UNREACH || type == ICMP_ECHOREPLY) {
-               struct ip *hip;
-               struct udphdr *up;
+
+       if ((type == ICMP_TIMXCEED && code == ICMP_TIMXCEED_INTRANS)
+        || type == ICMP_UNREACH
+        || type == ICMP_ECHOREPLY
+       ) {
+               const struct ip *hip;
+               const struct udphdr *up;
 
                hip = &icp->icmp_ip;
                hlen = hip->ip_hl << 2;
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-               if (useicmp) {
+               if (option_mask32 & OPT_USE_ICMP) {
                        struct icmp *hicmp;
 
                        /* XXX */
-                       if (type == ICMP_ECHOREPLY &&
-                           icp->icmp_id == htons(ident) &&
-                           icp->icmp_seq == htons(seq))
-                               return -2;
-
-                       hicmp = (struct icmp *)((u_char *)hip + hlen);
-                       /* XXX 8 is a magic number */
-                       if (hlen + 8 <= cc &&
-                           hip->ip_p == IPPROTO_ICMP &&
-                           hicmp->icmp_id == htons(ident) &&
-                           hicmp->icmp_seq == htons(seq))
+                       if (type == ICMP_ECHOREPLY
+                        && icp->icmp_id == htons(ident)
+                        && icp->icmp_seq == htons(seq)
+                       ) {
+                               return ICMP_UNREACH_PORT+1;
+                       }
+
+                       hicmp = (struct icmp *)((unsigned char *)hip + hlen);
+                       if (hlen + SIZEOF_ICMP_HDR <= read_len
+                        && hip->ip_p == IPPROTO_ICMP
+                        && hicmp->icmp_id == htons(ident)
+                        && hicmp->icmp_seq == htons(seq)
+                       ) {
                                return (type == ICMP_TIMXCEED ? -1 : code + 1);
-               } else
-#endif
-                     {
-                       up = (struct udphdr *)((u_char *)hip + hlen);
-                       /* XXX 8 is a magic number */
-                       if (hlen + 12 <= cc &&
-                           hip->ip_p == IPPROTO_UDP &&
-                           up->source == htons(ident) &&
-                           up->dest == htons(port + seq))
+                       }
+               } else {
+                       up = (struct udphdr *)((char *)hip + hlen);
+                       if (hlen + 12 <= read_len
+                        && hip->ip_p == IPPROTO_UDP
+// Off: since we do not form the entire IP packet,
+// but defer it to kernel, we can't set source port,
+// and thus can't check it here in the reply
+                       /* && up->source == htons(ident) */
+                        && up->dest == htons(port + seq)
+                       ) {
                                return (type == ICMP_TIMXCEED ? -1 : code + 1);
+                       }
                }
        }
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
        if (verbose) {
                int i;
-               u_int32_t *lp = (u_int32_t *)&icp->icmp_ip;
+               uint32_t *lp = (uint32_t *)&icp->icmp_ip;
 
                printf("\n%d bytes from %s to "
                       "%s: icmp type %d (%s) code %d\n",
-                   cc, inet_ntoa(from->sin_addr),
-                   inet_ntoa(ip->ip_dst), type, pr_type(type), icp->icmp_code);
-               for (i = 4; i < cc ; i += sizeof(*lp))
+                       read_len, inet_ntoa(from->sin_addr),
+                       inet_ntoa(ip->ip_dst),
+                       type, pr_type(type), icp->icmp_code);
+               for (i = 4; i < read_len; i += sizeof(*lp))
                        printf("%2d: x%8.8x\n", i, *lp++);
        }
 #endif
        return 0;
 }
 
-
-/*
- * Construct an Internet address representation.
- * If the nflag has been supplied, give
- * numeric value, otherwise try for symbolic name.
- */
-static inline void
-inetname(struct sockaddr_in *from)
+#if ENABLE_TRACEROUTE6
+# if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+#define packet_ok(read_len, from_lsa, to, seq) \
+       packet_ok(read_len, from_lsa, seq)
+# endif
+static int
+packet_ok(int read_len, len_and_sockaddr *from_lsa,
+                       struct sockaddr *to,
+                       int seq)
 {
-       const char *n = NULL;
-       const char *ina;
-       char name[257];
+       const struct icmp6_hdr *icp;
+       unsigned char type, code;
 
-       if (!nflag && from->sin_addr.s_addr != INADDR_ANY) {
-               if(INET_rresolve(name, sizeof(name), from, 0x4000, 0xffffffff) >= 0)
-                       n = name;
-       }
-       ina = inet_ntoa(from->sin_addr);
-       if (nflag)
-               printf(" %s", ina);
-       else
-               printf(" %s (%s)", (n ? n : ina), ina);
-}
+       if (from_lsa->u.sa.sa_family == AF_INET)
+               return packet4_ok(read_len, &from_lsa->u.sin, seq);
 
-static inline void
-print(u_char *buf, int cc, struct sockaddr_in *from)
-{
-       struct ip *ip;
-       int hlen;
+       icp = (struct icmp6_hdr *) recv_pkt;
 
-       ip = (struct ip *) buf;
-       hlen = ip->ip_hl << 2;
-       cc -= hlen;
+       type = icp->icmp6_type;
+       code = icp->icmp6_code;
 
-       inetname(from);
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
-       if (verbose)
-               printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst));
-#endif
-}
+       if ((type == ICMP6_TIME_EXCEEDED && code == ICMP6_TIME_EXCEED_TRANSIT)
+        || type == ICMP6_DST_UNREACH
+       ) {
+               struct ip6_hdr *hip;
+               struct udphdr *up;
+               int nexthdr;
 
+               hip = (struct ip6_hdr *)(icp + 1);
+               up  = (struct udphdr *) (hip + 1);
+               nexthdr = hip->ip6_nxt;
 
-static struct hostinfo *
-gethostinfo(const char *host)
-{
-       int n;
-       struct hostent *hp;
-       struct hostinfo *hi;
-       char **p;
-       u_int32_t addr, *ap;
-
-       hi = xcalloc(1, sizeof(*hi));
-       addr = inet_addr(host);
-       if ((int32_t)addr != -1) {
-               hi->name = bb_xstrdup(host);
-               hi->n = 1;
-               hi->addrs = xcalloc(1, sizeof(hi->addrs[0]));
-               hi->addrs[0] = addr;
-               return hi;
+               if (nexthdr == IPPROTO_FRAGMENT) {
+                       nexthdr = *(unsigned char*)up;
+                       up++;
+               }
+               if (nexthdr == IPPROTO_UDP) {
+                       struct outdata6_t *pkt;
+
+                       pkt = (struct outdata6_t *) (up + 1);
+
+                       if (ntohl(pkt->ident6) == ident
+                        && ntohl(pkt->seq6) == seq
+                       ) {
+                               return (type == ICMP6_TIME_EXCEEDED ? -1 : (code<<8)+1);
+                       }
+               }
        }
 
-       hp = xgethostbyname(host);
-       if (hp->h_addrtype != AF_INET || hp->h_length != 4)
-               bb_perror_msg_and_die("bad host %s", host);
-       hi->name = bb_xstrdup(hp->h_name);
-       for (n = 0, p = hp->h_addr_list; *p != NULL; ++n, ++p)
-               continue;
-       hi->n = n;
-       hi->addrs = xcalloc(n, sizeof(hi->addrs[0]));
-       for (ap = hi->addrs, p = hp->h_addr_list; *p != NULL; ++ap, ++p)
-               memcpy(ap, *p, sizeof(*ap));
-       return hi;
+# if ENABLE_FEATURE_TRACEROUTE_VERBOSE
+       if (verbose) {
+               unsigned char *p;
+               char pa1[MAXHOSTNAMELEN];
+               char pa2[MAXHOSTNAMELEN];
+               int i;
+
+               p = (unsigned char *) (icp + 1);
+
+               printf("\n%d bytes from %s to "
+                      "%s: icmp type %d (%s) code %d\n",
+                       read_len,
+                       inet_ntop(AF_INET6, &from_lsa->u.sin6.sin6_addr, pa1, sizeof(pa1)),
+                       inet_ntop(AF_INET6, &((struct sockaddr_in6*)to)->sin6_addr, pa2, sizeof(pa2)),
+                       type, pr_type(type), icp->icmp6_code);
+
+               read_len -= sizeof(struct icmp6_hdr);
+               for (i = 0; i < read_len; i++) {
+                       if (i % 16 == 0)
+                               printf("%04x:", i);
+                       if (i % 4 == 0)
+                               bb_putchar(' ');
+                       printf("%02x", p[i]);
+                       if ((i % 16 == 15) && (i + 1 < read_len))
+                               bb_putchar('\n');
+               }
+               bb_putchar('\n');
+       }
+# endif
+
+       return 0;
+}
+#else /* !ENABLE_TRACEROUTE6 */
+static ALWAYS_INLINE int
+packet_ok(int read_len,
+               len_and_sockaddr *from_lsa IF_NOT_FEATURE_TRACEROUTE_VERBOSE(UNUSED_PARAM),
+               struct sockaddr *to UNUSED_PARAM,
+               int seq)
+{
+       return packet4_ok(read_len, &from_lsa->u.sin, seq);
 }
+#endif
 
+/*
+ * Construct an Internet address representation.
+ * If the -n flag has been supplied, give
+ * numeric value, otherwise try for symbolic name.
+ */
 static void
-freehostinfo(struct hostinfo *hi)
+print_inetname(const struct sockaddr *from)
 {
-       if (hi->name != NULL) {
-               free(hi->name);
-               hi->name = NULL;
+       char *ina = xmalloc_sockaddr2dotted_noport(from);
+
+       if (option_mask32 & OPT_ADDR_NUM) {
+               printf("  %s", ina);
+       } else {
+               char *n = NULL;
+
+               if (from->sa_family != AF_INET
+                || ((struct sockaddr_in*)from)->sin_addr.s_addr != INADDR_ANY
+               ) {
+                       /* Try to reverse resolve if it is not 0.0.0.0 */
+                       n = xmalloc_sockaddr2host_noport((struct sockaddr*)from);
+               }
+               printf("  %s (%s)", (n ? n : ina), ina);
+               free(n);
        }
-       free((char *)hi->addrs);
-       free((char *)hi);
+       free(ina);
 }
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
 static void
-getaddr(u_int32_t *ap, const char *host)
+print(int read_len, const struct sockaddr *from, const struct sockaddr *to)
 {
-       struct hostinfo *hi;
+       print_inetname(from);
 
-       hi = gethostinfo(host);
-       *ap = hi->addrs[0];
-       freehostinfo(hi);
-}
+       if (verbose) {
+               char *ina = xmalloc_sockaddr2dotted_noport(to);
+#if ENABLE_TRACEROUTE6
+               if (to->sa_family == AF_INET6) {
+                       read_len -= sizeof(struct ip6_hdr);
+               } else
 #endif
+               {
+                       struct ip *ip4packet = (struct ip*)recv_pkt;
+                       read_len -= ip4packet->ip_hl << 2;
+               }
+               printf(" %d bytes to %s", read_len, ina);
+               free(ina);
+       }
+}
 
+static void
+print_delta_ms(unsigned t1p, unsigned t2p)
+{
+       unsigned tt = t2p - t1p;
+       printf("  %u.%03u ms", tt / 1000, tt % 1000);
+}
 
-int
-traceroute_main(int argc, char *argv[])
+/*
+ * Usage: [-dFIlnrvx] [-g gateway] [-i iface] [-f first_ttl]
+ * [-m max_ttl] [ -p port] [-q nqueries] [-s src_addr] [-t tos]
+ * [-w waittime] [-z pausemsecs] host [packetlen]"
+ */
+static int
+common_traceroute_main(int op, char **argv)
 {
-       int code, n;
-       char *cp;
-       u_char *outp;
-       u_int32_t *ap;
-       struct sockaddr_in *from = (struct sockaddr_in *)&wherefrom;
-       struct sockaddr_in *to = (struct sockaddr_in *)&whereto;
-       struct hostinfo *hi;
-       int on = 1;
-       struct protoent *pe;
-       int ttl, probe, i;
-       int seq = 0;
+       int minpacket;
+#ifdef IP_TOS
        int tos = 0;
-       char *tos_str = NULL;
-       char *source = NULL;
-       unsigned long op;
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       int lsrr = 0;
 #endif
-       u_short off = 0;
-       struct IFADDRLIST *al;
-       int uid = getuid();
-       char *device = NULL;
        int max_ttl = 30;
-       char *max_ttl_str = NULL;
-       char *port_str = NULL;
        int nprobes = 3;
-       char *nprobes_str = NULL;
-       char *waittime_str = NULL;
-       u_int pausemsecs = 0;
-       char *pausemsecs_str = NULL;
        int first_ttl = 1;
-       char *first_ttl_str = NULL;
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       llist_t *sourse_route_list = NULL;
+       unsigned pausemsecs = 0;
+       char *source;
+       char *device;
+       char *tos_str;
+       char *max_ttl_str;
+       char *port_str;
+       char *nprobes_str;
+       char *waittime_str;
+       char *pausemsecs_str;
+       char *first_ttl_str;
+       char *dest_str;
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       llist_t *source_route_list = NULL;
+       int lsrr = 0;
 #endif
-
-       opterr = 0;
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       bb_opt_complementally = "x-x:g*";
+#if ENABLE_TRACEROUTE6
+       sa_family_t af;
 #else
-       bb_opt_complementally = "x-x";
+       enum { af = AF_INET };
 #endif
-
-       op = bb_getopt_ulflags(argc, argv, "FIlnrdvxt:i:m:p:q:s:w:z:f:"
-#define USAGE_OP_DONT_FRAGMNT (1<<0)    /* F  */
-#define USAGE_OP_USE_ICMP     (1<<1)    /* I  */
-#define USAGE_OP_TTL_FLAG     (1<<2)    /* l  */
-#define USAGE_OP_ADDR_NUM     (1<<3)    /* n  */
-#define USAGE_OP_BYPASS_ROUTE (1<<4)    /* r  */
-#define USAGE_OP_DEBUG        (1<<5)    /* d */
-#define USAGE_OP_VERBOSE      (1<<6)    /* v */
-#define USAGE_OP_IP_CHKSUM    (1<<7)    /* x */
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-                                       "g:"
-#endif
-       , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str,
-       &source, &waittime_str, &pausemsecs_str, &first_ttl_str
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       , &sourse_route_list
+       int ttl;
+       int seq;
+       len_and_sockaddr *from_lsa;
+       struct sockaddr *lastaddr;
+       struct sockaddr *to;
+
+       INIT_G();
+
+       /* minimum 1 arg */
+       opt_complementary = "-1:x-x" IF_FEATURE_TRACEROUTE_SOURCE_ROUTE(":g::");
+       op |= getopt32(argv, OPT_STRING
+               , &tos_str, &device, &max_ttl_str, &port_str, &nprobes_str
+               , &source, &waittime_str, &pausemsecs_str, &first_ttl_str
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+               , &source_route_list
 #endif
        );
+       argv += optind;
 
-       if(op & USAGE_OP_DONT_FRAGMNT)
-               off = IP_DF;
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       useicmp = op & USAGE_OP_USE_ICMP;
+#if 0 /* IGNORED */
+       if (op & OPT_IP_CHKSUM)
+               bb_error_msg("warning: ip checksums disabled");
 #endif
-       nflag = op & USAGE_OP_ADDR_NUM;
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
-       verbose = op &  USAGE_OP_VERBOSE;
+#ifdef IP_TOS
+       if (op & OPT_TOS)
+               tos = xatou_range(tos_str, 0, 255);
 #endif
-       if(op & USAGE_OP_IP_CHKSUM) {
-               doipcksum = 0;
-               bb_error_msg("Warning: ip checksums disabled");
-       }
-       if (tos_str)
-               tos = str2val(tos_str, "tos", 0, 255);
-       if(max_ttl_str)
-               max_ttl = str2val(max_ttl_str, "max ttl", 1, 255);
-       if(port_str)
-               port = (u_short)str2val(port_str, "port", 1, (1 << 16) - 1);
-       if(nprobes_str)
-               nprobes = str2val(optarg, "nprobes", 1, -1);
-       if(source) {
-           /*
-            * set the ip source address of the outbound
-            * probe (e.g., on a multi-homed host).
-            */
-            if (uid)
-               bb_error_msg_and_die("-s %s: Permission denied", source);
+       if (op & OPT_MAX_TTL)
+               max_ttl = xatou_range(max_ttl_str, 1, 255);
+       if (op & OPT_PORT)
+               port = xatou16(port_str);
+       if (op & OPT_NPROBES)
+               nprobes = xatou_range(nprobes_str, 1, INT_MAX);
+       if (op & OPT_SOURCE) {
+               /*
+                * set the ip source address of the outbound
+                * probe (e.g., on a multi-homed host).
+                */
+               if (getuid() != 0)
+                       bb_error_msg_and_die(bb_msg_you_must_be_root);
        }
-       if(waittime_str)
-               waittime = str2val(waittime_str, "wait time", 2, 24 * 60 * 60);
-       if(pausemsecs_str)
-               pausemsecs = str2val(pausemsecs_str, "pause msecs", 0, 60 * 60 * 1000);
-       if(first_ttl_str)
-               first_ttl = str2val(first_ttl_str, "first ttl", 1, 255);
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       if(sourse_route_list) {
-               llist_t *l_sr;
-
-               for(l_sr = sourse_route_list; l_sr; ) {
+       if (op & OPT_WAITTIME)
+               waittime = xatou_range(waittime_str, 1, 24 * 60 * 60);
+       if (op & OPT_PAUSE_MS)
+               pausemsecs = xatou_range(pausemsecs_str, 0, 60 * 60 * 1000);
+       if (op & OPT_FIRST_TTL)
+               first_ttl = xatou_range(first_ttl_str, 1, max_ttl);
+
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       if (source_route_list) {
+               while (source_route_list) {
+                       len_and_sockaddr *lsa;
+
                        if (lsrr >= NGATEWAYS)
-                               bb_error_msg_and_die("No more than %d gateways", NGATEWAYS);
-                       getaddr(gwlist + lsrr, l_sr->data);
+                               bb_error_msg_and_die("no more than %d gateways", NGATEWAYS);
+                       lsa = xhost_and_af2sockaddr(llist_pop(&source_route_list), 0, AF_INET);
+                       gwlist[lsrr] = lsa->u.sin.sin_addr.s_addr;
+                       free(lsa);
                        ++lsrr;
-                       l_sr = l_sr->link;
-                       free(sourse_route_list);
-                       sourse_route_list = l_sr;
                }
                optlen = (lsrr + 1) * sizeof(gwlist[0]);
        }
 #endif
 
-       if (first_ttl > max_ttl) {
-               bb_error_msg_and_die(
-                   "first ttl (%d) may not be greater than max ttl (%d)",
-                   first_ttl, max_ttl);
-       }
-
-       minpacket = sizeof(*outip) + sizeof(*outdata) + optlen;
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp)
-               minpacket += 8;                 /* XXX magic number */
-       else
-#endif
-               minpacket += sizeof(*outudp);
-       packlen = minpacket;                    /* minimum sized packet */
-
        /* Process destination and optional packet size */
-       switch (argc - optind) {
-
-       case 2:
-               packlen = str2val(argv[optind + 1],
-                   "packet length", minpacket, maxpacket);
-               /* Fall through */
-
-       case 1:
-               hostname = argv[optind];
-               hi = gethostinfo(hostname);
-               setsin(to, hi->addrs[0]);
-               if (hi->n > 1)
-                       bb_error_msg(
-                   "Warning: %s has multiple addresses; using %s",
-                               hostname, inet_ntoa(to->sin_addr));
-               hostname = hi->name;
-               hi->name = NULL;
-               freehostinfo(hi);
-               break;
-
-       default:
-               bb_show_usage();
+       minpacket = sizeof(*outip) + SIZEOF_ICMP_HDR + sizeof(*outdata) + optlen;
+       if (!(op & OPT_USE_ICMP))
+               minpacket += sizeof(*outudp) - SIZEOF_ICMP_HDR;
+#if ENABLE_TRACEROUTE6
+       af = AF_UNSPEC;
+       if (op & OPT_IPV4)
+               af = AF_INET;
+       if (op & OPT_IPV6)
+               af = AF_INET6;
+       dest_lsa = xhost_and_af2sockaddr(argv[0], port, af);
+       af = dest_lsa->u.sa.sa_family;
+       if (af == AF_INET6)
+               minpacket = sizeof(struct outdata6_t);
+#else
+       dest_lsa = xhost2sockaddr(argv[0], port);
+#endif
+       packlen = minpacket;
+       if (argv[1])
+               packlen = xatoul_range(argv[1], minpacket, 32 * 1024);
+
+       /* Ensure the socket fds won't be 0, 1 or 2 */
+       bb_sanitize_stdio();
+
+#if ENABLE_TRACEROUTE6
+       if (af == AF_INET6) {
+               xmove_fd(xsocket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6), rcvsock);
+# ifdef IPV6_RECVPKTINFO
+               setsockopt(rcvsock, SOL_IPV6, IPV6_RECVPKTINFO,
+                               &const_int_1, sizeof(const_int_1));
+               setsockopt(rcvsock, SOL_IPV6, IPV6_2292PKTINFO,
+                               &const_int_1, sizeof(const_int_1));
+# else
+               setsockopt(rcvsock, SOL_IPV6, IPV6_PKTINFO,
+                               &const_int_1, sizeof(const_int_1));
+# endif
+       } else
+#endif
+       {
+               xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
        }
 
-       cp = "icmp";
-       if ((pe = getprotobyname(cp)) == NULL)
-               bb_perror_msg_and_die("unknown protocol %s", cp);
-
-       /* Insure the socket fds won't be 0, 1 or 2 */
-       do n = bb_xopen(devnull, O_RDONLY); while (n < 2);
-       if (n > 2)
-               close(n);
-
-       if ((s = socket(AF_INET, SOCK_RAW, pe->p_proto)) < 0)
-               bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
+#if TRACEROUTE_SO_DEBUG
+       if (op & OPT_DEBUG)
+               setsockopt(rcvsock, SOL_SOCKET, SO_DEBUG,
+                               &const_int_1, sizeof(const_int_1));
+#endif
+       if (op & OPT_BYPASS_ROUTE)
+               setsockopt(rcvsock, SOL_SOCKET, SO_DONTROUTE,
+                               &const_int_1, sizeof(const_int_1));
+
+#if ENABLE_TRACEROUTE6
+       if (af == AF_INET6) {
+               static const int two = 2;
+               if (setsockopt(rcvsock, SOL_RAW, IPV6_CHECKSUM, &two, sizeof(two)) < 0)
+                       bb_perror_msg_and_die("setsockopt RAW_CHECKSUM");
+               xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
+       } else
+#endif
+       {
+               if (op & OPT_USE_ICMP)
+                       xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), sndsock);
+               else
+                       xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sndsock);
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE && defined IP_OPTIONS
+               if (lsrr > 0) {
+                       unsigned char optlist[MAX_IPOPTLEN];
+                       unsigned size;
+
+                       /* final hop */
+                       gwlist[lsrr] = dest_lsa->u.sin.sin_addr.s_addr;
+                       ++lsrr;
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
-       if (op & USAGE_OP_DEBUG)
-               (void)setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&on,
-                   sizeof(on));
+                       /* force 4 byte alignment */
+                       optlist[0] = IPOPT_NOP;
+                       /* loose source route option */
+                       optlist[1] = IPOPT_LSRR;
+                       size = lsrr * sizeof(gwlist[0]);
+                       optlist[2] = size + 3;
+                       /* pointer to LSRR addresses */
+                       optlist[3] = IPOPT_MINOFF;
+                       memcpy(optlist + 4, gwlist, size);
+
+                       if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
+                                       (char *)optlist, size + sizeof(gwlist[0])) < 0) {
+                               bb_perror_msg_and_die("IP_OPTIONS");
+                       }
+               }
 #endif
-       if (op & USAGE_OP_BYPASS_ROUTE)
-               (void)setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)&on,
-                   sizeof(on));
-
-       sndsock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-       if (sndsock < 0)
-               bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket);
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-#if defined(IP_OPTIONS)
-       if (lsrr > 0) {
-               u_char optlist[MAX_IPOPTLEN];
-
-               cp = "ip";
-               if ((pe = getprotobyname(cp)) == NULL)
-                       bb_perror_msg_and_die("unknown protocol");
-
-               /* final hop */
-               gwlist[lsrr] = to->sin_addr.s_addr;
-               ++lsrr;
-
-               /* force 4 byte alignment */
-               optlist[0] = IPOPT_NOP;
-               /* loose source route option */
-               optlist[1] = IPOPT_LSRR;
-               i = lsrr * sizeof(gwlist[0]);
-               optlist[2] = i + 3;
-               /* Pointer to LSRR addresses */
-               optlist[3] = IPOPT_MINOFF;
-               memcpy(optlist + 4, gwlist, i);
-
-               if ((setsockopt(sndsock, pe->p_proto, IP_OPTIONS,
-                   (char *)optlist, i + sizeof(gwlist[0]))) < 0) {
-                       bb_perror_msg_and_die("IP_OPTIONS");
-                   }
        }
-#endif /* IP_OPTIONS */
-#endif /* CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE */
 
 #ifdef SO_SNDBUF
-       if (setsockopt(sndsock, SOL_SOCKET, SO_SNDBUF, (char *)&packlen,
-           sizeof(packlen)) < 0) {
+       if (setsockopt(sndsock, SOL_SOCKET, SO_SNDBUF, &packlen, sizeof(packlen)) < 0) {
                bb_perror_msg_and_die("SO_SNDBUF");
        }
 #endif
-#ifdef IP_HDRINCL
-       if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, (char *)&on,
-           sizeof(on)) < 0 && errno != ENOPROTOOPT) {
-               bb_perror_msg_and_die("IP_HDRINCL");
-       }
-#else
 #ifdef IP_TOS
-       if (tos_str && setsockopt(sndsock, IPPROTO_IP, IP_TOS,
-           (char *)&tos, sizeof(tos)) < 0) {
+       if ((op & OPT_TOS) && setsockopt(sndsock, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) < 0) {
                bb_perror_msg_and_die("setsockopt tos %d", tos);
        }
 #endif
+#ifdef IP_DONTFRAG
+       if (op & OPT_DONT_FRAGMNT)
+               setsockopt(sndsock, IPPROTO_IP, IP_DONTFRAG,
+                               &const_int_1, sizeof(const_int_1));
 #endif
-#ifdef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
-       if (op & USAGE_OP_DEBUG)
-               (void)setsockopt(sndsock, SOL_SOCKET, SO_DEBUG, (char *)&on,
-                   sizeof(on));
+#if TRACEROUTE_SO_DEBUG
+       if (op & OPT_DEBUG)
+               setsockopt(sndsock, SOL_SOCKET, SO_DEBUG,
+                               &const_int_1, sizeof(const_int_1));
 #endif
-       if (op & USAGE_OP_BYPASS_ROUTE)
-               (void)setsockopt(sndsock, SOL_SOCKET, SO_DONTROUTE, (char *)&on,
-                   sizeof(on));
+       if (op & OPT_BYPASS_ROUTE)
+               setsockopt(sndsock, SOL_SOCKET, SO_DONTROUTE,
+                               &const_int_1, sizeof(const_int_1));
 
-       /* Revert to non-privileged user after opening sockets */
-       setgid(getgid());
-       setuid(uid);
-
-       outip = (struct ip *)xcalloc(1, (unsigned)packlen);
-
-       outip->ip_v = IPVERSION;
-       if (tos_str)
-               outip->ip_tos = tos;
-       outip->ip_len = htons(packlen);
-       outip->ip_off = htons(off);
-       outp = (u_char *)(outip + 1);
-       outip->ip_dst = to->sin_addr;
-
-       outip->ip_hl = (outp - (u_char *)outip) >> 2;
-       ident = (getpid() & 0xffff) | 0x8000;
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp) {
-               outip->ip_p = IPPROTO_ICMP;
-
-               outicmp = (struct icmp *)outp;
-               outicmp->icmp_type = ICMP_ECHO;
-               outicmp->icmp_id = htons(ident);
-
-               outdata = (struct outdata *)(outp + 8); /* XXX magic number */
-       } else
-#endif
-              {
-               outip->ip_p = IPPROTO_UDP;
-
-               outudp = (struct udphdr *)outp;
-               outudp->source = htons(ident);
-               outudp->len =
-                   htons((u_short)(packlen - (sizeof(*outip) + optlen)));
-               outdata = (struct outdata *)(outudp + 1);
-       }
+       outip = xzalloc(packlen);
 
-       /* Get the interface address list */
-       n = ifaddrlist(&al);
-
-       /* Look for a specific device */
-       if (device != NULL) {
-               for (i = n; i > 0; --i, ++al)
-                       if (strcmp(device, al->device) == 0)
-                               break;
-               if (i <= 0) {
-                       bb_error_msg_and_die("Can't find interface %s", device);
-               }
-       }
+       ident = getpid();
 
-       /* Determine our source address */
-       if (source == NULL) {
-               /*
-                * If a device was specified, use the interface address.
-                * Otherwise, try to determine our source address.
-                */
-               if (device != NULL)
-                       setsin(from, al->addr);
-               findsaddr(to, from);
-       } else {
-               hi = gethostinfo(source);
-               source = hi->name;
-               hi->name = NULL;
-               /*
-                * If the device was specified make sure it
-                * corresponds to the source address specified.
-                * Otherwise, use the first address (and warn if
-                * there are more than one).
-                */
-               if (device != NULL) {
-                       for (i = hi->n, ap = hi->addrs; i > 0; --i, ++ap)
-                               if (*ap == al->addr)
-                                       break;
-                       if (i <= 0) {
-                               bb_error_msg_and_die(
-                                   "%s is not on interface %s",
-                                   source, device);
-                       }
-                       setsin(from, *ap);
+       if (af == AF_INET) {
+               if (op & OPT_USE_ICMP) {
+                       ident |= 0x8000;
+                       outicmp->icmp_type = ICMP_ECHO;
+                       outicmp->icmp_id = htons(ident);
+                       outdata = (struct outdata_t *)((char *)outicmp + SIZEOF_ICMP_HDR);
                } else {
-                       setsin(from, hi->addrs[0]);
-                       if (hi->n > 1)
-                               bb_error_msg(
-                       "Warning: %s has multiple addresses; using %s",
-                                   source, inet_ntoa(from->sin_addr));
+                       outdata = (struct outdata_t *)(outudp + 1);
                }
-               freehostinfo(hi);
        }
 
-       outip->ip_src = from->sin_addr;
-#ifndef IP_HDRINCL
-       if (bind(sndsock, (struct sockaddr *)from, sizeof(*from)) < 0) {
-               bb_perror_msg_and_die("bind");
+       if (op & OPT_DEVICE) /* hmm, do we need error check? */
+               setsockopt_bindtodevice(sndsock, device);
+
+       if (op & OPT_SOURCE) {
+#if ENABLE_TRACEROUTE6
+// TODO: need xdotted_and_af2sockaddr?
+               len_and_sockaddr *source_lsa = xhost_and_af2sockaddr(source, 0, af);
+#else
+               len_and_sockaddr *source_lsa = xdotted2sockaddr(source, 0);
+#endif
+               /* Ping4 does this (why?) */
+               if (af == AF_INET)
+                       if (setsockopt(sndsock, IPPROTO_IP, IP_MULTICAST_IF,
+                                       &source_lsa->u.sa, source_lsa->len))
+                               bb_error_msg_and_die("can't set multicast source interface");
+//TODO: we can query source port we bound to,
+// and check it in replies... if we care enough
+               xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
+               free(source_lsa);
+       }
+#if ENABLE_TRACEROUTE6
+       else if (af == AF_INET6) {
+//TODO: why we don't do it for IPv4?
+               len_and_sockaddr *source_lsa;
+
+               int probe_fd = xsocket(af, SOCK_DGRAM, 0);
+               if (op & OPT_DEVICE)
+                       setsockopt_bindtodevice(probe_fd, device);
+               set_nport(&dest_lsa->u.sa, htons(1025));
+               /* dummy connect. makes kernel pick source IP (and port) */
+               xconnect(probe_fd, &dest_lsa->u.sa, dest_lsa->len);
+               set_nport(&dest_lsa->u.sa, htons(port));
+
+               /* read IP and port */
+               source_lsa = get_sock_lsa(probe_fd);
+               if (source_lsa == NULL)
+                       bb_error_msg_and_die("can't get probe addr");
+
+               close(probe_fd);
+
+               /* bind our sockets to this IP (but not port) */
+               set_nport(&source_lsa->u.sa, 0);
+               xbind(sndsock, &source_lsa->u.sa, source_lsa->len);
+               xbind(rcvsock, &source_lsa->u.sa, source_lsa->len);
+
+               free(source_lsa);
        }
 #endif
 
-       fprintf(stderr, "traceroute to %s (%s)", hostname, inet_ntoa(to->sin_addr));
-       if (source)
-               fprintf(stderr, " from %s", source);
-       fprintf(stderr, ", %d hops max, %d byte packets\n", max_ttl, packlen);
-       (void)fflush(stderr);
+       /* Revert to non-privileged user after opening sockets */
+       xsetgid(getgid());
+       xsetuid(getuid());
+
+       dest_str = xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa);
+       printf("traceroute to %s (%s)", argv[0], dest_str);
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               free(dest_str);
+       }
+
+       if (op & OPT_SOURCE)
+               printf(" from %s", source);
+       printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
 
+       from_lsa = dup_sockaddr(dest_lsa);
+       lastaddr = xzalloc(dest_lsa->len);
+       to = xzalloc(dest_lsa->len);
+       seq = 0;
        for (ttl = first_ttl; ttl <= max_ttl; ++ttl) {
-               u_int32_t lastaddr = 0;
-               int gotlastaddr = 0;
+               int probe;
+               int unreachable = 0; /* counter */
+               int gotlastaddr = 0; /* flags */
                int got_there = 0;
-               int unreachable = 0;
-               int sentfirst = 0;
 
-               printf("%2d ", ttl);
+               printf("%2d", ttl);
                for (probe = 0; probe < nprobes; ++probe) {
-                       int cc;
-                       struct timeval t1, t2;
-                       struct timezone tz;
+                       int read_len;
+                       unsigned t1;
+                       unsigned t2;
+                       int left_ms;
                        struct ip *ip;
 
-                       if (sentfirst && pausemsecs > 0)
+                       fflush_all();
+                       if (probe != 0 && pausemsecs > 0)
                                usleep(pausemsecs * 1000);
-                       (void)gettimeofday(&t1, &tz);
-                       send_probe(++seq, ttl, &t1);
-                       ++sentfirst;
-                       while ((cc = wait_for_reply(s, from, &t1)) != 0) {
-                               (void)gettimeofday(&t2, &tz);
-                               i = packet_ok(packet, cc, from, seq);
+
+                       send_probe(++seq, ttl);
+                       t2 = t1 = monotonic_us();
+
+                       left_ms = waittime * 1000;
+                       while ((read_len = wait_for_reply(from_lsa, to, &t2, &left_ms)) != 0) {
+                               int icmp_code;
+
+                               /* Recv'ed a packet, or read error */
+                               /* t2 = monotonic_us() - set by wait_for_reply */
+
+                               if (read_len < 0)
+                                       continue;
+                               icmp_code = packet_ok(read_len, from_lsa, to, seq);
                                /* Skip short packet */
-                               if (i == 0)
+                               if (icmp_code == 0)
                                        continue;
-                               if (!gotlastaddr ||
-                                   from->sin_addr.s_addr != lastaddr) {
-                                       print(packet, cc, from);
-                                       lastaddr = from->sin_addr.s_addr;
-                                       ++gotlastaddr;
-                               }
-                               printf("  %.3f ms", deltaT(&t1, &t2));
-                               ip = (struct ip *)packet;
-                               if (op & USAGE_OP_TTL_FLAG)
-                                       printf(" (%d)", ip->ip_ttl);
-                               if (i == -2) {
-                                       if (ip->ip_ttl <= 1)
-                                               printf(" !");
-                                       ++got_there;
-                                       break;
+
+                               if (!gotlastaddr
+                                || (memcmp(lastaddr, &from_lsa->u.sa, from_lsa->len) != 0)
+                               ) {
+                                       print(read_len, &from_lsa->u.sa, to);
+                                       memcpy(lastaddr, &from_lsa->u.sa, from_lsa->len);
+                                       gotlastaddr = 1;
                                }
+
+                               print_delta_ms(t1, t2);
+                               ip = (struct ip *)recv_pkt;
+
+                               if (from_lsa->u.sa.sa_family == AF_INET)
+                                       if (op & OPT_TTL_FLAG)
+                                               printf(" (%d)", ip->ip_ttl);
+
                                /* time exceeded in transit */
-                               if (i == -1)
+                               if (icmp_code == -1)
                                        break;
-                               code = i - 1;
-                               switch (code) {
-
+                               icmp_code--;
+                               switch (icmp_code) {
+#if ENABLE_TRACEROUTE6
+                               case ICMP6_DST_UNREACH_NOPORT << 8:
+                                       got_there = 1;
+                                       break;
+#endif
                                case ICMP_UNREACH_PORT:
                                        if (ip->ip_ttl <= 1)
                                                printf(" !");
-                                       ++got_there;
+                                       got_there = 1;
                                        break;
 
                                case ICMP_UNREACH_NET:
-                                       ++unreachable;
+#if ENABLE_TRACEROUTE6 && (ICMP6_DST_UNREACH_NOROUTE != ICMP_UNREACH_NET)
+                               case ICMP6_DST_UNREACH_NOROUTE << 8:
+#endif
                                        printf(" !N");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_HOST:
-                                       ++unreachable;
+#if ENABLE_TRACEROUTE6
+                               case ICMP6_DST_UNREACH_ADDR << 8:
+#endif
                                        printf(" !H");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_PROTOCOL:
-                                       ++got_there;
                                        printf(" !P");
+                                       got_there = 1;
                                        break;
-
                                case ICMP_UNREACH_NEEDFRAG:
-                                       ++unreachable;
                                        printf(" !F-%d", pmtu);
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_SRCFAIL:
-                                       ++unreachable;
+#if ENABLE_TRACEROUTE6
+                               case ICMP6_DST_UNREACH_ADMIN << 8:
+#endif
                                        printf(" !S");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_FILTER_PROHIB:
                                case ICMP_UNREACH_NET_PROHIB:   /* misuse */
-                                       ++unreachable;
                                        printf(" !A");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_HOST_PROHIB:
-                                       ++unreachable;
                                        printf(" !C");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_HOST_PRECEDENCE:
-                                       ++unreachable;
                                        printf(" !V");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-                                       ++unreachable;
                                        printf(" !C");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_NET_UNKNOWN:
                                case ICMP_UNREACH_HOST_UNKNOWN:
-                                       ++unreachable;
                                        printf(" !U");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_ISOLATED:
-                                       ++unreachable;
                                        printf(" !I");
+                                       ++unreachable;
                                        break;
-
                                case ICMP_UNREACH_TOSNET:
                                case ICMP_UNREACH_TOSHOST:
-                                       ++unreachable;
                                        printf(" !T");
+                                       ++unreachable;
                                        break;
-
                                default:
+                                       printf(" !<%d>", icmp_code);
                                        ++unreachable;
-                                       printf(" !<%d>", code);
                                        break;
                                }
                                break;
-                       }
-                       if (cc == 0)
-                               printf(" *");
-                       (void)fflush(stdout);
-               }
-               putchar('\n');
-               if (got_there ||
-                   (unreachable > 0 && unreachable >= nprobes - 1))
+                       } /* while (wait and read a packet) */
+
+                       /* there was no packet at all? */
+                       if (read_len == 0)
+                               printf("  *");
+               } /* for (nprobes) */
+
+               bb_putchar('\n');
+               if (got_there
+                || (unreachable > 0 && unreachable >= nprobes - 1)
+               ) {
                        break;
+               }
+       }
+
+       if (ENABLE_FEATURE_CLEAN_UP) {
+               free(to);
+               free(lastaddr);
+               free(from_lsa);
        }
+
        return 0;
 }
+
+int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int traceroute_main(int argc UNUSED_PARAM, char **argv)
+{
+       return common_traceroute_main(0, argv);
+}
+
+#if ENABLE_TRACEROUTE6
+int traceroute6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int traceroute6_main(int argc UNUSED_PARAM, char **argv)
+{
+       return common_traceroute_main(OPT_IPV6, argv);
+}
+#endif