inetd: comment tweak. no code changes
[oweals/busybox.git] / networking / traceroute.c
index ceec0bc9c65f9280e52febe232866aff4a0ff98a..7284f0022d51facd417c4cd71db3ed07d2b603f8 100644 (file)
@@ -22,9 +22,6 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-//#define version "1.4a12"
-
-
 /*
  * traceroute host  - trace the route ip packets follow going to "host".
  *
 /*
  * traceroute host  - trace the route ip packets follow going to "host".
  *
  *     Tue Dec 20 03:50:13 PST 1988
  */
 
  *     Tue Dec 20 03:50:13 PST 1988
  */
 
-#undef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+#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
 //#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
 //#define CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-#undef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
+//#undef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 //#define CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 
 //#define CONFIG_FEATURE_TRACEROUTE_USE_ICMP
 
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <fcntl.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/select.h>
-#include "inet_common.h"
 
 #include <net/if.h>
 
 #include <net/if.h>
-#include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/inet.h>
-#include <netinet/protocols.h>
+#include <netinet/in.h>
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
 
-#include "busybox.h"
-
-
-/*
- * Definitions for internet protocol version 4.
- * Per RFC 791, September 1981.
- */
-#define IPVERSION       4
+#include "libbb.h"
+#include "inet_common.h"
 
 
-/*
- * Overlay for ip header used by other protocols (tcp, udp).
- */
-struct ipovly {
-       unsigned char  ih_x1[9];               /* (unused) */
-       unsigned 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 */
+#ifndef IPPROTO_ICMP
+# define IPPROTO_ICMP 1
+#endif
+#ifndef IPPROTO_IP
+# define IPPROTO_IP 0
+#endif
+
+/* Keep in sync with getopt32 call! */
+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 */
 };
 };
+#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 */
 };
 
 /* Data section of the probe packet */
-struct outdata {
+struct outdata_t {
        unsigned char seq;             /* sequence number of this packet */
        unsigned char ttl;             /* ttl packet left with */
        unsigned char seq;             /* sequence number of this packet */
        unsigned char ttl;             /* ttl packet left with */
-       struct timeval tv ATTRIBUTE_PACKED; /* time packet left */
-};
-
-struct IFADDRLIST {
-       u_int32_t addr;
-       char device[sizeof(struct ifreq)];
+// UNUSED. Retaining to have the same packet size.
+       struct timeval tv_UNUSED PACKED; /* time packet left */
 };
 
 };
 
-
-static const char route[] = "/proc/net/route";
-
-/* last inbound (icmp) packet */
-static unsigned char  packet[512] ATTRIBUTE_ALIGNED(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 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) */
+       uint16_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
 #else
 #define optlen 0
 #endif
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-static int useicmp;                    /* use icmp echo instead of udp packets */
-#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 = xsocket(AF_INET, SOCK_DGRAM, 0);
-
-       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)",
-                           (int)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 = xzalloc(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);
+       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
 #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 = 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);
-}
-
-/*
-"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]"
-
-*/
-
-/* 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)
-{
-       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", str, what);
-       }
-       if (val < mi && mi >= 0) {
-               if (mi == 0)
-                       bb_error_msg_and_die("%s must be >= %d", what, mi);
-               else
-                       bb_error_msg_and_die("%s must be > %d", what, mi - 1);
-       }
-       if (val > ma && ma >= 0)
-               bb_error_msg_and_die("%s must be <= %d", what, ma);
-       return val;
-}
-
+};
 
 
-/*
- * Subtract 2 timeval structs:  out = out - in.
- * Out is assumed to be >= in.
- */
-static inline void
-tvsub(struct timeval *out, struct timeval *in)
-{
+#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
+#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)
+
+#define outicmp ((struct icmp *)(outip + 1))
+#define outudp  ((struct udphdr *)(outip + 1))
 
 
-       if ((out->tv_usec -= in->tv_usec) < 0)   {
-               --out->tv_sec;
-               out->tv_usec += 1000000;
-       }
-       out->tv_sec -= in->tv_sec;
-}
 
 static int
 
 static int
-wait_for_reply(int sock, struct sockaddr_in *fromp, const struct timeval *tp)
+wait_for_reply(struct sockaddr_in *fromp)
 {
 {
-       fd_set fds;
-       struct timeval now, tvwait;
-       struct timezone tz;
+       struct pollfd pfd[1];
        int cc = 0;
        socklen_t fromlen = sizeof(*fromp);
 
        int cc = 0;
        socklen_t fromlen = sizeof(*fromp);
 
-       FD_ZERO(&fds);
-       FD_SET(sock, &fds);
-
-       tvwait.tv_sec = tp->tv_sec + waittime;
-       tvwait.tv_usec = tp->tv_usec;
-       (void)gettimeofday(&now, &tz);
-       tvsub(&tvwait, &now);
-
-       if (select(sock + 1, &fds, NULL, NULL, &tvwait) > 0)
-               cc = recvfrom(sock, (char *)packet, sizeof(packet), 0,
+       pfd[0].fd = rcvsock;
+       pfd[0].events = POLLIN;
+       if (safe_poll(pfd, 1, waittime * 1000) > 0)
+               cc = recvfrom(rcvsock, recv_pkt, sizeof(recv_pkt), 0,
                            (struct sockaddr *)fromp, &fromlen);
                            (struct sockaddr *)fromp, &fromlen);
-
        return cc;
 }
 
 /*
  * Checksum routine for Internet Protocol family headers (C Version)
  */
        return cc;
 }
 
 /*
  * Checksum routine for Internet Protocol family headers (C Version)
  */
-static u_short
-in_cksum(u_short *addr, int len)
+static uint16_t
+in_cksum(uint16_t *addr, int len)
 {
        int nleft = len;
 {
        int nleft = len;
-       u_short *w = addr;
-       u_short answer;
+       uint16_t *w = addr;
+       uint16_t answer;
        int sum = 0;
 
        /*
        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.
+        * 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)  {
+       while (nleft > 1) {
                sum += *w++;
                nleft -= 2;
        }
                sum += *w++;
                nleft -= 2;
        }
@@ -595,86 +346,45 @@ in_cksum(u_short *addr, int len)
        if (nleft == 1)
                sum += *(unsigned char *)w;
 
        if (nleft == 1)
                sum += *(unsigned char *)w;
 
-       /*
-        * add back carry outs from top 16 bits to low 16 bits
-        */
+       /* 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;
 }
 
        sum = (sum >> 16) + (sum & 0xffff);     /* add hi 16 to low 16 */
        sum += (sum >> 16);                     /* add carry */
        answer = ~sum;                          /* truncate to 16 bits */
        return answer;
 }
 
-
 static void
 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;
 
        /* Payload */
        outdata->seq = seq;
        outdata->ttl = ttl;
-       memcpy(&outdata->tv, tp, sizeof(outdata->tv));
+// UNUSED: was storing gettimeofday's result there, but never ever checked it
+       /*memcpy(&outdata->tv, tp, sizeof(outdata->tv));*/
 
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp)
+       if (option_mask32 & OPT_USE_ICMP) {
                outicmp->icmp_seq = htons(seq);
                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;
                /* Always calculate checksum for icmp packets */
                outicmp->icmp_cksum = 0;
-               outicmp->icmp_cksum = in_cksum((u_short *)outicmp,
-                   packlen - (sizeof(*outip) + optlen));
+               outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
+                                       packlen - (sizeof(*outip) + optlen));
                if (outicmp->icmp_cksum == 0)
                        outicmp->icmp_cksum = 0xffff;
                if (outicmp->icmp_cksum == 0)
                        outicmp->icmp_cksum = 0xffff;
-       } 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;
        }
 
        }
 
-#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) {
        /* XXX undocumented debugging hack */
        if (verbose > 1) {
-               const u_short *sp;
+               const uint16_t *sp;
                int nshorts, i;
 
                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) {
                i = 0;
                printf("[ %d bytes", packlen);
                while (--nshorts >= 0) {
@@ -692,42 +402,36 @@ send_probe(int seq, int ttl, struct timeval *tp)
        }
 #endif
 
        }
 #endif
 
-#if !defined(IP_HDRINCL) && defined(IP_TTL)
+#if defined(IP_TTL)
        if (setsockopt(sndsock, IPPROTO_IP, IP_TTL,
        if (setsockopt(sndsock, IPPROTO_IP, IP_TTL,
-           (char *)&ttl, sizeof(ttl)) < 0) {
+                               (char *)&ttl, sizeof(ttl)) < 0) {
                bb_perror_msg_and_die("setsockopt ttl %d", ttl);
        }
 #endif
 
                bb_perror_msg_and_die("setsockopt ttl %d", ttl);
        }
 #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);
+       len = packlen - sizeof(*outip);
+       if (option_mask32 & OPT_USE_ICMP)
+               out = outicmp;
+       else {
+               out = outdata;
+               len -= sizeof(*outudp);
+               set_nport(dest_lsa, htons(port + seq));
+       }
+       res = xsendto(sndsock, out, len,
+                       (struct sockaddr *)&dest_lsa->u.sa, dest_lsa->len);
+       if (res != len) {
+               bb_info_msg("sent %d octets, ret=%d", len, res);
        }
 }
 
        }
 }
 
-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;
-}
-
-#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(unsigned char t)
 {
 /*
  * Convert an ICMP "type" field to a printable string.
  */
 static inline 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",
        "Echo Reply",   "ICMP 1",       "ICMP 2",       "Dest Unreachable",
        "Source Quench", "Redirect",    "ICMP 6",       "ICMP 7",
        "Echo",         "Router Advert", "Router Solicit", "Time Exceeded",
@@ -735,25 +439,29 @@ pr_type(unsigned char t)
        "Info Reply",   "Mask Request", "Mask Reply"
        };
 
        "Info Reply",   "Mask Request", "Mask Reply"
        };
 
-       if (t > 18)
+       if (t >= ARRAY_SIZE(ttab))
                return "OUT-OF-RANGE";
 
        return ttab[t];
 }
 #endif
 
                return "OUT-OF-RANGE";
 
        return ttab[t];
 }
 #endif
 
+#if !ENABLE_FEATURE_TRACEROUTE_VERBOSE
+#define packet_ok(cc, from, seq) \
+       packet_ok(cc, seq)
+#endif
 static int
 static int
-packet_ok(unsigned char *buf, int cc, struct sockaddr_in *from, int seq)
+packet_ok(int cc, const struct sockaddr_in *from, int seq)
 {
 {
-       struct icmp *icp;
+       const struct icmp *icp;
        unsigned char type, code;
        int hlen;
        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) {
        hlen = ip->ip_hl << 2;
        if (cc < hlen + ICMP_MINLEN) {
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
                if (verbose)
                        printf("packet too short (%d bytes) from %s\n", cc,
                                inet_ntoa(from->sin_addr));
                if (verbose)
                        printf("packet too short (%d bytes) from %s\n", cc,
                                inet_ntoa(from->sin_addr));
@@ -761,349 +469,254 @@ packet_ok(unsigned char *buf, int cc, struct sockaddr_in *from, int seq)
                return 0;
        }
        cc -= hlen;
                return 0;
        }
        cc -= hlen;
-       icp = (struct icmp *)(buf + hlen);
+       icp = (struct icmp *)(recv_pkt + hlen);
        type = icp->icmp_type;
        code = icp->icmp_code;
        /* Path MTU Discovery (RFC1191) */
        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);
                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;
 
                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 */
                        struct icmp *hicmp;
 
                        /* XXX */
-                       if (type == ICMP_ECHOREPLY &&
-                           icp->icmp_id == htons(ident) &&
-                           icp->icmp_seq == htons(seq))
+                       if (type == ICMP_ECHOREPLY
+                        && icp->icmp_id == htons(ident)
+                        && icp->icmp_seq == htons(seq)
+                       ) {
                                return -2;
                                return -2;
+                       }
 
                        hicmp = (struct icmp *)((unsigned char *)hip + hlen);
 
                        hicmp = (struct icmp *)((unsigned 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 (hlen + SIZEOF_ICMP_HDR <= cc
+                        && hip->ip_p == IPPROTO_ICMP
+                        && hicmp->icmp_id == htons(ident)
+                        && hicmp->icmp_seq == htons(seq)
+                       ) {
                                return (type == ICMP_TIMXCEED ? -1 : code + 1);
                                return (type == ICMP_TIMXCEED ? -1 : code + 1);
-               } else
-#endif
-                     {
-                       up = (struct udphdr *)((unsigned 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 <= cc
+                        && 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);
                                return (type == ICMP_TIMXCEED ? -1 : code + 1);
+                       }
                }
        }
                }
        }
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
+#if ENABLE_FEATURE_TRACEROUTE_VERBOSE
        if (verbose) {
                int i;
        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",
 
                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))
+                       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))
                        printf("%2d: x%8.8x\n", i, *lp++);
        }
 #endif
        return 0;
 }
 
                        printf("%2d: x%8.8x\n", i, *lp++);
        }
 #endif
        return 0;
 }
 
-
 /*
  * Construct an Internet address representation.
 /*
  * Construct an Internet address representation.
- * If the nflag has been supplied, give
+ * If the -n flag has been supplied, give
  * numeric value, otherwise try for symbolic name.
  */
  * numeric value, otherwise try for symbolic name.
  */
-static inline void
-inetname(struct sockaddr_in *from)
+static void
+print_inetname(const struct sockaddr_in *from)
 {
 {
-       const char *n = NULL;
        const char *ina;
        const char *ina;
-       char name[257];
 
 
-       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);
        ina = inet_ntoa(from->sin_addr);
-       if (nflag)
-               printf(" %s", ina);
-       else
-               printf(" %s (%s)", (n ? n : ina), ina);
-}
-
-static inline void
-print(unsigned char *buf, int cc, struct sockaddr_in *from)
-{
-       struct ip *ip;
-       int hlen;
-
-       ip = (struct ip *) buf;
-       hlen = ip->ip_hl << 2;
-       cc -= hlen;
-
-       inetname(from);
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
-       if (verbose)
-               printf(" %d bytes to %s", cc, inet_ntoa (ip->ip_dst));
-#endif
-}
-
-
-static struct hostinfo *
-gethostinfo(const char *host)
-{
-       int n;
-       struct hostent *hp;
-       struct hostinfo *hi;
-       char **p;
-       u_int32_t addr, *ap;
-
-       hi = xzalloc(sizeof(*hi));
-       addr = inet_addr(host);
-       if ((int32_t)addr != -1) {
-               hi->name = xstrdup(host);
-               hi->n = 1;
-               hi->addrs = xzalloc(sizeof(hi->addrs[0]));
-               hi->addrs[0] = addr;
-               return hi;
+       if (option_mask32 & OPT_ADDR_NUM)
+               printf("  %s", ina);
+       else {
+               char *n = NULL;
+               if (from->sin_addr.s_addr != INADDR_ANY)
+                       n = xmalloc_sockaddr2host_noport((struct sockaddr*)from);
+               printf("  %s (%s)", (n ? n : ina), ina);
+               free(n);
        }
        }
-
-       hp = xgethostbyname(host);
-       if (hp->h_addrtype != AF_INET || hp->h_length != 4)
-               bb_perror_msg_and_die("bad host %s", host);
-       hi->name = xstrdup(hp->h_name);
-       for (n = 0, p = hp->h_addr_list; *p != NULL; ++n, ++p)
-               continue;
-       hi->n = n;
-       hi->addrs = xzalloc(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;
 }
 
 static void
 }
 
 static void
-freehostinfo(struct hostinfo *hi)
+print(int cc, const struct sockaddr_in *from)
 {
 {
-       free(hi->name);
-       hi->name = NULL;
-       free((char *)hi->addrs);
-       free((char *)hi);
+       print_inetname(from);
+       if (verbose) {
+               const struct ip *ip;
+               int hlen;
+
+               ip = (struct ip *) recv_pkt;
+               hlen = ip->ip_hl << 2;
+               cc -= hlen;
+               printf(" %d bytes to %s", cc, inet_ntoa(ip->ip_dst));
+       }
 }
 
 }
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
 static void
 static void
-getaddr(u_int32_t *ap, const char *host)
+print_delta_ms(unsigned t1p, unsigned t2p)
 {
 {
-       struct hostinfo *hi;
-
-       hi = gethostinfo(host);
-       *ap = hi->addrs[0];
-       freehostinfo(hi);
+       unsigned tt = t2p - t1p;
+       printf("  %u.%03u ms", tt / 1000, tt % 1000);
 }
 }
-#endif
 
 
+/*
+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]"
+*/
 
 
-int
-traceroute_main(int argc, char *argv[])
+int traceroute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int traceroute_main(int argc, char **argv)
 {
 {
-       int code, n;
-       unsigned 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;
-       int ttl, probe, i;
+       int minpacket;
+       int ttl, i;
        int seq = 0;
        int tos = 0;
        int seq = 0;
        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;
-       char *device = NULL;
        int max_ttl = 30;
        int max_ttl = 30;
-       char *max_ttl_str = NULL;
-       char *port_str = NULL;
        int nprobes = 3;
        int nprobes = 3;
-       char *nprobes_str = NULL;
-       char *waittime_str = NULL;
-       u_int pausemsecs = 0;
-       char *pausemsecs_str = NULL;
        int first_ttl = 1;
        int first_ttl = 1;
-       char *first_ttl_str = NULL;
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       llist_t *sourse_route_list = NULL;
+       unsigned pausemsecs = 0;
+       unsigned op;
+       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;
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       llist_t *source_route_list = NULL;
+       int lsrr = 0;
 #endif
 
 #endif
 
-       opterr = 0;
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
-       bb_opt_complementally = "x-x:g::";
+       INIT_G();
+
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       opt_complementary = "x-x:g::";
 #else
 #else
-       bb_opt_complementally = "x-x";
+       opt_complementary = "x-x";
 #endif
 
 #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
+       op = getopt32(argv, "FIlnrdvxt:i:m:p:q:s:w:z:f:"
+#if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE
                                        "g:"
 #endif
                                        "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
+               , &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
        );
 
 #endif
        );
 
-       if(op & USAGE_OP_DONT_FRAGMNT)
-               off = IP_DF;
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       useicmp = op & USAGE_OP_USE_ICMP;
-#endif
-       nflag = op & USAGE_OP_ADDR_NUM;
-#ifdef CONFIG_FEATURE_TRACEROUTE_VERBOSE
-       verbose = op &  USAGE_OP_VERBOSE;
-#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(nprobes_str, "nprobes", 1, -1);
-       if(source) {
-           /*
-            * set the ip source address of the outbound
-            * probe (e.g., on a multi-homed host).
-            */
-            if (getuid()) bb_error_msg_and_die("-s %s: Permission denied", source);
+#if 0 /* IGNORED */
+       if (op & OPT_IP_CHKSUM)
+               bb_error_msg("warning: ip checksums disabled");
+#endif
+       if (op & OPT_TOS)
+               tos = xatou_range(tos_str, 0, 255);
+       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("you must be root to use -s");
        }
        }
-       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)
                        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;
                        ++lsrr;
-                       l_sr = l_sr->link;
-                       free(sourse_route_list);
-                       sourse_route_list = l_sr;
                }
                optlen = (lsrr + 1) * sizeof(gwlist[0]);
        }
 #endif
 
                }
                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 */
+       minpacket = sizeof(*outip) + SIZEOF_ICMP_HDR + sizeof(*outdata) + optlen;
+       if (!(op & OPT_USE_ICMP))
+               minpacket += sizeof(*outudp) - SIZEOF_ICMP_HDR;
+       packlen = minpacket;
 
        /* Process destination and optional packet size */
 
        /* Process destination and optional packet size */
-       switch (argc - optind) {
-
+       argv += optind;
+       argc -= optind;
+       switch (argc) {
        case 2:
        case 2:
-               packlen = str2val(argv[optind + 1],
-                   "packet length", minpacket, maxpacket);
+               packlen = xatoul_range(argv[1], minpacket, 32 * 1024);
                /* Fall through */
                /* Fall through */
-
        case 1:
        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);
+               dest_lsa = xhost2sockaddr(argv[0], port);
                break;
                break;
-
        default:
                bb_show_usage();
        }
 
        default:
                bb_show_usage();
        }
 
-       /* Insure the socket fds won't be 0, 1 or 2 */
-       do n = xopen(bb_dev_null, O_RDONLY); while (n < 2);
-       if (n > 2)
-               close(n);
-
-       s = xsocket(AF_INET, SOCK_RAW, IP_ICMP);
+       /* Ensure the socket fds won't be 0, 1 or 2 */
+       bb_sanitize_stdio();
 
 
-#ifdef CONFIG_FEATURE_TRACEROUTE_SO_DEBUG
-       if (op & USAGE_OP_DEBUG)
-               (void)setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&on,
-                   sizeof(on));
+       xmove_fd(xsocket(AF_INET, SOCK_RAW, IPPROTO_ICMP), rcvsock);
+#if TRACEROUTE_SO_DEBUG
+       if (op & OPT_DEBUG)
+               setsockopt(rcvsock, SOL_SOCKET, SO_DEBUG,
+                               &const_int_1, sizeof(const_int_1));
 #endif
 #endif
-       if (op & USAGE_OP_BYPASS_ROUTE)
-               (void)setsockopt(s, SOL_SOCKET, SO_DONTROUTE, (char *)&on,
-                   sizeof(on));
+       if (op & OPT_BYPASS_ROUTE)
+               setsockopt(rcvsock, SOL_SOCKET, SO_DONTROUTE,
+                               &const_int_1, sizeof(const_int_1));
 
 
-       sndsock = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
-
-#ifdef CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE
+       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
 #if defined(IP_OPTIONS)
        if (lsrr > 0) {
                unsigned char optlist[MAX_IPOPTLEN];
 
 #if defined(IP_OPTIONS)
        if (lsrr > 0) {
                unsigned char optlist[MAX_IPOPTLEN];
 
-               cp = "ip";
-               if ((pe = getprotobyname(cp)) == NULL)
-                       bb_perror_msg_and_die("unknown protocol");
-
                /* final hop */
                /* final hop */
-               gwlist[lsrr] = to->sin_addr.s_addr;
+               gwlist[lsrr] = dest_lsa->u.sin.sin_addr.s_addr;
                ++lsrr;
 
                /* force 4 byte alignment */
                ++lsrr;
 
                /* force 4 byte alignment */
@@ -1112,277 +725,202 @@ traceroute_main(int argc, char *argv[])
                optlist[1] = IPOPT_LSRR;
                i = lsrr * sizeof(gwlist[0]);
                optlist[2] = i + 3;
                optlist[1] = IPOPT_LSRR;
                i = lsrr * sizeof(gwlist[0]);
                optlist[2] = i + 3;
-               /* Pointer to LSRR addresses */
+               /* pointer to LSRR addresses */
                optlist[3] = IPOPT_MINOFF;
                memcpy(optlist + 4, gwlist, i);
 
                optlist[3] = IPOPT_MINOFF;
                memcpy(optlist + 4, gwlist, i);
 
-               if ((setsockopt(sndsock, pe->p_proto, IP_OPTIONS,
-                   (char *)optlist, i + sizeof(gwlist[0]))) < 0) {
+               if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
+                               (char *)optlist, i + sizeof(gwlist[0])) < 0) {
                        bb_perror_msg_and_die("IP_OPTIONS");
                        bb_perror_msg_and_die("IP_OPTIONS");
-                   }
+               }
        }
 #endif /* IP_OPTIONS */
 #endif /* CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE */
        }
 #endif /* IP_OPTIONS */
 #endif /* CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE */
-
 #ifdef SO_SNDBUF
 #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
                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
 #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
                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
 #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
 #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 */
-       xsetgid(getgid());
-       xsetuid(getuid());
-
-       outip = (struct ip *)xzalloc(packlen);
+       outip = xzalloc(packlen);
 
 
-       outip->ip_v = IPVERSION;
-       if (tos_str)
-               outip->ip_tos = tos;
-       outip->ip_len = htons(packlen);
-       outip->ip_off = htons(off);
-       outp = (unsigned char *)(outip + 1);
-       outip->ip_dst = to->sin_addr;
-
-       outip->ip_hl = (outp - (unsigned char *)outip) >> 2;
-       ident = (getpid() & 0xffff) | 0x8000;
-#ifdef CONFIG_FEATURE_TRACEROUTE_USE_ICMP
-       if (useicmp) {
-               outip->ip_p = IPPROTO_ICMP;
-
-               outicmp = (struct icmp *)outp;
+       if (op & OPT_USE_ICMP) {
+               ident = getpid() | 0x8000;
                outicmp->icmp_type = ICMP_ECHO;
                outicmp->icmp_id = htons(ident);
                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);
-       }
-
-       /* 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);
-               }
+               outdata = (struct outdata_t *)((char *)outicmp + SIZEOF_ICMP_HDR);
+       } else {
+               outdata = (struct outdata_t *)(outudp + 1);
        }
 
        }
 
-       /* 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);
-               } 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));
-               }
-               freehostinfo(hi);
+       if (op & OPT_DEVICE) /* hmm, do we need error check? */
+               setsockopt_bindtodevice(sndsock, device);
+
+       if (op & OPT_SOURCE) {
+               len_and_sockaddr *source_lsa = xdotted2sockaddr(source, 0);
+               /* Ping does this (why?) */
+               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);
        }
 
        }
 
-       outip->ip_src = from->sin_addr;
-#ifndef IP_HDRINCL
-       xbind(sndsock, (struct sockaddr *)from, sizeof(*from));
-#endif
+       /* Revert to non-privileged user after opening sockets */
+       xsetgid(getgid());
+       xsetuid(getuid());
 
 
-       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);
+       printf("traceroute to %s (%s)", argv[0],
+                       xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa));
+       if (op & OPT_SOURCE)
+               printf(" from %s", source);
+       printf(", %d hops max, %d byte packets\n", max_ttl, packlen);
 
        for (ttl = first_ttl; ttl <= max_ttl; ++ttl) {
 
        for (ttl = first_ttl; ttl <= max_ttl; ++ttl) {
-               u_int32_t lastaddr = 0;
-               int gotlastaddr = 0;
+//TODO: make it protocol agnostic (get rid of sockaddr_in)
+               struct sockaddr_in from;
+               uint32_t lastaddr = 0;
+               int probe;
+               int unreachable = 0; /* counter */
+               int gotlastaddr = 0; /* flags */
                int got_there = 0;
                int got_there = 0;
-               int unreachable = 0;
-               int sentfirst = 0;
+               int first = 1;
 
 
-               printf("%2d ", ttl);
+               printf("%2d", ttl);
                for (probe = 0; probe < nprobes; ++probe) {
                        int cc;
                for (probe = 0; probe < nprobes; ++probe) {
                        int cc;
-                       struct timeval t1, t2;
-                       struct timezone tz;
+                       unsigned t1;
+                       unsigned t2;
                        struct ip *ip;
 
                        struct ip *ip;
 
-                       if (sentfirst && pausemsecs > 0)
+                       if (!first && pausemsecs > 0)
                                usleep(pausemsecs * 1000);
                                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);
+                       fflush(stdout);
+
+                       t1 = monotonic_us();
+                       send_probe(++seq, ttl);
+                       first = 0;
+
+                       while ((cc = wait_for_reply(&from)) != 0) {
+                               t2 = monotonic_us();
+                               i = packet_ok(cc, &from, seq);
                                /* Skip short packet */
                                if (i == 0)
                                        continue;
                                /* Skip short packet */
                                if (i == 0)
                                        continue;
-                               if (!gotlastaddr ||
-                                   from->sin_addr.s_addr != lastaddr) {
-                                       print(packet, cc, from);
-                                       lastaddr = from->sin_addr.s_addr;
-                                       ++gotlastaddr;
+                               if (!gotlastaddr
+                                || from.sin_addr.s_addr != lastaddr
+                               ) {
+                                       print(cc, &from);
+                                       lastaddr = from.sin_addr.s_addr;
+                                       gotlastaddr = 1;
                                }
                                }
-                               printf("  %.3f ms", deltaT(&t1, &t2));
-                               ip = (struct ip *)packet;
-                               if (op & USAGE_OP_TTL_FLAG)
+                               print_delta_ms(t1, t2);
+                               ip = (struct ip *)recv_pkt;
+                               if (op & OPT_TTL_FLAG)
                                        printf(" (%d)", ip->ip_ttl);
                                if (i == -2) {
                                        if (ip->ip_ttl <= 1)
                                                printf(" !");
                                        printf(" (%d)", ip->ip_ttl);
                                if (i == -2) {
                                        if (ip->ip_ttl <= 1)
                                                printf(" !");
-                                       ++got_there;
+                                       got_there = 1;
                                        break;
                                }
                                /* time exceeded in transit */
                                if (i == -1)
                                        break;
                                        break;
                                }
                                /* time exceeded in transit */
                                if (i == -1)
                                        break;
-                               code = i - 1;
-                               switch (code) {
-
+                               i--;
+                               switch (i) {
                                case ICMP_UNREACH_PORT:
                                        if (ip->ip_ttl <= 1)
                                                printf(" !");
                                case ICMP_UNREACH_PORT:
                                        if (ip->ip_ttl <= 1)
                                                printf(" !");
-                                       ++got_there;
+                                       got_there = 1;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_NET:
                                case ICMP_UNREACH_NET:
-                                       ++unreachable;
                                        printf(" !N");
                                        printf(" !N");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_HOST:
                                case ICMP_UNREACH_HOST:
-                                       ++unreachable;
                                        printf(" !H");
                                        printf(" !H");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_PROTOCOL:
                                case ICMP_UNREACH_PROTOCOL:
-                                       ++got_there;
                                        printf(" !P");
                                        printf(" !P");
+                                       got_there = 1;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_NEEDFRAG:
                                case ICMP_UNREACH_NEEDFRAG:
-                                       ++unreachable;
                                        printf(" !F-%d", pmtu);
                                        printf(" !F-%d", pmtu);
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_SRCFAIL:
                                case ICMP_UNREACH_SRCFAIL:
-                                       ++unreachable;
                                        printf(" !S");
                                        printf(" !S");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_FILTER_PROHIB:
                                case ICMP_UNREACH_NET_PROHIB:   /* misuse */
                                case ICMP_UNREACH_FILTER_PROHIB:
                                case ICMP_UNREACH_NET_PROHIB:   /* misuse */
-                                       ++unreachable;
                                        printf(" !A");
                                        printf(" !A");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_HOST_PROHIB:
                                case ICMP_UNREACH_HOST_PROHIB:
-                                       ++unreachable;
                                        printf(" !C");
                                        printf(" !C");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_HOST_PRECEDENCE:
                                case ICMP_UNREACH_HOST_PRECEDENCE:
-                                       ++unreachable;
                                        printf(" !V");
                                        printf(" !V");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
                                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
-                                       ++unreachable;
                                        printf(" !C");
                                        printf(" !C");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_NET_UNKNOWN:
                                case ICMP_UNREACH_HOST_UNKNOWN:
                                case ICMP_UNREACH_NET_UNKNOWN:
                                case ICMP_UNREACH_HOST_UNKNOWN:
-                                       ++unreachable;
                                        printf(" !U");
                                        printf(" !U");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_ISOLATED:
                                case ICMP_UNREACH_ISOLATED:
-                                       ++unreachable;
                                        printf(" !I");
                                        printf(" !I");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                case ICMP_UNREACH_TOSNET:
                                case ICMP_UNREACH_TOSHOST:
                                case ICMP_UNREACH_TOSNET:
                                case ICMP_UNREACH_TOSHOST:
-                                       ++unreachable;
                                        printf(" !T");
                                        printf(" !T");
+                                       ++unreachable;
                                        break;
                                        break;
-
                                default:
                                default:
+                                       printf(" !<%d>", i);
                                        ++unreachable;
                                        ++unreachable;
-                                       printf(" !<%d>", code);
                                        break;
                                }
                                break;
                        }
                        if (cc == 0)
                                        break;
                                }
                                break;
                        }
                        if (cc == 0)
-                               printf(" *");
-                       (void)fflush(stdout);
+                               printf("  *");
                }
                }
-               putchar('\n');
-               if (got_there ||
-                   (unreachable > 0 && unreachable >= nprobes - 1))
+               bb_putchar('\n');
+               if (got_there
+                || (unreachable > 0 && unreachable >= nprobes - 1)
+               ) {
                        break;
                        break;
+               }
        }
        return 0;
 }
        }
        return 0;
 }