Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/arp.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/arp.c (modified) (13 diffs)

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

@@ -23 +23 @@
 //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"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 #include "inet_common.h"
 
@@ -69 +70 @@
     const char *device;      /* current device */
     smallint hw_set;         /* flag if hw-type was set (-H) */
-
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 #define ap         (G.ap        )
 #define hw         (G.hw        )
@@ -77 +77 @@
 #define hw_set     (G.hw_set    )
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     device = ""; \
 } while (0)
@@ -214 +215 @@
 
 /* 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;
@@ -222 +222 @@
     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");
     }
@@ -234 +234 @@
         }
         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));
     }
 }
@@ -262 +262 @@
     }
     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) {
@@ -461 +461 @@
     }
     if (option_mask32 & ARP_OPT_v)
-        printf("Entries: %d\tSkipped: %d\tFound: %d\n",
+        printf("Entries: %u\tSkipped: %u\tFound: %u\n",
                 entries, entries - shown, shown);
 
     if (!shown) {
         if (hw_set || host || device[0])
-            printf("No match found in %d entries\n", entries);
+            printf("No match found in %u entries\n", entries);
     }
     if (ENABLE_FEATURE_CLEAN_UP) {
@@ -478 +478 @@
 int arp_main(int argc UNUSED_PARAM, char **argv)
 {
-    const char *hw_type = "ether";
+    const char *hw_type;
     const char *protocol;
     unsigned opts;
@@ -485 +485 @@
 
     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,
@@ -494 +499 @@
     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;
@@ -508 +513 @@
         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",
@@ -529 +526 @@
         return arp_del(argv);
     }
+
     //if (opts & ARP_OPT_a) - default
     return arp_show(argv[0]);