Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/arping.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/arping.c (modified) (22 diffs)

branches/2.2.5/mindi-busybox/networking/arping.c

@@ -9 +9 @@
  */
 
-#include <sys/ioctl.h>
-#include <signal.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 #include <arpa/inet.h>
 #include <net/if.h>
@@ -22 +14 @@
 #include <netpacket/packet.h>
 
-#include "busybox.h"
+#include "libbb.h"
+
+/* We don't expect to see 1000+ seconds delay, unsigned is enough */
+#define MONOTONIC_US() ((unsigned)monotonic_us())
 
 static struct in_addr src;
@@ -28 +23 @@
 static struct sockaddr_ll me;
 static struct sockaddr_ll he;
-static struct timeval last;
-
-enum cfg_e {
-    dad = 1,
-    unsolicited = 2,
-    advert = 4,
-    quiet = 8,
-    quit_on_reply = 16,
-    broadcast_only = 32,
-    unicasting = 64
+static unsigned last;
+
+enum {
+    DAD = 1,
+    UNSOLICITED = 2,
+    ADVERT = 4,
+    QUIET = 8,
+    QUIT_ON_REPLY = 16,
+    BCAST_ONLY = 32,
+    UNICASTING = 64
 };
-static int cfg;
-
-static int s;
-static int count = -1;
-static int timeout;
-static int sent;
-static int brd_sent;
-static int received;
-static int brd_recv;
-static int req_recv;
-
-
-#define MS_TDIFF(tv1,tv2) ( ((tv1).tv_sec-(tv2).tv_sec)*1000 + \
-               ((tv1).tv_usec-(tv2).tv_usec)/1000 )
-#if 0
-static void set_signal(int signo, void (*handler) (void))
-{
-    struct sigaction sa;
-
-    memset(&sa, 0, sizeof(sa));
-    sa.sa_handler = (void (*)(int)) handler;
-    sa.sa_flags = SA_RESTART;
-    sigaction(signo, &sa, NULL);
-}
-#endif
-
-static int send_pack(int sock, struct in_addr *src_addr,
-                     struct in_addr *dst_addr, struct sockaddr_ll *ME,
-                     struct sockaddr_ll *HE)
+
+static int sock;
+static unsigned count = UINT_MAX;
+static unsigned timeout_us;
+static unsigned sent;
+static unsigned brd_sent;
+static unsigned received;
+static unsigned brd_recv;
+static unsigned req_recv;
+
+static int send_pack(struct in_addr *src_addr,
+            struct in_addr *dst_addr, struct sockaddr_ll *ME,
+            struct sockaddr_ll *HE)
 {
     int err;
-    struct timeval now;
-    RESERVE_CONFIG_UBUFFER(buf, 256);
+    unsigned now;
+    unsigned char buf[256];
     struct arphdr *ah = (struct arphdr *) buf;
     unsigned char *p = (unsigned char *) (ah + 1);
@@ -80 +59 @@
     ah->ar_hln = ME->sll_halen;
     ah->ar_pln = 4;
-    ah->ar_op = cfg&advert ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST);
+    ah->ar_op = option_mask32 & ADVERT ? htons(ARPOP_REPLY) : htons(ARPOP_REQUEST);
 
     memcpy(p, &ME->sll_addr, ah->ar_hln);
@@ -88 +67 @@
     p += 4;
 
-    if (cfg&advert)
+    if (option_mask32 & ADVERT)
         memcpy(p, &ME->sll_addr, ah->ar_hln);
     else
@@ -97 +76 @@
     p += 4;
 
-    gettimeofday(&now, NULL);
+    now = MONOTONIC_US();
     err = sendto(sock, buf, p - buf, 0, (struct sockaddr *) HE, sizeof(*HE));
     if (err == p - buf) {
         last = now;
         sent++;
-        if (!(cfg&unicasting))
+        if (!(option_mask32 & UNICASTING))
             brd_sent++;
     }
-    RELEASE_CONFIG_BUFFER(buf);
     return err;
 }
 
+static void finish(void) ATTRIBUTE_NORETURN;
 static void finish(void)
 {
-    if (!(cfg&quiet)) {
-        printf("Sent %d probes (%d broadcast(s))\n"
-            "Received %d repl%s",
+    if (!(option_mask32 & QUIET)) {
+        printf("Sent %u probe(s) (%u broadcast(s))\n"
+            "Received %u repl%s"
+            " (%u request(s), %u broadcast(s))\n",
             sent, brd_sent,
-            received, (received > 1) ? "ies" : "y");
-        if (brd_recv || req_recv) {
-            printf(" (");
-            if (req_recv)
-                printf("%d request(s)", req_recv);
-            if (brd_recv)
-                printf("%s%d broadcast(s)", req_recv ? ", " : "", brd_recv);
-            putchar(')');
-        }
-        putchar('\n');
-        fflush(stdout);
-    }
-    if (cfg&dad)
+            received, (received == 1) ? "ies" : "y",
+            req_recv, brd_recv);
+    }
+    if (option_mask32 & DAD)
         exit(!!received);
-    if (cfg&unsolicited)
+    if (option_mask32 & UNSOLICITED)
         exit(0);
     exit(!received);
@@ -136 +107 @@
 static void catcher(void)
 {
-    struct timeval tv;
-    static struct timeval start;
-
-    gettimeofday(&tv, NULL);
-
-    if (start.tv_sec == 0)
-        start = tv;
-
-    if (count-- == 0
-        || (timeout && MS_TDIFF(tv, start) > timeout * 1000 + 500))
+    static unsigned start;
+
+    unsigned now;
+
+    now = MONOTONIC_US();
+    if (start == 0)
+        start = now;
+
+    if (count == 0 || (timeout_us && (now - start) > (timeout_us + 500000)))
         finish();
 
-    if (last.tv_sec == 0 || MS_TDIFF(tv, last) > 500) {
-        send_pack(s, &src, &dst, &me, &he);
-        if (count == 0 && cfg&unsolicited)
+    count--;
+
+    if (last == 0 || (now - last) > 500000) {
+        send_pack(&src, &dst, &me, &he);
+        if (count == 0 && (option_mask32 & UNSOLICITED))
             finish();
     }
@@ -163 +135 @@
 
     /* Filter out wild packets */
-    if (FROM->sll_pkttype != PACKET_HOST &&
-        FROM->sll_pkttype != PACKET_BROADCAST &&
-        FROM->sll_pkttype != PACKET_MULTICAST)
+    if (FROM->sll_pkttype != PACKET_HOST
+     && FROM->sll_pkttype != PACKET_BROADCAST
+     && FROM->sll_pkttype != PACKET_MULTICAST)
         return 0;
 
@@ -173 +145 @@
 
     /* ARPHRD check and this darned FDDI hack here :-( */
-    if (ah->ar_hrd != htons(FROM->sll_hatype) &&
-        (FROM->sll_hatype != ARPHRD_FDDI
-         || ah->ar_hrd != htons(ARPHRD_ETHER)))
+    if (ah->ar_hrd != htons(FROM->sll_hatype)
+     && (FROM->sll_hatype != ARPHRD_FDDI || ah->ar_hrd != htons(ARPHRD_ETHER)))
         return 0;
 
@@ -189 +160 @@
     memcpy(&src_ip, p + ah->ar_hln, 4);
     memcpy(&dst_ip, p + ah->ar_hln + 4 + ah->ar_hln, 4);
-    if (!(cfg&dad)) {
+    if (!(option_mask32 & DAD)) {
         if (src_ip.s_addr != dst.s_addr)
             return 0;
@@ -217 +188 @@
             return 0;
     }
-    if (!(cfg&quiet)) {
+    if (!(option_mask32 & QUIET)) {
         int s_printed = 0;
-        struct timeval tv;
-
-        gettimeofday(&tv, NULL);
-
-        printf("%s %s from %s [%s]",
-            FROM->sll_pkttype == PACKET_HOST ? "Unicast" : "Broadcast",
-            ah->ar_op == htons(ARPOP_REPLY) ? "reply" : "request",
+
+        printf("%scast re%s from %s [%s]",
+            FROM->sll_pkttype == PACKET_HOST ? "Uni" : "Broad",
+            ah->ar_op == htons(ARPOP_REPLY) ? "ply" : "quest",
             inet_ntoa(src_ip),
             ether_ntoa((struct ether_addr *) p));
@@ -236 +204 @@
                 printf("for ");
             printf("[%s]",
-                   ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
-        }
-
-        if (last.tv_sec) {
-            long usecs = (tv.tv_sec - last.tv_sec) * 1000000 +
-                tv.tv_usec - last.tv_usec;
-            long msecs = (usecs + 500) / 1000;
-
-            usecs -= msecs * 1000 - 500;
-            printf(" %ld.%03ldms\n", msecs, usecs);
+                ether_ntoa((struct ether_addr *) p + ah->ar_hln + 4));
+        }
+
+        if (last) {
+            printf(" %u.%03ums\n", last / 1000, last % 1000);
         } else {
             printf(" UNSOLICITED?\n");
@@ -256 +219 @@
     if (ah->ar_op == htons(ARPOP_REQUEST))
         req_recv++;
-    if (cfg&quit_on_reply)
+    if (option_mask32 & QUIT_ON_REPLY)
         finish();
-    if (!(cfg&broadcast_only)) {
+    if (!(option_mask32 & BCAST_ONLY)) {
         memcpy(he.sll_addr, p, me.sll_halen);
-        cfg |= unicasting;
+        option_mask32 |= UNICASTING;
     }
     return 1;
 }
 
+int arping_main(int argc, char **argv);
 int arping_main(int argc, char **argv)
 {
-    char *device = "eth0";
+    const char *device = "eth0";
     int ifindex;
     char *source = NULL;
     char *target;
-
-    s = socket(PF_PACKET, SOCK_DGRAM, 0);
-    ifindex = errno;
+    unsigned char *packet;
+
+    sock = xsocket(PF_PACKET, SOCK_DGRAM, 0);
 
     // Drop suid root privileges
@@ -279 +243 @@
 
     {
-        unsigned long opt;
-        char *_count, *_timeout, *_device;
+        unsigned opt;
+        char *str_count, *str_timeout;
 
         /* Dad also sets quit_on_reply.
          * Advert also sets unsolicited.
          */
-        bb_opt_complementally = "Df:AU";
-        opt = bb_getopt_ulflags(argc, argv, "DUAqfbc:w:i:s:",
-                        &_count, &_timeout, &_device);
-        cfg |= opt & 63; /* set respective flags */
-        if (opt & 64) /* count */
-            count = atoi(_count);
-        if (opt & 128) /* timeout */
-            timeout = atoi(_timeout);
-        if (opt & 256) { /* interface */
-            if (strlen(_device) > IF_NAMESIZE) {
-                bb_error_msg_and_die("Interface name `%s' must be less than %d",
-                                _device, IF_NAMESIZE);
-            }
-            device = _device;
-        }
-        if (opt & 512) /* source */
-            source = optarg;
-    }
-    argc -= optind;
-    argv += optind;
-
-    if (argc != 1)
-        bb_show_usage();
-
-    target = *argv;
-
-
-    if (s < 0) {
-        bb_default_error_retval = ifindex;
-        bb_perror_msg_and_die("socket");
-    }
-    bb_default_error_retval = 2;
+        opt_complementary = "=1:Df:AU";
+        opt = getopt32(argv, "DUAqfbc:w:I:s:",
+                &str_count, &str_timeout, &device, &source);
+        if (opt & 0x40) /* -c: count */
+            count = xatou(str_count);
+        if (opt & 0x80) /* -w: timeout */
+            timeout_us = xatou_range(str_timeout, 0, INT_MAX/2000000) * 1000000;
+        //if (opt & 0x100) /* -I: interface */
+        if (strlen(device) >= IF_NAMESIZE) {
+            bb_error_msg_and_die("interface name '%s' is too long",
+                            device);
+        }
+        //if (opt & 0x200) /* -s: source */
+        option_mask32 &= 0x3f; /* set respective flags */
+    }
+
+    target = argv[optind];
+
+    xfunc_error_retval = 2;
 
     {
@@ -323 +274 @@
         memset(&ifr, 0, sizeof(ifr));
         strncpy(ifr.ifr_name, device, IFNAMSIZ - 1);
-        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) {
-            bb_error_msg_and_die("Interface %s not found", device);
-        }
+        ioctl_or_perror_and_die(sock, SIOCGIFINDEX, &ifr, "interface %s not found", device);
         ifindex = ifr.ifr_ifindex;
 
-        if (ioctl(s, SIOCGIFFLAGS, (char *) &ifr)) {
-            bb_error_msg_and_die("SIOCGIFFLAGS");
-        }
+        xioctl(sock, SIOCGIFFLAGS, (char *) &ifr);
+
         if (!(ifr.ifr_flags & IFF_UP)) {
-            bb_error_msg_and_die("Interface %s is down", device);
+            bb_error_msg_and_die("interface %s is down", device);
         }
         if (ifr.ifr_flags & (IFF_NOARP | IFF_LOOPBACK)) {
-            bb_error_msg("Interface %s is not ARPable", device);
-            exit(cfg&dad ? 0 : 2);
+            bb_error_msg("interface %s is not ARPable", device);
+            return (option_mask32 & DAD ? 0 : 2);
         }
     }
 
     if (!inet_aton(target, &dst)) {
-        struct hostent *hp;
-
-        hp = gethostbyname2(target, AF_INET);
-        if (!hp) {
-            bb_error_msg_and_die("invalid or unknown target %s", target);
-        }
-        memcpy(&dst, hp->h_addr, 4);
+        len_and_sockaddr *lsa;
+        lsa = xhost_and_af2sockaddr(target, 0, AF_INET);
+        memcpy(&dst, &lsa->sin.sin_addr.s_addr, 4);
+        if (ENABLE_FEATURE_CLEAN_UP)
+            free(lsa);
     }
 
@@ -354 +300 @@
     }
 
-    if (!(cfg&dad) && cfg&unsolicited && src.s_addr == 0)
+    if (!(option_mask32 & DAD) && (option_mask32 & UNSOLICITED) && src.s_addr == 0)
         src = dst;
 
-    if (!(cfg&dad) || src.s_addr) {
+    if (!(option_mask32 & DAD) || src.s_addr) {
         struct sockaddr_in saddr;
-        int probe_fd = socket(AF_INET, SOCK_DGRAM, 0); /* maybe use bb_xsocket? */
-
-        if (probe_fd < 0) {
-            bb_error_msg_and_die("socket");
-        }
+        int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
+
         if (device) {
-            if (setsockopt
-                (probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device,
-                 strlen(device) + 1) == -1)
-                bb_error_msg("WARNING: interface %s is ignored", device);
+            if (setsockopt(probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device, strlen(device) + 1) == -1)
+                bb_error_msg("warning: interface %s is ignored", device);
         }
         memset(&saddr, 0, sizeof(saddr));
@@ -374 +315 @@
         if (src.s_addr) {
             saddr.sin_addr = src;
-            if (bind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr)) == -1) {
-                bb_error_msg_and_die("bind");
-            }
-        } else if (!(cfg&dad)) {
-            int on = 1;
+            xbind(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
+        } else if (!(option_mask32 & DAD)) {
             socklen_t alen = sizeof(saddr);
 
@@ -384 +322 @@
             saddr.sin_addr = dst;
 
-            if (setsockopt
-                (probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on,
-                 sizeof(on)) == -1)
-                bb_perror_msg("WARNING: setsockopt(SO_DONTROUTE)");
-            if (connect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr))
-                == -1) {
-                bb_error_msg_and_die("connect");
-            }
-            if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) ==
-                -1) {
+            if (setsockopt(probe_fd, SOL_SOCKET, SO_DONTROUTE, &const_int_1, sizeof(const_int_1)) == -1)
+                bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
+            xconnect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr));
+            if (getsockname(probe_fd, (struct sockaddr *) &saddr, &alen) == -1) {
                 bb_error_msg_and_die("getsockname");
             }
@@ -399 +331 @@
         }
         close(probe_fd);
-    };
+    }
 
     me.sll_family = AF_PACKET;
     me.sll_ifindex = ifindex;
     me.sll_protocol = htons(ETH_P_ARP);
-    if (bind(s, (struct sockaddr *) &me, sizeof(me)) == -1) {
-        bb_error_msg_and_die("bind");
-    }
+    xbind(sock, (struct sockaddr *) &me, sizeof(me));
 
     {
         socklen_t alen = sizeof(me);
 
-        if (getsockname(s, (struct sockaddr *) &me, &alen) == -1) {
+        if (getsockname(sock, (struct sockaddr *) &me, &alen) == -1) {
             bb_error_msg_and_die("getsockname");
         }
     }
     if (me.sll_halen == 0) {
-        bb_error_msg("Interface \"%s\" is not ARPable (no ll address)", device);
-        exit(cfg&dad ? 0 : 2);
+        bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
+        return (option_mask32 & DAD ? 0 : 2);
     }
     he = me;
     memset(he.sll_addr, -1, he.sll_halen);
 
-    if (!(cfg&quiet)) {
+    if (!(option_mask32 & QUIET)) {
         printf("ARPING to %s from %s via %s\n",
             inet_ntoa(dst), inet_ntoa(src),
@@ -428 +358 @@
     }
 
-    if (!src.s_addr && !(cfg&dad)) {
+    if (!src.s_addr && !(option_mask32 & DAD)) {
         bb_error_msg_and_die("no src address in the non-DAD mode");
     }
@@ -447 +377 @@
     catcher();
 
+    packet = xmalloc(4096);
     while (1) {
         sigset_t sset, osset;
-        RESERVE_CONFIG_UBUFFER(packet, 4096);
         struct sockaddr_ll from;
         socklen_t alen = sizeof(from);
         int cc;
 
-        if ((cc = recvfrom(s, packet, 4096, 0,
-                           (struct sockaddr *) &from, &alen)) < 0) {
-            perror("recvfrom");
+        cc = recvfrom(sock, packet, 4096, 0, (struct sockaddr *) &from, &alen);
+        if (cc < 0) {
+            bb_perror_msg("recvfrom");
             continue;
         }
@@ -465 +395 @@
         recv_pack(packet, cc, &from);
         sigprocmask(SIG_SETMASK, &osset, NULL);
-        RELEASE_CONFIG_BUFFER(packet);
-    }
-}
+    }
+}