Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/ping.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/ping.c (modified) (40 diffs)

branches/3.3/mindi-busybox/networking/ping.c

@@ -29 +29 @@
 #include <netinet/ip_icmp.h>
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 #ifdef __BIONIC__
@@ -90 +91 @@
 //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)"
@@ -99 +102 @@
 //usage:     "\n    -w SEC      Seconds until ping exits (default:infinite)"
 //usage:     "\n            (can exit earlier with -c CNT)"
-//usage:     "\n    -q      Quiet, only displays output at start"
+//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
@@ -109 +113 @@
 //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 displays output at start"
+//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
@@ -148 +153 @@
     MAXWAIT = 10,
     PINGINTERVAL = 1, /* 1 second */
+    pingsock = 0,
 };
+
+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 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);
+    }
+
+    xmove_fd(sock, pingsock);
+}
 
 #if !ENABLE_FEATURE_FANCY_PING
@@ -158 +188 @@
     char packet[DEFDATALEN + MAXIPLEN + MAXICMPLEN];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define INIT_G() do { } while (0)
+#define G (*(struct globals*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void noresp(int ign UNUSED_PARAM)
@@ -170 +200 @@
 {
     struct icmp *pkt;
-    int pingsock, c;
-
-    pingsock = create_icmp_socket();
+    int c;
 
     pkt = (struct icmp *) G.packet;
-    memset(pkt, 0, sizeof(G.packet));
+    /*memset(pkt, 0, sizeof(G.packet)); already is */
     pkt->icmp_type = ICMP_ECHO;
     pkt->icmp_cksum = inet_cksum((uint16_t *) pkt, sizeof(G.packet));
@@ -183 +211 @@
     /* listen for replies */
     while (1) {
+#if 0
         struct sockaddr_in from;
         socklen_t fromlen = sizeof(from);
@@ -188 +217 @@
         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)
@@ -209 +241 @@
 {
     struct icmp6_hdr *pkt;
-    int pingsock, c;
+    int c;
     int sockopt;
 
-    pingsock = create_icmp6_socket();
-
     pkt = (struct icmp6_hdr *) G.packet;
-    memset(pkt, 0, sizeof(G.packet));
+    /*memset(pkt, 0, sizeof(G.packet)); already is */
     pkt->icmp6_type = ICMP6_ECHO_REQUEST;
 
     sockopt = offsetof(struct icmp6_hdr, icmp6_cksum);
-    setsockopt(pingsock, SOL_RAW, IPV6_CHECKSUM, &sockopt, sizeof(sockopt));
+    setsockopt_int(pingsock, SOL_RAW, IPV6_CHECKSUM, sockopt);
 
     xsendto(pingsock, G.packet, DEFDATALEN + sizeof(struct icmp6_hdr), &lsa->u.sa, lsa->len);
@@ -225 +255 @@
     /* listen for replies */
     while (1) {
+#if 0
         struct sockaddr_in6 from;
         socklen_t fromlen = sizeof(from);
@@ -230 +261 @@
         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)
@@ -235 +269 @@
             continue;
         }
-        if (c >= ICMP_MINLEN) {         /* icmp6_hdr */
-            pkt = (struct icmp6_hdr *) G.packet;
+        if (c >= ICMP_MINLEN) { /* icmp6_hdr */
             if (pkt->icmp6_type == ICMP6_ECHO_REPLY)
                 break;
@@ -284 +317 @@
     alarm(5); /* give the host 5000ms to respond */
 
+    create_icmp_socket(lsa);
 #if ENABLE_PING6
     if (lsa->u.sa.sa_family == AF_INET6)
@@ -300 +334 @@
 /* Full(er) version */
 
-#define OPT_STRING ("qvc:s:t:w:W:I:4" IF_PING6("6"))
+#define OPT_STRING ("qvc:s:t:w:W:I:np:4" IF_PING6("6"))
 enum {
     OPT_QUIET = 1 << 0,
@@ -310 +344 @@
     OPT_W = 1 << 6,
     OPT_I = 1 << 7,
-    OPT_IPV4 = 1 << 8,
-    OPT_IPV6 = (1 << 9) * ENABLE_PING6,
+    /*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;
@@ -325 +360 @@
     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 */
@@ -342 +378 @@
 #endif
     } pingaddr;
-    char rcvd_tbl[MAX_DUP_CHK / 8];
+    unsigned char rcvd_tbl[MAX_DUP_CHK / 8];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define pingsock     (G.pingsock    )
+#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 ntransmitted (G.ntransmitted)
-#define nreceived    (G.nreceived   )
-#define nrepeats     (G.nrepeats    )
 #define pingcount    (G.pingcount   )
 #define opt_ttl      (G.opt_ttl     )
@@ -366 +398 @@
 #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; \
@@ -377 +407 @@
 
 
-#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 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,
@@ -406 +441 @@
     }
     /* if condition is true, exit with 1 -- 'failure' */
-    exit(nreceived == 0 || (deadline && nreceived < pingcount));
+    exit(nrecv == 0 || (deadline && nrecv < pingcount));
 }
 
@@ -413 +448 @@
     int sz;
 
-    CLR((uint16_t)ntransmitted % MAX_DUP_CHK);
-    ntransmitted++;
+    CLR((uint16_t)G.ntransmitted % MAX_DUP_CHK);
+    G.ntransmitted++;
 
     size_pkt += datalen;
@@ -424 +459 @@
         bb_error_msg_and_die(bb_msg_write_error);
 
-    if (pingcount == 0 || deadline || ntransmitted < pingcount) {
+    if (pingcount == 0 || deadline || G.ntransmitted < pingcount) {
         /* Didn't send all pings yet - schedule next in 1s */
         signal(SIGALRM, sp);
@@ -440 +475 @@
         unsigned expire = timeout;
 
-        if (nreceived) {
+        if (G.nreceived) {
             /* approx. 2*tmax, in seconds (2 RTT) */
             expire = tmax / (512*1024);
@@ -455 +490 @@
     struct icmp *pkt = G.snd_packet;
 
-    //memset(pkt, 0, datalen + ICMP_MINLEN + 4); - G.snd_packet was xzalloced
+    memset(pkt, G.pattern, datalen + ICMP_MINLEN + 4);
     pkt->icmp_type = ICMP_ECHO;
     /*pkt->icmp_code = 0;*/
     pkt->icmp_cksum = 0; /* cksum is calculated with this field set to 0 */
-    pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
+    pkt->icmp_seq = htons(G.ntransmitted); /* don't ++ here, it can be a macro */
     pkt->icmp_id = myid;
 
@@ -478 +513 @@
     struct icmp6_hdr *pkt = G.snd_packet;
 
-    //memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
+    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_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();
 
     //TODO? pkt->icmp_cksum = inet_cksum(...);
@@ -546 +581 @@
         uint16_t recv_seq, int ttl)
 {
+    unsigned char *b, m;
     const char *dupmsg = " (DUP!)";
     unsigned triptime = triptime; /* for gcc */
-
-    ++nreceived;
 
     if (tp) {
@@ -562 +596 @@
     }
 
-    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;
     }
@@ -649 +687 @@
     int sockopt;
 
-    pingsock = create_icmp_socket();
     pingaddr.sin = lsa->u.sin;
     if (source_lsa) {
@@ -657 +694 @@
         xbind(pingsock, &source_lsa->u.sa, source_lsa->len);
     }
-    if (str_I)
-        setsockopt_bindtodevice(pingsock, str_I);
 
     /* enable broadcast pings */
@@ -666 +701 @@
      * broadcast ping etc) */
     sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
-    setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
+    setsockopt_SOL_SOCKET_int(pingsock, SO_RCVBUF, sockopt);
 
     if (opt_ttl != 0) {
-        setsockopt(pingsock, IPPROTO_IP, IP_TTL, &opt_ttl, sizeof(opt_ttl));
+        setsockopt_int(pingsock, IPPROTO_IP, IP_TTL, opt_ttl);
         /* above doesnt affect packets sent to bcast IP, so... */
-        setsockopt(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, &opt_ttl, sizeof(opt_ttl));
+        setsockopt_int(pingsock, IPPROTO_IP, IP_MULTICAST_TTL, opt_ttl);
     }
 
@@ -693 +728 @@
         }
         unpack4(G.rcv_packet, c, &from);
-        if (pingcount && nreceived >= pingcount)
+        if (pingcount && G.nreceived >= pingcount)
             break;
     }
 }
 #if ENABLE_PING6
-extern int BUG_bad_offsetof_icmp6_cksum(void);
 static void ping6(len_and_sockaddr *lsa)
 {
@@ -707 +741 @@
     char control_buf[CMSG_SPACE(36)];
 
-    pingsock = create_icmp6_socket();
     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 (str_I)
-        setsockopt_bindtodevice(pingsock, str_I);
 
 #ifdef ICMP6_FILTER
@@ -726 +756 @@
         if (setsockopt(pingsock, IPPROTO_ICMPV6, ICMP6_FILTER, &filt,
                     sizeof(filt)) < 0)
-            bb_error_msg_and_die("setsockopt(ICMP6_FILTER)");
+            bb_error_msg_and_die("setsockopt(%s)", "ICMP6_FILTER");
     }
 #endif /*ICMP6_FILTER*/
@@ -736 +766 @@
      * broadcast ping etc) */
     sockopt = (datalen * 2) + 7 * 1024; /* giving it a bit of extra room */
-    setsockopt(pingsock, SOL_SOCKET, SO_RCVBUF, &sockopt, sizeof(sockopt));
+    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)
@@ -785 +814 @@
         }
         unpack6(G.rcv_packet, c, &from, hoplimit);
-        if (pingcount && nreceived >= pingcount)
+        if (pingcount && G.nreceived >= pingcount)
             break;
     }
@@ -799 +828 @@
     }
     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;
@@ -819 +853 @@
 {
     len_and_sockaddr *lsa;
-    char *str_s;
+    char *str_s, *str_p;
 
     INIT_G();
@@ -825 +859 @@
     /* 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:c+:t+:w+:W+";
-    opt |= getopt32(argv, OPT_STRING, &pingcount, &str_s, &opt_ttl, &deadline, &timeout, &str_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
@@ -836 +870 @@
         }
     }
+    if (opt & OPT_p)
+        G.pattern = xstrtou_range(str_p, 16, 0, 255);
+
     myid = (uint16_t) getpid();
     hostname = argv[optind];