1 files changed, 25 insertions, 28 deletions

diff --git a/networking/arp.c b/networking/arp.c
index 696c402e0..40d244116 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -22,12 +22,12 @@
 //usage:#define arp_full_usage "\n\n"
 //usage:       "Manipulate ARP cache\n"
 //usage:       "\n      -a              Display (all) hosts"
-//usage:       "\n      -s              Set new ARP entry"
-//usage:       "\n      -d              Delete a specified entry"
+//usage:       "\n      -d              Delete ARP entry"
+//usage:       "\n      -s              Set new entry"
 //usage:       "\n      -v              Verbose"
 //usage:       "\n      -n              Don't resolve names"
 //usage:       "\n      -i IF           Network interface"
-//usage:       "\n      -D              Read <hwaddr> from given device"
+//usage:       "\n      -D              Read HWADDR from IFACE"
 //usage:       "\n      -A,-p AF        Protocol family"
 //usage:       "\n      -H HWTYPE       Hardware address type"
 
@@ -213,16 +213,15 @@ static int arp_del(char **args)
 }
 
 /* Get the hardware address to a specified interface name */
-static void arp_getdevhw(char *ifname, struct sockaddr *sa,
-                                                 const struct hwtype *hwt)
+static void arp_getdevhw(char *ifname, struct sockaddr *sa)
 {
         struct ifreq ifr;
         const struct hwtype *xhw;
 
         strcpy(ifr.ifr_name, ifname);
         ioctl_or_perror_and_die(sockfd, SIOCGIFHWADDR, &ifr,
-                                        "cant get HW-Address for '%s'", ifname);
-        if (hwt && (ifr.ifr_hwaddr.sa_family != hw->type)) {
+                                        "can't get HW-Address for '%s'", ifname);
+        if (hw_set && (ifr.ifr_hwaddr.sa_family != hw->type)) {
                 bb_error_msg_and_die("protocol type mismatch");
         }
         memcpy(sa, &(ifr.ifr_hwaddr), sizeof(struct sockaddr));
@@ -233,8 +232,8 @@ static void arp_getdevhw(char *ifname, struct sockaddr *sa,
                         xhw = get_hwntype(-1);
                 }
                 bb_error_msg("device '%s' has HW address %s '%s'",
-                                         ifname, xhw->name,
-                                         xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
+                                ifname, xhw->name,
+                                xhw->print((unsigned char *) &ifr.ifr_hwaddr.sa_data));
         }
 }
 
@@ -261,7 +260,7 @@ static int arp_set(char **args)
                 bb_error_msg_and_die("need hardware address");
         }
         if (option_mask32 & ARP_OPT_D) {
-                arp_getdevhw(*args++, &req.arp_ha, hw_set ? hw : NULL);
+                arp_getdevhw(*args++, &req.arp_ha);
         } else {
                 if (hw->input(*args++, &req.arp_ha) < 0) {
                         bb_error_msg_and_die("invalid hardware address");
@@ -345,7 +344,7 @@ static int arp_set(char **args)
 /* Print the contents of an ARP request block. */
 static void
 arp_disp(const char *name, char *ip, int type, int arp_flags,
-                 char *hwa, char *mask, char *dev)
+                char *hwa, char *mask, char *dev)
 {
         static const int arp_masks[] = {
                 ATF_PERM, ATF_PUBL,
@@ -428,7 +427,7 @@ static int arp_show(char *name)
                 /* All these strings can't overflow
                  * because fgets above reads limited amount of data */
                 num = sscanf(line, "%s 0x%x 0x%x %s %s %s\n",
-                                         ip, &type, &flags, hwa, mask, dev);
+                                        ip, &type, &flags, hwa, mask, dev);
                 if (num < 4)
                         break;
 
@@ -461,7 +460,7 @@ static int arp_show(char *name)
         }
         if (option_mask32 & ARP_OPT_v)
                 printf("Entries: %d\tSkipped: %d\tFound: %d\n",
-                           entries, entries - shown, shown);
+                                entries, entries - shown, shown);
 
         if (!shown) {
                 if (hw_set || host || device[0])
@@ -477,28 +476,33 @@ static int arp_show(char *name)
 int arp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int arp_main(int argc UNUSED_PARAM, char **argv)
 {
-        const char *hw_type = "ether";
+        const char *hw_type;
         const char *protocol;
         unsigned opts;
 
         INIT_G();
 
         xmove_fd(xsocket(AF_INET, SOCK_DGRAM, 0), sockfd);
+
         ap = get_aftype(DFLT_AF);
-        if (!ap)
-                bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family");
+        /* Defaults are always supported */
+        //if (!ap)
+        //      bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family");
+        hw = get_hwtype(DFLT_HW);
+        //if (!hw)
+        //      bb_error_msg_and_die("%s: %s not supported", DFLT_HW, "hardware type");
 
         opts = getopt32(argv, "A:p:H:t:i:adnDsv", &protocol, &protocol,
                                  &hw_type, &hw_type, &device);
         argv += optind;
         if (opts & (ARP_OPT_A | ARP_OPT_p)) {
                 ap = get_aftype(protocol);
-                if (ap == NULL)
+                if (!ap)
                         bb_error_msg_and_die("%s: unknown %s", protocol, "address family");
         }
-        if (opts & (ARP_OPT_A | ARP_OPT_p)) {
+        if (opts & (ARP_OPT_H | ARP_OPT_t)) {
                 hw = get_hwtype(hw_type);
-                if (hw == NULL)
+                if (!hw)
                         bb_error_msg_and_die("%s: unknown %s", hw_type, "hardware type");
                 hw_set = 1;
         }
@@ -507,17 +511,9 @@ int arp_main(int argc UNUSED_PARAM, char **argv)
         if (ap->af != AF_INET) {
                 bb_error_msg_and_die("%s: kernel only supports 'inet'", ap->name);
         }
-
-        /* If no hw type specified get default */
-        if (!hw) {
-                hw = get_hwtype(DFLT_HW);
-                if (!hw)
-                        bb_error_msg_and_die("%s: %s not supported", DFLT_HW, "hardware type");
-        }
-
         if (hw->alen <= 0) {
                 bb_error_msg_and_die("%s: %s without ARP support",
-                                                         hw->name, "hardware type");
+                                hw->name, "hardware type");
         }
 
         /* Now see what we have to do here... */
@@ -528,6 +524,7 @@ int arp_main(int argc UNUSED_PARAM, char **argv)
                         return arp_set(argv);
                 return arp_del(argv);
         }
+
         //if (opts & ARP_OPT_a) - default
         return arp_show(argv[0]);
 }