small ipv6 doc changes; nslookup a tiny bit smaller

[oweals/busybox.git] / networking / arping.c

diff --git a/networking/arping.c b/networking/arping.c
index 6cb6076125db567a76cffefd3b0ad53e8809d928..e4c9b86a9df90aff76fa59acfa491f3aa4df70a5 100644 (file)
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -41,8 +41,8 @@ enum cfg_e {
 static int cfg;
 
 static int s;
-static int count = -1;
-static int timeout;
+static unsigned count = UINT_MAX;
+static unsigned timeout;
 static int sent;
 static int brd_sent;
 static int received;
@@ -259,35 +259,33 @@ int arping_main(int argc, char **argv)
        char *source = NULL;
        char *target;
 
-       s = socket(PF_PACKET, SOCK_DGRAM, 0);
-       ifindex = errno;
+       s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
 
-       setuid(getuid());
+       // Drop suid root privileges
+       xsetuid(getuid());
 
        {
-               unsigned long opt;
-               char *_count, *_timeout, *_device;
+               unsigned opt;
+               char *_count, *_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);
+               opt_complementary = "Df:AU";
+               opt = getopt32(argc, argv, "DUAqfbc:w:i:s:",
+                                       &_count, &_timeout, &device, &source);
+               cfg |= opt & 0x3f; /* set respective flags */
+               if (opt & 0x40) /* -c: count */
+                       count = xatou(_count);
+               if (opt & 0x80) /* -w: timeout */
+                       timeout = xatoul_range(_timeout, 0, INT_MAX/2000);
+               if (opt & 0x100) { /* -i: interface */
+                       if (strlen(device) > IF_NAMESIZE) {
+                               bb_error_msg_and_die("interface name '%s' is too long",
+                                                               device);
                        }
-                       device = _device;
                }
-               if (opt & 512) /* source */
-                       source = optarg;
+               //if (opt & 0x200) /* -s: source */
        }
        argc -= optind;
        argv += optind;
@@ -297,12 +295,7 @@ int arping_main(int argc, char **argv)
 
        target = *argv;
 
-
-       if (s < 0) {
-               bb_default_error_retval = ifindex;
-               bb_perror_msg_and_die("socket");
-       }
-       bb_default_error_retval = 2;
+       xfunc_error_retval = 2;
 
        {
                struct ifreq ifr;
@@ -310,7 +303,7 @@ int arping_main(int argc, char **argv)
                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);
+                       bb_error_msg_and_die("interface %s not found", device);
                }
                ifindex = ifr.ifr_ifindex;
 
@@ -318,10 +311,10 @@ int arping_main(int argc, char **argv)
                        bb_error_msg_and_die("SIOCGIFFLAGS");
                }
                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);
+                       bb_error_msg("interface %s is not ARPable", device);
                        exit(cfg&dad ? 0 : 2);
                }
        }
@@ -345,16 +338,13 @@ int arping_main(int argc, char **argv)
 
        if (!(cfg&dad) || src.s_addr) {
                struct sockaddr_in saddr;
-               int probe_fd = socket(AF_INET, SOCK_DGRAM, 0); /* maybe use bb_xsocket? */
+               int probe_fd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
-               if (probe_fd < 0) {
-                       bb_error_msg_and_die("socket");
-               }
                if (device) {
                        if (setsockopt
                                (probe_fd, SOL_SOCKET, SO_BINDTODEVICE, device,
                                 strlen(device) + 1) == -1)
-                               bb_error_msg("WARNING: interface %s is ignored", device);
+                               bb_error_msg("warning: interface %s is ignored", device);
                }
                memset(&saddr, 0, sizeof(saddr));
                saddr.sin_family = AF_INET;
@@ -373,7 +363,7 @@ int arping_main(int argc, char **argv)
                        if (setsockopt
                                (probe_fd, SOL_SOCKET, SO_DONTROUTE, (char *) &on,
                                 sizeof(on)) == -1)
-                               bb_perror_msg("WARNING: setsockopt(SO_DONTROUTE)");
+                               bb_perror_msg("warning: setsockopt(SO_DONTROUTE)");
                        if (connect(probe_fd, (struct sockaddr *) &saddr, sizeof(saddr))
                                == -1) {
                                bb_error_msg_and_die("connect");
@@ -402,7 +392,7 @@ int arping_main(int argc, char **argv)
                }
        }
        if (me.sll_halen == 0) {
-               bb_error_msg("Interface \"%s\" is not ARPable (no ll address)", device);
+               bb_error_msg("interface \"%s\" is not ARPable (no ll address)", device);
                exit(cfg&dad ? 0 : 2);
        }
        he = me;
@@ -442,7 +432,7 @@ int arping_main(int argc, char **argv)
 
                if ((cc = recvfrom(s, packet, 4096, 0,
                                                   (struct sockaddr *) &from, &alen)) < 0) {
-                       perror("recvfrom");
+                       bb_perror_msg("recvfrom");
                        continue;
                }
                sigemptyset(&sset);