//usage: " [-z PAUSE_MSEC] HOST [BYTES]"
//usage:#define traceroute_full_usage "\n\n"
//usage: "Trace the route to HOST\n"
-//usage: "\nOptions:"
//usage: IF_TRACEROUTE6(
//usage: "\n -4,-6 Force IP or IPv6 name resolution"
//usage: )
//usage: " HOST [BYTES]"
//usage:#define traceroute6_full_usage "\n\n"
//usage: "Trace the route to HOST\n"
-//usage: "\nOptions:"
//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"
#endif
-#define OPT_STRING "FIlnrdvxt:i:m:p:q:s:w:z:f:" \
- IF_FEATURE_TRACEROUTE_SOURCE_ROUTE("g:") \
- "4" IF_TRACEROUTE6("6")
+#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 */
static int
-wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to)
+wait_for_reply(len_and_sockaddr *from_lsa, struct sockaddr *to, unsigned *timestamp_us, int *left_ms)
{
struct pollfd pfd[1];
int read_len = 0;
pfd[0].fd = rcvsock;
pfd[0].events = POLLIN;
- if (safe_poll(pfd, 1, waittime * 1000) > 0) {
+ 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:*/ 0,
+ /*flags:*/ MSG_DONTWAIT,
&from_lsa->u.sa, to, from_lsa->len);
+ t = monotonic_us();
+ *left_ms -= (t - *timestamp_us) / 1000;
+ *timestamp_us = t;
}
return read_len;
}
-/*
- * Checksum routine for Internet Protocol family headers (C Version)
- */
-static uint16_t
-in_cksum(uint16_t *addr, int len)
-{
- int nleft = len;
- uint16_t *w = addr;
- uint16_t 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;
- }
-
- /* mop up an odd byte, if necessary */
- if (nleft == 1)
- sum += *(unsigned 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;
-}
-
static void
send_probe(int seq, int ttl)
{
/* Always calculate checksum for icmp packets */
outicmp->icmp_cksum = 0;
- outicmp->icmp_cksum = in_cksum((uint16_t *)outicmp,
+ outicmp->icmp_cksum = inet_cksum((uint16_t *)outicmp,
packlen - (sizeof(*outip) + optlen));
if (outicmp->icmp_cksum == 0)
outicmp->icmp_cksum = 0xffff;
type, pr_type(type), icp->icmp6_code);
read_len -= sizeof(struct icmp6_hdr);
- for (i = 0; i < read_len ; i++) {
+ for (i = 0; i < read_len; i++) {
if (i % 16 == 0)
printf("%04x:", i);
if (i % 4 == 0)
static int
common_traceroute_main(int op, char **argv)
{
- int i;
int minpacket;
int tos = 0;
int max_ttl = 30;
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;
#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;
optlist[0] = IPOPT_NOP;
/* loose source route option */
optlist[1] = IPOPT_LSRR;
- i = lsrr * sizeof(gwlist[0]);
- optlist[2] = i + 3;
+ size = lsrr * sizeof(gwlist[0]);
+ optlist[2] = size + 3;
/* pointer to LSRR addresses */
optlist[3] = IPOPT_MINOFF;
- memcpy(optlist + 4, gwlist, i);
+ memcpy(optlist + 4, gwlist, size);
if (setsockopt(sndsock, IPPROTO_IP, IP_OPTIONS,
- (char *)optlist, i + sizeof(gwlist[0])) < 0) {
+ (char *)optlist, size + sizeof(gwlist[0])) < 0) {
bb_perror_msg_and_die("IP_OPTIONS");
}
}
xsetgid(getgid());
xsetuid(getuid());
- printf("traceroute to %s (%s)", argv[0],
- xmalloc_sockaddr2dotted_noport(&dest_lsa->u.sa));
+ 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);
int unreachable = 0; /* counter */
int gotlastaddr = 0; /* flags */
int got_there = 0;
- int first = 1;
printf("%2d", ttl);
for (probe = 0; probe < nprobes; ++probe) {
int read_len;
unsigned t1;
unsigned t2;
+ int left_ms;
struct ip *ip;
- if (!first && pausemsecs > 0)
- usleep(pausemsecs * 1000);
fflush_all();
+ if (probe != 0 && pausemsecs > 0)
+ usleep(pausemsecs * 1000);
- t1 = monotonic_us();
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;
- first = 0;
- while ((read_len = wait_for_reply(from_lsa, to)) != 0) {
- t2 = monotonic_us();
- i = packet_ok(read_len, from_lsa, to, seq);
+ /* 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
printf(" (%d)", ip->ip_ttl);
/* time exceeded in transit */
- if (i == -1)
+ if (icmp_code == -1)
break;
- i--;
- switch (i) {
+ icmp_code--;
+ switch (icmp_code) {
#if ENABLE_TRACEROUTE6
case ICMP6_DST_UNREACH_NOPORT << 8:
got_there = 1;
++unreachable;
break;
default:
- printf(" !<%d>", i);
+ printf(" !<%d>", icmp_code);
++unreachable;
break;
}
break;
- }
+ } /* 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)
}
}
+ if (ENABLE_FEATURE_CLEAN_UP) {
+ free(to);
+ free(lastaddr);
+ free(from_lsa);
+ }
+
return 0;
}
projects / oweals / busybox.git / blobdiff