#include <net/if.h>
#include <netinet/ip_icmp.h>
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_PING6
#include <netinet/icmp6.h>
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));
pkt->icmp_type = ICMP_ECHO;
pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
- c = sendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN, 0,
+ c = xsendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN,
(struct sockaddr *) &pingaddr, sizeof(pingaddr));
- if (c < 0) {
- if (ENABLE_FEATURE_CLEAN_UP)
- close(pingsock);
- bb_perror_msg_and_die("sendto");
- }
-
/* listen for replies */
while (1) {
struct sockaddr_in from;
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));
sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
- c = sendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr), 0,
+ c = xsendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr),
(struct sockaddr *) &pingaddr, sizeof(pingaddr));
- if (c < 0) {
- if (ENABLE_FEATURE_CLEAN_UP)
- close(pingsock);
- bb_perror_msg_and_die("sendto");
- }
-
/* listen for replies */
while (1) {
struct sockaddr_in6 from;
}
#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,
};
-static union {
- struct sockaddr sa;
- struct sockaddr_in sin;
+struct globals {
+ int pingsock;
+ int if_index;
+ char *opt_I;
+ len_and_sockaddr *source_lsa;
+ unsigned datalen;
+ unsigned long ntransmitted, nreceived, nrepeats, pingcount;
+ uint16_t myid;
+ 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 {
+ struct sockaddr sa;
+ struct sockaddr_in sin;
#if ENABLE_PING6
- struct sockaddr_in6 sin6;
+ struct sockaddr_in6 sin6;
#endif
-} pingaddr;
-static struct sockaddr_in sourceaddr;
-static int pingsock = -1;
-static unsigned datalen; /* intentionally uninitialized to work around gcc bug */
-
-static int if_index;
-
-static unsigned long ntransmitted, nreceived, nrepeats, pingcount;
-static int myid;
-static unsigned long tmin = ULONG_MAX, tmax, tsum;
-static char rcvd_tbl[MAX_DUP_CHK / 8];
+ } pingaddr;
+ char rcvd_tbl[MAX_DUP_CHK / 8];
+};
+#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 ntransmitted (G.ntransmitted)
+#define nreceived (G.nreceived )
+#define nrepeats (G.nrepeats )
+#define pingcount (G.pingcount )
+#define myid (G.myid )
+#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(); \
+ pingsock = -1; \
+ datalen = DEFDATALEN; \
+ timeout = MAXWAIT; \
+ tmin = UINT_MAX; \
+} while (0)
-static const char *hostname;
-static const char *dotted;
#define A(bit) rcvd_tbl[(bit)>>3] /* identify byte in array */
#define B(bit) (1 << ((bit) & 0x07)) /* identify bit in byte */
/**************************************************************************/
-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)
{
- int status;
-
signal(SIGINT, SIG_IGN);
printf("\n--- %s ping statistics ---\n", hostname);
if (ntransmitted)
ntransmitted = (ntransmitted - nreceived) * 100 / ntransmitted;
printf("%lu%% packet loss\n", ntransmitted);
- if (nreceived)
- printf("round-trip min/avg/max = %lu.%lu/%lu.%lu/%lu.%lu ms\n",
- tmin / 10, tmin % 10,
- (tsum / (nreceived + nrepeats)) / 10,
- (tsum / (nreceived + nrepeats)) % 10, tmax / 10, tmax % 10);
- if (nreceived != 0)
- status = EXIT_SUCCESS;
- else
- status = EXIT_FAILURE;
- exit(status);
+ 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), int sz, int sizeof_packet)
+static void sendping_tail(void (*sp)(int), const void *pkt, int size_pkt)
{
- if (sz < 0)
- bb_perror_msg_and_die("sendto");
- if (sz != sizeof_packet)
- bb_error_msg_and_die("ping wrote %d chars; %d expected", sz,
- sizeof_packet);
-
- signal(SIGALRM, sp);
- if (pingcount == 0 || ntransmitted < pingcount) { /* schedule next in 1s */
+ int sz;
+
+ CLR((uint16_t)ntransmitted % MAX_DUP_CHK);
+ ntransmitted++;
+
+ /* sizeof(pingaddr) can be larger than real sa size, but I think
+ * it doesn't matter */
+ sz = xsendto(pingsock, pkt, size_pkt, &pingaddr.sa, sizeof(pingaddr));
+ if (sz != size_pkt)
+ bb_error_msg_and_die(bb_msg_write_error);
+
+ 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;
- int i;
- char packet[datalen + ICMP_MINLEN];
-
- pkt = (struct icmp *) packet;
+ /* +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;
- CLR((uint16_t)ntransmitted % MAX_DUP_CHK);
- ntransmitted++;
- gettimeofday((struct timeval *) &pkt->icmp_dun, NULL);
- pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet));
+ /* 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();
- i = sendto(pingsock, packet, sizeof(packet), 0,
- &pingaddr.sa, sizeof(pingaddr.sin));
+ pkt->icmp_cksum = in_cksum((unsigned short *) pkt, datalen + ICMP_MINLEN);
- sendping_tail(sendping4, i, sizeof(packet));
+ sendping_tail(sendping4, pkt, datalen + ICMP_MINLEN);
}
#if ENABLE_PING6
static void sendping6(int junk ATTRIBUTE_UNUSED)
{
- struct icmp6_hdr *pkt;
- int i;
- char packet[datalen + sizeof (struct icmp6_hdr)];
-
- pkt = (struct icmp6_hdr *) packet;
+ 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;
- CLR((uint16_t)ntransmitted % MAX_DUP_CHK);
- ntransmitted++;
-
- gettimeofday((struct timeval *) &pkt->icmp6_data8[4], NULL);
- i = sendto(pingsock, packet, sizeof(packet), 0,
- &pingaddr.sa, sizeof(pingaddr.sin6));
+ /*if (datalen >= 4)*/
+ *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us();
- sendping_tail(sendping6, i, sizeof(packet));
+ sendping_tail(sendping6, pkt, datalen + sizeof(struct icmp6_hdr));
}
#endif
}
#endif
+static void unpack_tail(int sz, uint32_t *tp,
+ const char *from_str,
+ uint16_t recv_seq, int ttl)
+{
+ const char *dupmsg = " (DUP!)";
+ unsigned triptime = triptime; /* for gcc */
+
+ ++nreceived;
+
+ if (tp) {
+ /* (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;
+ if (triptime > tmax)
+ tmax = triptime;
+ }
+
+ if (TST(recv_seq % MAX_DUP_CHK)) {
+ ++nrepeats;
+ --nreceived;
+ } else {
+ SET(recv_seq % MAX_DUP_CHK);
+ dupmsg += 7;
+ }
+
+ if (option_mask32 & OPT_QUIET)
+ return;
+
+ printf("%d bytes from %s: seq=%u ttl=%d", sz,
+ from_str, recv_seq, ttl);
+ if (tp)
+ printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000);
+ puts(dupmsg);
+ fflush(stdout);
+}
static void unpack4(char *buf, int sz, struct sockaddr_in *from)
{
struct icmp *icmppkt;
struct iphdr *iphdr;
- struct timeval tv, *tp;
- int hlen, dupflag;
- unsigned long triptime;
-
- gettimeofday(&tv, NULL);
+ int hlen;
/* discard if too short */
if (sz < (datalen + ICMP_MINLEN))
if (icmppkt->icmp_type == ICMP_ECHOREPLY) {
uint16_t recv_seq = ntohs(icmppkt->icmp_seq);
- ++nreceived;
- tp = (struct timeval *) icmppkt->icmp_data;
-
- if ((tv.tv_usec -= tp->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);
- tsum += triptime;
- if (triptime < tmin)
- tmin = triptime;
- if (triptime > tmax)
- tmax = triptime;
-
- if (TST(recv_seq % MAX_DUP_CHK)) {
- ++nrepeats;
- --nreceived;
- dupflag = 1;
- } else {
- SET(recv_seq % MAX_DUP_CHK);
- dupflag = 0;
- }
-
- if (option_mask32 & OPT_QUIET)
- return;
-
- printf("%d bytes from %s: icmp_seq=%u", sz,
- inet_ntoa(*(struct in_addr *) &from->sin_addr.s_addr),
- recv_seq);
- printf(" ttl=%d", iphdr->ttl);
- printf(" time=%lu.%lu ms", triptime / 10, triptime % 10);
- if (dupflag)
- printf(" (DUP!)");
- puts("");
- } else {
- if (icmppkt->icmp_type != ICMP_ECHO)
- bb_error_msg("warning: got ICMP %d (%s)",
- icmppkt->icmp_type,
- icmp_type_name(icmppkt->icmp_type));
+ uint32_t *tp = NULL;
+
+ 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);
+ } else if (icmppkt->icmp_type != ICMP_ECHO) {
+ bb_error_msg("warning: got ICMP %d (%s)",
+ icmppkt->icmp_type,
+ icmp_type_name(icmppkt->icmp_type));
}
- fflush(stdout);
}
#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;
- struct timeval tv, *tp;
- int dupflag;
- unsigned long triptime;
char buf[INET6_ADDRSTRLEN];
- gettimeofday(&tv, NULL);
-
/* discard if too short */
if (sz < (datalen + sizeof(struct icmp6_hdr)))
return;
if (icmppkt->icmp6_type == ICMP6_ECHO_REPLY) {
uint16_t recv_seq = ntohs(icmppkt->icmp6_seq);
- ++nreceived;
- tp = (struct timeval *) &icmppkt->icmp6_data8[4];
-
- if ((tv.tv_usec -= tp->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);
- tsum += triptime;
- if (triptime < tmin)
- tmin = triptime;
- if (triptime > tmax)
- tmax = triptime;
-
- if (TST(recv_seq % MAX_DUP_CHK)) {
- ++nrepeats;
- --nreceived;
- dupflag = 1;
- } else {
- SET(recv_seq % MAX_DUP_CHK);
- dupflag = 0;
- }
-
- if (option_mask32 & OPT_QUIET)
- return;
-
- printf("%d bytes from %s: icmp6_seq=%u", sz,
- inet_ntop(AF_INET6, &pingaddr.sin6.sin6_addr,
- buf, sizeof(buf)),
- recv_seq);
- printf(" ttl=%d time=%lu.%lu ms", hoplimit,
- triptime / 10, triptime % 10);
- if (dupflag)
- printf(" (DUP!)");
- puts("");
- } else {
- if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST)
- bb_error_msg("warning: got ICMP %d (%s)",
- icmppkt->icmp6_type,
- icmp6_type_name(icmppkt->icmp6_type));
+ uint32_t *tp = NULL;
+
+ 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)),
+ recv_seq, hoplimit);
+ } else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) {
+ bb_error_msg("warning: got ICMP %d (%s)",
+ icmppkt->icmp6_type,
+ icmp6_type_name(icmppkt->icmp6_type));
}
- fflush(stdout);
}
#endif
int sockopt;
pingsock = create_icmp_socket();
- pingaddr.sin = lsa->sin;
- if (sourceaddr.sin_addr.s_addr) {
- xbind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr));
+ 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));
- printf("PING %s (%s)", hostname, dotted);
- if (sourceaddr.sin_addr.s_addr) {
- printf(" from %s",
- inet_ntoa(*(struct in_addr *) &sourceaddr.sin_addr.s_addr));
- }
- printf(": %d data bytes\n", datalen);
-
- 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;
- //if (sourceaddr.sin_addr.s_addr) {
- // xbind(pingsock, (struct sockaddr*)&sourceaddr, sizeof(sourceaddr));
- //}
+ pingaddr.sin6 = lsa->u.sin6;
+ /* untested whether "-I addr" really works for IPv6: */
+ if (source_lsa)
+ 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;
- printf("PING %s (%s): %d data bytes\n", hostname, dotted, datalen);
-
- 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;
}
}
#endif
-/* TODO: consolidate ether-wake.c, dnsd.c, ifupdown.c, nslookup.c
- * versions of below thing. BTW we have far too many "%u.%u.%u.%u" too...
-*/
-static int parse_nipquad(const char *str, struct sockaddr_in* addr)
+static void ping(len_and_sockaddr *lsa)
{
- char dummy;
- unsigned i1, i2, i3, i4;
- if (sscanf(str, "%u.%u.%u.%u%c",
- &i1, &i2, &i3, &i4, &dummy) == 4
- && ( (i1|i2|i3|i4) <= 0xff )
- ) {
- uint8_t* ptr = (uint8_t*)&addr->sin_addr;
- ptr[0] = i1;
- ptr[1] = i2;
- ptr[2] = i3;
- ptr[3] = i4;
- return 0;
+ printf("PING %s (%s)", hostname, dotted);
+ if (source_lsa) {
+ printf(" from %s",
+ xmalloc_sockaddr2dotted_noport(&source_lsa->u.sa));
}
- return 1; /* error */
+ printf(": %d data bytes\n", datalen);
+
+#if ENABLE_PING6
+ 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;)
- datalen = DEFDATALEN; /* initialized here rather than in global scope to work around gcc bug */
+ INIT_G();
- /* 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)
- if (parse_nipquad(opt_I, &sourceaddr))
- bb_show_usage();
+ if (!if_index) {
+ /* TODO: I'm not sure it takes IPv6 unless in [XX:XX..] format */
+ source_lsa = xdotted2sockaddr(opt_I, 0);
+ opt_I = NULL; /* don't try to bind to device later */
+ }
}
- myid = (int16_t) getpid();
+ myid = (uint16_t) getpid();
hostname = argv[optind];
#if ENABLE_PING6
if (option_mask32 & OPT_IPV4)
#else
lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET);
#endif
- dotted = xmalloc_sockaddr2dotted_noport(&lsa->sa, lsa->len);
-#if ENABLE_PING6
- if (lsa->sa.sa_family == AF_INET6)
- ping6(lsa);
- else
-#endif
- ping4(lsa);
- pingstats(0);
- return EXIT_SUCCESS;
+
+ 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->u.sa);
+ ping(lsa);
+ 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