X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Fping.c;h=d0ef7ba62b7a5018acc2ce660928d57995fb86ed;hb=11d0096516c0d5395729caba5dfd940a10a6e20c;hp=8b70d9a33500b991075dd370c8435f0094252b54;hpb=9b49a5ed8551e46892af3f676e5d96d21b540e3c;p=oweals%2Fbusybox.git diff --git a/networking/ping.c b/networking/ping.c index 8b70d9a33..d0ef7ba62 100644 --- a/networking/ping.c +++ b/networking/ping.c @@ -11,7 +11,7 @@ * This code is derived from software contributed to Berkeley by * Mike Muuss. * - * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ /* from ping6.c: * Copyright (C) 1999 by Randolph Chung @@ -28,98 +28,210 @@ #include #include #include "libbb.h" +#include "common_bufsiz.h" + +#ifdef __BIONIC__ +/* should be in netinet/ip_icmp.h */ +# define ICMP_DEST_UNREACH 3 /* Destination Unreachable */ +# define ICMP_SOURCE_QUENCH 4 /* Source Quench */ +# define ICMP_REDIRECT 5 /* Redirect (change route) */ +# define ICMP_ECHO 8 /* Echo Request */ +# define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */ +# define ICMP_PARAMETERPROB 12 /* Parameter Problem */ +# define ICMP_TIMESTAMP 13 /* Timestamp Request */ +# define ICMP_TIMESTAMPREPLY 14 /* Timestamp Reply */ +# define ICMP_INFO_REQUEST 15 /* Information Request */ +# define ICMP_INFO_REPLY 16 /* Information Reply */ +# define ICMP_ADDRESS 17 /* Address Mask Request */ +# define ICMP_ADDRESSREPLY 18 /* Address Mask Reply */ +#endif + +//config:config PING +//config: bool "ping" +//config: default y +//config: select PLATFORM_LINUX +//config: help +//config: ping uses the ICMP protocol's mandatory ECHO_REQUEST datagram to +//config: elicit an ICMP ECHO_RESPONSE from a host or gateway. +//config: +//config:config PING6 +//config: bool "ping6" +//config: default y +//config: depends on FEATURE_IPV6 +//config: help +//config: This will give you a ping that can talk IPv6. +//config: +//config:config FEATURE_FANCY_PING +//config: bool "Enable fancy ping output" +//config: default y +//config: depends on PING || PING6 +//config: help +//config: Make the output from the ping applet include statistics, and at the +//config: same time provide full support for ICMP packets. + +/* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */ +//applet:IF_PING(APPLET(ping, BB_DIR_BIN, BB_SUID_MAYBE)) +//applet:IF_PING6(APPLET(ping6, BB_DIR_BIN, BB_SUID_MAYBE)) + +//kbuild:lib-$(CONFIG_PING) += ping.o +//kbuild:lib-$(CONFIG_PING6) += ping.o + +//usage:#if !ENABLE_FEATURE_FANCY_PING +//usage:# define ping_trivial_usage +//usage: "HOST" +//usage:# define ping_full_usage "\n\n" +//usage: "Send ICMP ECHO_REQUEST packets to network hosts" +//usage:# define ping6_trivial_usage +//usage: "HOST" +//usage:# define ping6_full_usage "\n\n" +//usage: "Send ICMP ECHO_REQUEST packets to network hosts" +//usage:#else +//usage:# define ping_trivial_usage +//usage: "[OPTIONS] HOST" +//usage:# define ping_full_usage "\n\n" +//usage: "Send ICMP ECHO_REQUEST packets to network hosts\n" +//usage: IF_PING6( +//usage: "\n -4,-6 Force IP or IPv6 name resolution" +//usage: ) +//usage: "\n -c CNT Send only CNT pings" +//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)" +//usage: "\n -t TTL Set TTL" +//usage: "\n -I IFACE/IP Use interface or IP address as source" +//usage: "\n -W SEC Seconds to wait for the first response (default:10)" +//usage: "\n (after all -c CNT packets are sent)" +//usage: "\n -w SEC Seconds until ping exits (default:infinite)" +//usage: "\n (can exit earlier with -c CNT)" +//usage: "\n -q Quiet, only display output at start" +//usage: "\n and when finished" +//usage: "\n -p Pattern to use for payload" +//usage: +//usage:# define ping6_trivial_usage +//usage: "[OPTIONS] HOST" +//usage:# define ping6_full_usage "\n\n" +//usage: "Send ICMP ECHO_REQUEST packets to network hosts\n" +//usage: "\n -c CNT Send only CNT pings" +//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)" +//usage: "\n -I IFACE/IP Use interface or IP address as source" +//usage: "\n -q Quiet, only display output at start" +//usage: "\n and when finished" +//usage: "\n -p Pattern to use for payload" +//usage: +//usage:#endif +//usage: +//usage:#define ping_example_usage +//usage: "$ ping localhost\n" +//usage: "PING slag (127.0.0.1): 56 data bytes\n" +//usage: "64 bytes from 127.0.0.1: icmp_seq=0 ttl=255 time=20.1 ms\n" +//usage: "\n" +//usage: "--- debian ping statistics ---\n" +//usage: "1 packets transmitted, 1 packets received, 0% packet loss\n" +//usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n" +//usage:#define ping6_example_usage +//usage: "$ ping6 ip6-localhost\n" +//usage: "PING ip6-localhost (::1): 56 data bytes\n" +//usage: "64 bytes from ::1: icmp6_seq=0 ttl=64 time=20.1 ms\n" +//usage: "\n" +//usage: "--- ip6-localhost ping statistics ---\n" +//usage: "1 packets transmitted, 1 packets received, 0% packet loss\n" +//usage: "round-trip min/avg/max = 20.1/20.1/20.1 ms\n" #if ENABLE_PING6 -#include +# include /* I see RENUMBERED constants in bits/in.h - !!? * What a fuck is going on with libc? Is it a glibc joke? */ -#ifdef IPV6_2292HOPLIMIT -#undef IPV6_HOPLIMIT -#define IPV6_HOPLIMIT IPV6_2292HOPLIMIT -#endif +# ifdef IPV6_2292HOPLIMIT +# undef IPV6_HOPLIMIT +# define IPV6_HOPLIMIT IPV6_2292HOPLIMIT +# endif #endif enum { DEFDATALEN = 56, MAXIPLEN = 60, MAXICMPLEN = 76, - MAXPACKET = 65468, MAX_DUP_CHK = (8 * 128), MAXWAIT = 10, PINGINTERVAL = 1, /* 1 second */ + pingsock = 0, }; -/* common routines */ - -static int in_cksum(unsigned short *buf, int sz) +static void +#if ENABLE_PING6 +create_icmp_socket(len_and_sockaddr *lsa) +#else +create_icmp_socket(void) +#define create_icmp_socket(lsa) create_icmp_socket() +#endif { - int nleft = sz; - int sum = 0; - unsigned short *w = buf; - unsigned short ans = 0; - - while (nleft > 1) { - sum += *w++; - nleft -= 2; - } - - if (nleft == 1) { - *(unsigned char *) (&ans) = *(unsigned char *) w; - sum += ans; + int sock; +#if ENABLE_PING6 + if (lsa->u.sa.sa_family == AF_INET6) + sock = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); + else +#endif + sock = socket(AF_INET, SOCK_RAW, 1); /* 1 == ICMP */ + if (sock < 0) { + if (errno == EPERM) + bb_error_msg_and_die(bb_msg_perm_denied_are_you_root); + bb_perror_msg_and_die(bb_msg_can_not_create_raw_socket); } - sum = (sum >> 16) + (sum & 0xFFFF); - sum += (sum >> 16); - ans = ~sum; - return ans; + xmove_fd(sock, pingsock); } #if !ENABLE_FEATURE_FANCY_PING -/* simple version */ +/* Simple version */ -static char *hostname; +struct globals { + char *hostname; + char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + uint16_t myid; +} FIX_ALIASING; +#define G (*(struct globals*)bb_common_bufsiz1) +#define INIT_G() do { setup_common_bufsiz(); } while (0) -static void noresp(int ign ATTRIBUTE_UNUSED) +static void noresp(int ign UNUSED_PARAM) { - printf("No response from %s\n", hostname); + printf("No response from %s\n", G.hostname); exit(EXIT_FAILURE); } static void ping4(len_and_sockaddr *lsa) { - struct sockaddr_in pingaddr; struct icmp *pkt; - int pingsock, c; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; + int c; - pingsock = create_icmp_socket(); - pingaddr = lsa->sin; - - pkt = (struct icmp *) packet; - memset(pkt, 0, sizeof(packet)); + pkt = (struct icmp *) G.packet; + /*memset(pkt, 0, sizeof(G.packet)); already is */ pkt->icmp_type = ICMP_ECHO; - pkt->icmp_cksum = in_cksum((unsigned short *) pkt, sizeof(packet)); + pkt->icmp_id = G.myid; + pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet)); - c = xsendto(pingsock, packet, DEFDATALEN + ICMP_MINLEN, - (struct sockaddr *) &pingaddr, sizeof(pingaddr)); + xsendto(pingsock, G.packet, DEFDATALEN + ICMP_MINLEN, &lsa->u.sa, lsa->len); /* listen for replies */ while (1) { +#if 0 struct sockaddr_in from; socklen_t fromlen = sizeof(from); - c = recvfrom(pingsock, packet, sizeof(packet), 0, + c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0, (struct sockaddr *) &from, &fromlen); +#else + c = recv(pingsock, G.packet, sizeof(G.packet), 0); +#endif if (c < 0) { if (errno != EINTR) bb_perror_msg("recvfrom"); continue; } if (c >= 76) { /* ip + icmp */ - struct iphdr *iphdr = (struct iphdr *) packet; + struct iphdr *iphdr = (struct iphdr *) G.packet; - pkt = (struct icmp *) (packet + (iphdr->ihl << 2)); /* skip ip hdr */ + pkt = (struct icmp *) (G.packet + (iphdr->ihl << 2)); /* skip ip hdr */ + if (pkt->icmp_id != G.myid) + continue; /* not our ping */ if (pkt->icmp_type == ICMP_ECHOREPLY) break; } @@ -131,39 +243,39 @@ static void ping4(len_and_sockaddr *lsa) #if ENABLE_PING6 static void ping6(len_and_sockaddr *lsa) { - struct sockaddr_in6 pingaddr; struct icmp6_hdr *pkt; - int pingsock, c; + int c; int sockopt; - char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN]; - pingsock = create_icmp6_socket(); - pingaddr = lsa->sin6; - - pkt = (struct icmp6_hdr *) packet; - memset(pkt, 0, sizeof(packet)); + pkt = (struct icmp6_hdr *) G.packet; + /*memset(pkt, 0, sizeof(G.packet)); already is */ pkt->icmp6_type = ICMP6_ECHO_REQUEST; + pkt->icmp6_id = G.myid; sockopt = offsetof(struct icmp6_hdr, icmp6_cksum); - setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt)); + setsockopt_int(pingsock, SOL_RAW, IPV6_CHECKSUM, sockopt); - c = xsendto(pingsock, packet, DEFDATALEN + sizeof (struct icmp6_hdr), - (struct sockaddr *) &pingaddr, sizeof(pingaddr)); + xsendto(pingsock, G.packet, DEFDATALEN + sizeof(struct icmp6_hdr), &lsa->u.sa, lsa->len); /* listen for replies */ while (1) { +#if 0 struct sockaddr_in6 from; socklen_t fromlen = sizeof(from); - c = recvfrom(pingsock, packet, sizeof(packet), 0, + c = recvfrom(pingsock, G.packet, sizeof(G.packet), 0, (struct sockaddr *) &from, &fromlen); +#else + c = recv(pingsock, G.packet, sizeof(G.packet), 0); +#endif if (c < 0) { if (errno != EINTR) bb_perror_msg("recvfrom"); continue; } - if (c >= 8) { /* icmp6_hdr */ - pkt = (struct icmp6_hdr *) packet; + if (c >= ICMP_MINLEN) { /* icmp6_hdr */ + if (pkt->icmp6_id != G.myid) + continue; /* not our ping */ if (pkt->icmp6_type == ICMP6_ECHO_REPLY) break; } @@ -173,13 +285,16 @@ static void ping6(len_and_sockaddr *lsa) } #endif -int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ping_main(int argc, char **argv) +#if !ENABLE_PING6 +# define common_ping_main(af, argv) common_ping_main(argv) +#endif +static int common_ping_main(sa_family_t af, char **argv) { len_and_sockaddr *lsa; -#if ENABLE_PING6 - sa_family_t af = AF_UNSPEC; + INIT_G(); + +#if ENABLE_PING6 while ((++argv)[0] && argv[0][0] == '-') { if (argv[0][1] == '4') { af = AF_INET; @@ -195,26 +310,28 @@ int ping_main(int argc, char **argv) argv++; #endif - hostname = *argv; - if (!hostname) + G.hostname = *argv; + if (!G.hostname) bb_show_usage(); #if ENABLE_PING6 - lsa = xhost_and_af2sockaddr(hostname, 0, af); + lsa = xhost_and_af2sockaddr(G.hostname, 0, af); #else - lsa = xhost_and_af2sockaddr(hostname, 0, AF_INET); + lsa = xhost_and_af2sockaddr(G.hostname, 0, AF_INET); #endif /* Set timer _after_ DNS resolution */ signal(SIGALRM, noresp); alarm(5); /* give the host 5000ms to respond */ + create_icmp_socket(lsa); + G.myid = (uint16_t) getpid(); #if ENABLE_PING6 - if (lsa->sa.sa_family == AF_INET6) + if (lsa->u.sa.sa_family == AF_INET6) ping6(lsa); else #endif ping4(lsa); - printf("%s is alive!\n", hostname); + printf("%s is alive!\n", G.hostname); return EXIT_SUCCESS; } @@ -222,29 +339,43 @@ int ping_main(int argc, char **argv) #else /* FEATURE_FANCY_PING */ -/* full(er) version */ +/* Full(er) version */ -#define OPT_STRING ("qvc:s:I:4" USE_PING6("6")) +#define OPT_STRING ("qvc:+s:t:+w:+W:+I:np:4" IF_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_t = 1 << 4, + OPT_w = 1 << 5, + OPT_W = 1 << 6, + OPT_I = 1 << 7, + /*OPT_n = 1 << 8, - ignored */ + OPT_p = 1 << 9, + OPT_IPV4 = 1 << 10, + OPT_IPV6 = (1 << 11) * ENABLE_PING6, }; struct globals { - int pingsock; + int if_index; + char *str_I; len_and_sockaddr *source_lsa; unsigned datalen; - int if_index; - unsigned long ntransmitted, nreceived, nrepeats, pingcount; + unsigned pingcount; /* must be int-sized */ + unsigned opt_ttl; + unsigned long ntransmitted, nreceived, nrepeats; uint16_t myid; + uint8_t pattern; unsigned tmin, tmax; /* in us */ unsigned long long tsum; /* in us, sum of all times */ + unsigned deadline; + unsigned timeout; + unsigned total_secs; + unsigned sizeof_rcv_packet; + char *rcv_packet; /* [datalen + MAXIPLEN + MAXICMPLEN] */ + void *snd_packet; /* [datalen + ipv4/ipv6_const] */ const char *hostname; const char *dotted; union { @@ -254,122 +385,154 @@ struct globals { struct sockaddr_in6 sin6; #endif } pingaddr; - char rcvd_tbl[MAX_DUP_CHK / 8]; -}; -#define G (*(struct globals*)&bb_common_bufsiz1) -#define pingsock (G.pingsock ) + unsigned char rcvd_tbl[MAX_DUP_CHK / 8]; +} FIX_ALIASING; +#define G (*(struct globals*)bb_common_bufsiz1) +#define if_index (G.if_index ) #define source_lsa (G.source_lsa ) +#define str_I (G.str_I ) #define datalen (G.datalen ) -#define if_index (G.if_index ) -#define ntransmitted (G.ntransmitted) -#define nreceived (G.nreceived ) -#define nrepeats (G.nrepeats ) #define pingcount (G.pingcount ) +#define opt_ttl (G.opt_ttl ) #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; \ + setup_common_bufsiz(); \ + BUILD_BUG_ON(sizeof(G) > COMMON_BUFSIZE); \ + datalen = DEFDATALEN; \ + timeout = MAXWAIT; \ tmin = UINT_MAX; \ } while (0) -#define A(bit) rcvd_tbl[(bit)>>3] /* identify byte in array */ -#define B(bit) (1 << ((bit) & 0x07)) /* identify bit in byte */ -#define SET(bit) (A(bit) |= B(bit)) -#define CLR(bit) (A(bit) &= (~B(bit))) -#define TST(bit) (A(bit) & B(bit)) - -/**************************************************************************/ +#define BYTE(bit) rcvd_tbl[(bit)>>3] +#define MASK(bit) (1 << ((bit) & 7)) +#define SET(bit) (BYTE(bit) |= MASK(bit)) +#define CLR(bit) (BYTE(bit) &= (~MASK(bit))) +#define TST(bit) (BYTE(bit) & MASK(bit)) -static void pingstats(int junk ATTRIBUTE_UNUSED) +static void print_stats_and_exit(int junk) NORETURN; +static void print_stats_and_exit(int junk UNUSED_PARAM) { + unsigned long ul; + unsigned long nrecv; + signal(SIGINT, SIG_IGN); - printf("\n--- %s ping statistics ---\n", hostname); - printf("%lu packets transmitted, ", ntransmitted); - printf("%lu packets received, ", nreceived); - if (nrepeats) - printf("%lu duplicates, ", nrepeats); - if (ntransmitted) - ntransmitted = (ntransmitted - nreceived) * 100 / ntransmitted; - printf("%lu%% packet loss\n", ntransmitted); + nrecv = G.nreceived; + printf("\n--- %s ping statistics ---\n" + "%lu packets transmitted, " + "%lu packets received, ", + hostname, G.ntransmitted, nrecv + ); + if (G.nrepeats) + printf("%lu duplicates, ", G.nrepeats); + ul = G.ntransmitted; + if (ul != 0) + ul = (ul - nrecv) * 100 / ul; + printf("%lu%% packet loss\n", ul); if (tmin != UINT_MAX) { - unsigned tavg = tsum / (nreceived + nrepeats); + unsigned tavg = tsum / (nrecv + G.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); } - exit(nreceived == 0); /* (nreceived == 0) is true (1) -- 'failure' */ + /* if condition is true, exit with 1 -- 'failure' */ + exit(nrecv == 0 || (deadline && nrecv < pingcount)); } -static void sendping_tail(void (*sp)(int), const void *pkt, int size_pkt) +static void sendping_tail(void (*sp)(int), int size_pkt) { int sz; - CLR((uint16_t)ntransmitted % MAX_DUP_CHK); - ntransmitted++; + CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK); + G.ntransmitted++; + + size_pkt += datalen; /* 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)); + sz = xsendto(pingsock, G.snd_packet, size_pkt, &pingaddr.sa, sizeof(pingaddr)); 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 || G.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 (G.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) +static void sendping4(int junk UNUSED_PARAM) { - /* +4 reserves a place for timestamp, which may end up sitting - * *after* packet. Saves one if() */ - struct icmp *pkt = alloca(datalen + ICMP_MINLEN + 4); + struct icmp *pkt = G.snd_packet; + memset(pkt, G.pattern, 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_code = 0;*/ + pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */ + pkt->icmp_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */ pkt->icmp_id = myid; - /* We don't do hton, because we will read it back on the same machine */ + /* If datalen < 4, we store timestamp _past_ the packet, + * but it's ok - we allocated 4 extra bytes in xzalloc() just in case. + */ /*if (datalen >= 4)*/ + /* No hton: we'll read it back on the same machine */ *(uint32_t*)&pkt->icmp_dun = monotonic_us(); - pkt->icmp_cksum = in_cksum((unsigned short *) pkt, datalen + ICMP_MINLEN); + pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, datalen + ICMP_MINLEN); - sendping_tail(sendping4, pkt, datalen + ICMP_MINLEN); + sendping_tail(sendping4, ICMP_MINLEN); } #if ENABLE_PING6 -static void sendping6(int junk ATTRIBUTE_UNUSED) +static void sendping6(int junk UNUSED_PARAM) { - struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4); + struct icmp6_hdr *pkt = G.snd_packet; + memset(pkt, G.pattern, 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_code = 0;*/ + /*pkt->icmp6_cksum = 0;*/ + pkt->icmp6_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */ pkt->icmp6_id = myid; /*if (datalen >= 4)*/ - *(uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us(); + *(bb__aliased_uint32_t*)(&pkt->icmp6_data8[4]) = monotonic_us(); - sendping_tail(sendping6, pkt, datalen + sizeof(struct icmp6_hdr)); + //TODO? pkt->icmp_cksum = inet_cksum(...); + + sendping_tail(sendping6, sizeof(struct icmp6_hdr)); } #endif @@ -425,11 +588,10 @@ static void unpack_tail(int sz, uint32_t *tp, const char *from_str, uint16_t recv_seq, int ttl) { + unsigned char *b, m; 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) */ @@ -441,11 +603,15 @@ static void unpack_tail(int sz, uint32_t *tp, tmax = triptime; } - if (TST(recv_seq % MAX_DUP_CHK)) { - ++nrepeats; - --nreceived; + b = &BYTE(recv_seq % MAX_DUP_CHK); + m = MASK(recv_seq % MAX_DUP_CHK); + /*if TST(recv_seq % MAX_DUP_CHK):*/ + if (*b & m) { + ++G.nrepeats; } else { - SET(recv_seq % MAX_DUP_CHK); + /*SET(recv_seq % MAX_DUP_CHK):*/ + *b |= m; + ++G.nreceived; dupmsg += 7; } @@ -457,7 +623,7 @@ static void unpack_tail(int sz, uint32_t *tp, if (tp) printf(" time=%u.%03u ms", triptime / 1000, triptime % 1000); puts(dupmsg); - fflush(stdout); + fflush_all(); } static void unpack4(char *buf, int sz, struct sockaddr_in *from) { @@ -513,7 +679,7 @@ static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimi 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, + inet_ntop(AF_INET6, &from->sin6_addr, buf, sizeof(buf)), recv_seq, hoplimit); } else if (icmppkt->icmp6_type != ICMP6_ECHO_REQUEST) { @@ -526,26 +692,31 @@ static void unpack6(char *packet, int sz, struct sockaddr_in6 *from, int hoplimi static void ping4(len_and_sockaddr *lsa) { - char packet[datalen + MAXIPLEN + MAXICMPLEN]; int sockopt; - pingsock = create_icmp_socket(); - pingaddr.sin = lsa->sin; + pingaddr.sin = lsa->u.sin; if (source_lsa) { if (setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_IF, - &source_lsa->sa, source_lsa->len)) + &source_lsa->u.sa, source_lsa->len)) bb_error_msg_and_die("can't set multicast source interface"); - xbind(pingsock, &source_lsa->sa, source_lsa->len); + xbind(pingsock, &source_lsa->u.sa, source_lsa->len); } /* enable broadcast pings */ setsockopt_broadcast(pingsock); - /* set recv buf for broadcast pings */ - sockopt = 48 * 1024; /* explain why 48k? */ - setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt)); + /* set recv buf (needed if we can get lots of responses: flood ping, + * broadcast ping etc) */ + sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */ + setsockopt_SOL_SOCKET_int(pingsock, SO_RCVBUF, sockopt); + + if (opt_ttl != 0) { + setsockopt_int(pingsock, IPPROTO_IP, IP_TTL, opt_ttl); + /* above doesnt affect packets sent to bcast IP, so... */ + setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl); + } - signal(SIGINT, pingstats); + signal(SIGINT, print_stats_and_exit); /* start the ping's going ... */ sendping4(0); @@ -556,34 +727,30 @@ static void ping4(len_and_sockaddr *lsa) socklen_t fromlen = (socklen_t) sizeof(from); int c; - c = recvfrom(pingsock, packet, sizeof(packet), 0, + c = recvfrom(pingsock, G.rcv_packet, G.sizeof_rcv_packet, 0, (struct sockaddr *) &from, &fromlen); if (c < 0) { if (errno != EINTR) bb_perror_msg("recvfrom"); continue; } - unpack4(packet, c, &from); - if (pingcount > 0 && nreceived >= pingcount) + unpack4(G.rcv_packet, c, &from); + if (pingcount && G.nreceived >= pingcount) break; } } #if ENABLE_PING6 -extern int BUG_bad_offsetof_icmp6_cksum(void); static void ping6(len_and_sockaddr *lsa) { - char packet[datalen + MAXIPLEN + MAXICMPLEN]; int sockopt; struct msghdr msg; struct sockaddr_in6 from; struct iovec iov; char control_buf[CMSG_SPACE(36)]; - pingsock = create_icmp6_socket(); - pingaddr.sin6 = lsa->sin6; - /* untested whether "-I addr" really works for IPv6: */ + pingaddr.sin6 = lsa->u.sin6; if (source_lsa) - xbind(pingsock, &source_lsa->sa, source_lsa->len); + xbind(pingsock, &source_lsa->u.sa, source_lsa->len); #ifdef ICMP6_FILTER { @@ -595,30 +762,30 @@ static void ping6(len_and_sockaddr *lsa) ICMP6_FILTER_SETPASSALL(&filt); } if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt, - sizeof(filt)) < 0) - bb_error_msg_and_die("setsockopt(ICMP6_FILTER)"); + sizeof(filt)) < 0) + bb_error_msg_and_die("setsockopt(%s)", "ICMP6_FILTER"); } #endif /*ICMP6_FILTER*/ /* enable broadcast pings */ setsockopt_broadcast(pingsock); - /* set recv buf for broadcast pings */ - sockopt = 48 * 1024; /* explain why 48k? */ - setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt)); + /* set recv buf (needed if we can get lots of responses: flood ping, + * broadcast ping etc) */ + sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */ + setsockopt_SOL_SOCKET_int(pingsock, SO_RCVBUF, sockopt); sockopt = offsetof(struct icmp6_hdr, icmp6_cksum); - if (offsetof(struct icmp6_hdr, icmp6_cksum) != 2) - BUG_bad_offsetof_icmp6_cksum(); - setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt)); + BUILD_BUG_ON(offsetof(struct icmp6_hdr, icmp6_cksum) != 2); + setsockopt_int(pingsock, SOL_RAW, IPV6_CHECKSUM, sockopt); /* request ttl info to be returned in ancillary data */ - setsockopt(pingsock, SOL_IPV6, IPV6_HOPLIMIT, &const_int_1, sizeof(const_int_1)); + setsockopt_1(pingsock, SOL_IPV6, IPV6_HOPLIMIT); 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); @@ -629,8 +796,8 @@ static void ping6(len_and_sockaddr *lsa) msg.msg_iov = &iov; msg.msg_iovlen = 1; msg.msg_control = control_buf; - iov.iov_base = packet; - iov.iov_len = sizeof(packet); + iov.iov_base = G.rcv_packet; + iov.iov_len = G.sizeof_rcv_packet; while (1) { int c; struct cmsghdr *mp; @@ -649,11 +816,12 @@ static void ping6(len_and_sockaddr *lsa) /* don't check len - we trust the kernel: */ /* && mp->cmsg_len >= CMSG_LEN(sizeof(int)) */ ) { - hoplimit = *(int*)CMSG_DATA(mp); + /*hoplimit = *(int*)CMSG_DATA(mp); - unaligned access */ + move_from_unaligned_int(hoplimit, CMSG_DATA(mp)); } } - unpack6(packet, c, &from, hoplimit); - if (pingcount > 0 && nreceived >= pingcount) + unpack6(G.rcv_packet, c, &from, hoplimit); + if (pingcount && G.nreceived >= pingcount) break; } } @@ -664,71 +832,102 @@ static void ping(len_and_sockaddr *lsa) printf("PING %s (%s)", hostname, dotted); if (source_lsa) { printf(" from %s", - xmalloc_sockaddr2dotted_noport(&source_lsa->sa)); + xmalloc_sockaddr2dotted_noport(&source_lsa->u.sa)); } printf(": %d data bytes\n", datalen); + create_icmp_socket(lsa); + /* untested whether "-I addr" really works for IPv6: */ + if (str_I) + setsockopt_bindtodevice(pingsock, str_I); + + G.sizeof_rcv_packet = datalen + MAXIPLEN + MAXICMPLEN; + G.rcv_packet = xzalloc(G.sizeof_rcv_packet); #if ENABLE_PING6 - if (lsa->sa.sa_family == AF_INET6) + if (lsa->u.sa.sa_family == AF_INET6) { + /* +4 reserves a place for timestamp, which may end up sitting + * _after_ packet. Saves one if() - see sendping4/6() */ + G.snd_packet = xzalloc(datalen + sizeof(struct icmp6_hdr) + 4); ping6(lsa); - else + } else #endif + { + G.snd_packet = xzalloc(datalen + ICMP_MINLEN + 4); ping4(lsa); + } } -int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ping_main(int argc, char **argv) +static int common_ping_main(int opt, char **argv) { len_and_sockaddr *lsa; - char *opt_c, *opt_s, *opt_I; - USE_PING6(sa_family_t af = AF_UNSPEC;) + char *str_s, *str_p; 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 */ + /* exactly one argument needed; -v and -q don't mix; -c NUM, -t NUM, -w NUM, -W NUM */ opt_complementary = "=1:q--v:v--q"; - getopt32(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 - if (option_mask32 & OPT_I) { // -I - if_index = if_nametoindex(opt_I); + opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_I, &str_p); + if (opt & OPT_s) + datalen = xatou16(str_s); // -s + if (opt & OPT_I) { // -I + if_index = if_nametoindex(str_I); if (!if_index) { /* TODO: I'm not sure it takes IPv6 unless in [XX:XX..] format */ - source_lsa = xdotted2sockaddr(opt_I, 0); + source_lsa = xdotted2sockaddr(str_I, 0); + str_I = NULL; /* don't try to bind to device later */ } } + if (opt & OPT_p) + G.pattern = xstrtou_range(str_p, 16, 0, 255); + myid = (uint16_t) getpid(); hostname = argv[optind]; #if ENABLE_PING6 - if (option_mask32 & OPT_IPV4) - af = AF_INET; - if (option_mask32 & OPT_IPV6) - af = AF_INET6; - lsa = xhost_and_af2sockaddr(hostname, 0, af); + { + sa_family_t af = AF_UNSPEC; + if (opt & OPT_IPV4) + af = AF_INET; + if (opt & OPT_IPV6) + af = AF_INET6; + lsa = xhost_and_af2sockaddr(hostname, 0, af); + } #else 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); + dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa); ping(lsa); - pingstats(0); - return EXIT_SUCCESS; + print_stats_and_exit(EXIT_SUCCESS); + /*return EXIT_SUCCESS;*/ } #endif /* FEATURE_FANCY_PING */ +#if ENABLE_PING +int ping_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int ping_main(int argc UNUSED_PARAM, char **argv) +{ +# if !ENABLE_FEATURE_FANCY_PING + return common_ping_main(AF_UNSPEC, argv); +# else + return common_ping_main(0, argv); +# endif +} +#endif + #if ENABLE_PING6 int ping6_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ping6_main(int argc, char **argv) +int ping6_main(int argc UNUSED_PARAM, char **argv) { - argv[0] = (char*)"-6"; - return ping_main(argc + 1, argv - 1); +# if !ENABLE_FEATURE_FANCY_PING + return common_ping_main(AF_INET6, argv); +# else + return common_ping_main(OPT_IPV6, argv); +# endif } #endif