char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
pingsock = create_icmp_socket();
- pingaddr = lsa->sin;
+ pingaddr = lsa->u.sin;
pkt = (struct icmp *) packet;
memset(pkt, 0, sizeof(packet));
char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
pingsock = create_icmp6_socket();
- pingaddr = lsa->sin6;
+ pingaddr = lsa->u.sin6;
pkt = (struct icmp6_hdr *) packet;
memset(pkt, 0, sizeof(packet));
}
#endif
-int ping_main(int argc, char **argv);
-int ping_main(int argc, char **argv)
+int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ping_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
len_and_sockaddr *lsa;
#if ENABLE_PING6
sa_family_t af = AF_UNSPEC;
- while (++argv[0][0] == '-') {
+
+ while ((++argv)[0] && argv[0][0] == '-') {
if (argv[0][1] == '4') {
af = AF_INET;
continue;
alarm(5); /* give the host 5000ms to respond */
#if ENABLE_PING6
- if (lsa->sa.sa_family == AF_INET6)
+ if (lsa->u.sa.sa_family == AF_INET6)
ping6(lsa);
else
#endif
/* full(er) version */
-#define OPT_STRING ("qvc:s:I:4" USE_PING6("6"))
+#define OPT_STRING ("qvc:s:w:W:I:4" USE_PING6("6"))
enum {
OPT_QUIET = 1 << 0,
OPT_VERBOSE = 1 << 1,
OPT_c = 1 << 2,
OPT_s = 1 << 3,
- OPT_I = 1 << 4,
- OPT_IPV4 = 1 << 5,
- OPT_IPV6 = (1 << 6) * ENABLE_PING6,
+ OPT_w = 1 << 4,
+ OPT_W = 1 << 5,
+ OPT_I = 1 << 6,
+ OPT_IPV4 = 1 << 7,
+ OPT_IPV6 = (1 << 8) * ENABLE_PING6,
};
struct globals {
int pingsock;
+ int if_index;
+ char *opt_I;
len_and_sockaddr *source_lsa;
unsigned datalen;
- int if_index;
unsigned long ntransmitted, nreceived, nrepeats, pingcount;
uint16_t myid;
- unsigned tmin, tmax;
- unsigned long tsum;
+ unsigned tmin, tmax; /* in us */
+ unsigned long long tsum; /* in us, sum of all times */
+ unsigned deadline;
+ unsigned timeout;
+ unsigned total_secs;
const char *hostname;
const char *dotted;
union {
};
#define G (*(struct globals*)&bb_common_bufsiz1)
#define pingsock (G.pingsock )
+#define if_index (G.if_index )
#define source_lsa (G.source_lsa )
+#define opt_I (G.opt_I )
#define datalen (G.datalen )
-#define if_index (G.if_index )
#define ntransmitted (G.ntransmitted)
#define nreceived (G.nreceived )
#define nrepeats (G.nrepeats )
#define tmin (G.tmin )
#define tmax (G.tmax )
#define tsum (G.tsum )
+#define deadline (G.deadline )
+#define timeout (G.timeout )
+#define total_secs (G.total_secs )
#define hostname (G.hostname )
#define dotted (G.dotted )
#define pingaddr (G.pingaddr )
#define rcvd_tbl (G.rcvd_tbl )
void BUG_ping_globals_too_big(void);
#define INIT_G() do { \
- if (sizeof(G) > COMMON_BUFSIZE) \
- BUG_ping_globals_too_big(); \
+ if (sizeof(G) > COMMON_BUFSIZE) \
+ BUG_ping_globals_too_big(); \
pingsock = -1; \
+ datalen = DEFDATALEN; \
+ timeout = MAXWAIT; \
tmin = UINT_MAX; \
} while (0)
/**************************************************************************/
-static void pingstats(int junk ATTRIBUTE_UNUSED)
+static void print_stats_and_exit(int junk) ATTRIBUTE_NORETURN;
+static void print_stats_and_exit(int junk ATTRIBUTE_UNUSED)
{
signal(SIGINT, SIG_IGN);
if (ntransmitted)
ntransmitted = (ntransmitted - nreceived) * 100 / ntransmitted;
printf("%lu%% packet loss\n", ntransmitted);
- if (tmin != UINT_MAX)
- printf("round-trip min/avg/max = %u.%u/%lu.%lu/%u.%u ms\n",
- tmin / 10, tmin % 10,
- (tsum / (nreceived + nrepeats)) / 10,
- (tsum / (nreceived + nrepeats)) % 10, tmax / 10, tmax % 10);
- exit(nreceived == 0); /* (nreceived == 0) is true (1) -- 'failure' */
+ if (tmin != UINT_MAX) {
+ unsigned tavg = tsum / (nreceived + nrepeats);
+ printf("round-trip min/avg/max = %u.%03u/%u.%03u/%u.%03u ms\n",
+ tmin / 1000, tmin % 1000,
+ tavg / 1000, tavg % 1000,
+ tmax / 1000, tmax % 1000);
+ }
+ /* if condition is true, exit with 1 -- 'failure' */
+ exit(nreceived == 0 || (deadline && nreceived < pingcount));
}
static void sendping_tail(void (*sp)(int), const void *pkt, int size_pkt)
if (sz != size_pkt)
bb_error_msg_and_die(bb_msg_write_error);
- signal(SIGALRM, sp);
- if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */
+ if (pingcount == 0 || deadline || ntransmitted < pingcount) {
+ /* Didn't send all pings yet - schedule next in 1s */
+ signal(SIGALRM, sp);
+ if (deadline) {
+ total_secs += PINGINTERVAL;
+ if (total_secs >= deadline)
+ signal(SIGALRM, print_stats_and_exit);
+ }
alarm(PINGINTERVAL);
- } else { /* done, wait for the last ping to come back */
- /* todo, don't necessarily need to wait so long... */
- signal(SIGALRM, pingstats);
- alarm(MAXWAIT);
+ } else { /* -c NN, and all NN are sent (and no deadline) */
+ /* Wait for the last ping to come back.
+ * -W timeout: wait for a response in seconds.
+ * Affects only timeout in absense of any responses,
+ * otherwise ping waits for two RTTs. */
+ unsigned expire = timeout;
+
+ if (nreceived) {
+ /* approx. 2*tmax, in seconds (2 RTT) */
+ expire = tmax / (512*1024);
+ if (expire == 0)
+ expire = 1;
+ }
+ signal(SIGALRM, print_stats_and_exit);
+ alarm(expire);
}
}
static void sendping4(int junk ATTRIBUTE_UNUSED)
{
- struct icmp *pkt = alloca(datalen + ICMP_MINLEN);
+ /* +4 reserves a place for timestamp, which may end up sitting
+ * *after* packet. Saves one if() */
+ struct icmp *pkt = alloca(datalen + ICMP_MINLEN + 4);
pkt->icmp_type = ICMP_ECHO;
pkt->icmp_code = 0;
pkt->icmp_cksum = 0;
pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp_id = myid;
- gettimeofday((struct timeval *) &pkt->icmp_dun, NULL);
+
+ /* We don't do hton, because we will read it back on the same machine */
+ /*if (datalen >= 4)*/
+ *(uint32_t*)&pkt->icmp_dun = monotonic_us();
+
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, datalen + ICMP_MINLEN);
sendping_tail(sendping4, pkt, datalen + ICMP_MINLEN);
#if ENABLE_PING6
static void sendping6(int junk ATTRIBUTE_UNUSED)
{
- struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr));
+ struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
pkt->icmp6_type = ICMP6_ECHO_REQUEST;
pkt->icmp6_code = 0;
pkt->icmp6_cksum = 0;
pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp6_id = myid;
- gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL);
+
+ /*if (datalen >= 4)*/
+ *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
sendping_tail(sendping6, pkt, datalen + sizeof(struct icmp6_hdr));
}
}
#endif
-static void unpack_tail(int sz, struct timeval *tp,
+static void unpack_tail(int sz, uint32_t *tp,
const char *from_str,
uint16_t recv_seq, int ttl)
{
++nreceived;
if (tp) {
- struct timeval tv;
-
- gettimeofday(&tv, NULL);
- tv.tv_usec -= tp->tv_usec;
- if (tv.tv_usec < 0) {
- --tv.tv_sec;
- tv.tv_usec += 1000000;
- }
- tv.tv_sec -= tp->tv_sec;
-
- triptime = tv.tv_sec * 10000 + (tv.tv_usec / 100);
+ /* (int32_t) cast is for hypothetical 64-bit unsigned */
+ /* (doesn't hurt 32-bit real-world anyway) */
+ triptime = (int32_t) ((uint32_t)monotonic_us() - *tp);
tsum += triptime;
if (triptime < tmin)
tmin = triptime;
printf("%d bytes from %s: seq=%u ttl=%d", sz,
from_str, recv_seq, ttl);
if (tp)
- printf(" time=%u.%u ms", triptime / 10, triptime % 10);
+ printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000);
puts(dupmsg);
fflush(stdout);
}
if (icmppkt->icmp_type == ICMP_ECHOREPLY) {
uint16_t recv_seq = ntohs(icmppkt->icmp_seq);
- struct timeval *tp = NULL;
+ uint32_t *tp = NULL;
- if (sz >= ICMP_MINLEN + sizeof(struct timeval))
- tp = (struct timeval *) icmppkt->icmp_data;
+ if (sz >= ICMP_MINLEN + sizeof(uint32_t))
+ tp = (uint32_t *) icmppkt->icmp_data;
unpack_tail(sz, tp,
inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
recv_seq, iphdr->ttl);
}
}
#if ENABLE_PING6
-static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimit)
+static void unpack6(char *packet, int sz, /*struct sockaddr_in6 *from,*/ int hoplimit)
{
struct icmp6_hdr *icmppkt;
char buf[INET6_ADDRSTRLEN];
if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
uint16_t recv_seq = ntohs(icmppkt->icmp6_seq);
- struct timeval *tp = NULL;
+ uint32_t *tp = NULL;
- if (sz >= sizeof(struct icmp6_hdr) + sizeof(struct timeval))
- tp = (struct timeval *) &icmppkt->icmp6_data8[4];
+ if (sz >= sizeof(struct icmp6_hdr) + sizeof(uint32_t))
+ tp = (uint32_t *) &icmppkt->icmp6_data8[4];
unpack_tail(sz, tp,
inet_ntop(AF_INET6, &pingaddr.sin6.sin6_addr,
buf, sizeof(buf)),
int sockopt;
pingsock = create_icmp_socket();
- pingaddr.sin = lsa->sin;
- if (source_lsa)
- xbind(pingsock, &lsa->sa, lsa->len);
+ pingaddr.sin = lsa->u.sin;
+ if (source_lsa) {
+ if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF,
+ &source_lsa->u.sa, source_lsa->len))
+ bb_error_msg_and_die("can't set multicast source interface");
+ xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+ }
+ if (opt_I)
+ setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, opt_I, strlen(opt_I) + 1);
/* enable broadcast pings */
setsockopt_broadcast(pingsock);
sockopt = 48 * 1024; /* explain why 48k? */
setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
- signal(SIGINT, pingstats);
+ signal(SIGINT, print_stats_and_exit);
/* start the ping's going ... */
sendping4(0);
continue;
}
unpack4(packet, c, &from);
- if (pingcount > 0 && nreceived >= pingcount)
+ if (pingcount && nreceived >= pingcount)
break;
}
}
char control_buf[CMSG_SPACE(36)];
pingsock = create_icmp6_socket();
- pingaddr.sin6 = lsa->sin6;
+ pingaddr.sin6 = lsa->u.sin6;
/* untested whether "-I addr" really works for IPv6: */
if (source_lsa)
- xbind(pingsock, &lsa->sa, lsa->len);
+ xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
+ if (opt_I)
+ setsockopt(pingsock, SOL_SOCKET, SO_BINDTODEVICE, opt_I, strlen(opt_I) + 1);
#ifdef ICMP6_FILTER
{
if (if_index)
pingaddr.sin6.sin6_scope_id = if_index;
- signal(SIGINT, pingstats);
+ signal(SIGINT, print_stats_and_exit);
/* start the ping's going ... */
sendping6(0);
hoplimit = *(int*)CMSG_DATA(mp);
}
}
- unpack6(packet, c, &from, hoplimit);
- if (pingcount > 0 && nreceived >= pingcount)
+ unpack6(packet, c, /*&from,*/ hoplimit);
+ if (pingcount && nreceived >= pingcount)
break;
}
}
printf("PING %s (%s)", hostname, dotted);
if (source_lsa) {
printf(" from %s",
- xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len));
+ xmalloc_sockaddr2dotted_noport(&source_lsa->u.sa));
}
printf(": %d data bytes\n", datalen);
#if ENABLE_PING6
- if (lsa->sa.sa_family == AF_INET6)
+ if (lsa->u.sa.sa_family == AF_INET6)
ping6(lsa);
else
#endif
ping4(lsa);
}
-int ping_main(int argc, char **argv);
-int ping_main(int argc, char **argv)
+int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ping_main(int argc ATTRIBUTE_UNUSED, char **argv)
{
len_and_sockaddr *lsa;
- char *opt_c, *opt_s, *opt_I;
+ char *opt_c, *opt_s;
USE_PING6(sa_family_t af = AF_UNSPEC;)
INIT_G();
- datalen = DEFDATALEN; /* initialized here rather than in global scope to work around gcc bug */
-
- /* exactly one argument needed, -v and -q don't mix */
- opt_complementary = "=1:q--v:v--q";
- getopt32(argc, argv, OPT_STRING, &opt_c, &opt_s, &opt_I);
- if (option_mask32 & OPT_c) pingcount = xatoul(opt_c); // -c
- if (option_mask32 & OPT_s) datalen = xatou16(opt_s); // -s
+ /* exactly one argument needed; -v and -q don't mix; -w NUM, -W NUM */
+ opt_complementary = "=1:q--v:v--q:w+:W+";
+ getopt32(argv, OPT_STRING, &opt_c, &opt_s, &deadline, &timeout, &opt_I);
+ if (option_mask32 & OPT_c)
+ pingcount = xatoul(opt_c); // -c
+ if (option_mask32 & OPT_s)
+ datalen = xatou16(opt_s); // -s
if (option_mask32 & OPT_I) { // -I
if_index = if_nametoindex(opt_I);
if (!if_index) {
/* TODO: I'm not sure it takes IPv6 unless in [XX:XX..] format */
- /* (ping doesn't support source IPv6 addresses yet anyway) */
source_lsa = xdotted2sockaddr(opt_I, 0);
+ opt_I = NULL; /* don't try to bind to device later */
}
}
myid = (uint16_t) getpid();
lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
#endif
- if (source_lsa && source_lsa->sa.sa_family != lsa->sa.sa_family)
+ if (source_lsa && source_lsa->u.sa.sa_family != lsa->u.sa.sa_family)
/* leaking it here... */
source_lsa = NULL;
- dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len);
+ dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
ping(lsa);
- pingstats(0);
- return EXIT_SUCCESS;
+ print_stats_and_exit(0);
+ /*return EXIT_SUCCESS;*/
}
#endif /* FEATURE_FANCY_PING */
#if ENABLE_PING6
-int ping6_main(int argc, char **argv);
+int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ping6_main(int argc, char **argv)
{
argv[0] = (char*)"-6";
projects / oweals / busybox.git / blobdiff