Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/ifconfig.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/ifconfig.c (modified) (15 diffs)

branches/2.2.9/mindi-busybox/networking/ifconfig.c

@@ -11 +11 @@
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -37 +37 @@
 #include <netinet/if_ether.h>
 #endif
+#include "libbb.h"
 #include "inet_common.h"
-#include "libbb.h"
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
@@ -165 +165 @@
 struct arg1opt {
     const char *name;
-    int selector;
+    unsigned short selector;
     unsigned short ifr_offset;
 };
@@ -184 +184 @@
 
 static const struct arg1opt Arg1Opt[] = {
-    {"SIOCSIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric)},
-    {"SIOCSIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu)},
-    {"SIOCSIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen)},
-    {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
-    {"SIOCSIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask)},
-    {"SIOCSIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr)},
-#if ENABLE_FEATURE_IFCONFIG_HW
-    {"SIOCSIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr)},
-#endif
-    {"SIOCSIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr)},
+    { "SIFMETRIC",  SIOCSIFMETRIC,  ifreq_offsetof(ifr_metric) },
+    { "SIFMTU",     SIOCSIFMTU,     ifreq_offsetof(ifr_mtu) },
+    { "SIFTXQLEN",  SIOCSIFTXQLEN,  ifreq_offsetof(ifr_qlen) },
+    { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
+    { "SIFNETMASK", SIOCSIFNETMASK, ifreq_offsetof(ifr_netmask) },
+    { "SIFBRDADDR", SIOCSIFBRDADDR, ifreq_offsetof(ifr_broadaddr) },
+#if ENABLE_FEATURE_IFCONFIG_HW
+    { "SIFHWADDR",  SIOCSIFHWADDR,  ifreq_offsetof(ifr_hwaddr) },
+#endif
+    { "SIFDSTADDR", SIOCSIFDSTADDR, ifreq_offsetof(ifr_dstaddr) },
 #ifdef SIOCSKEEPALIVE
-    {"SIOCSKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data)},
+    { "SKEEPALIVE", SIOCSKEEPALIVE, ifreq_offsetof(ifr_data) },
 #endif
 #ifdef SIOCSOUTFILL
-    {"SIOCSOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data)},
+    { "SOUTFILL",   SIOCSOUTFILL,   ifreq_offsetof(ifr_data) },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start)},
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr)},
-    {"SIOCSIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq)},
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.mem_start) },
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.base_addr) },
+    { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq) },
 #endif
     /* Last entry if for unmatched (possibly hostname) arg. */
 #if ENABLE_FEATURE_IPV6
-    {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
-    {"SIOCDIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr)}, /* IPv6 version ignores the offset */
-#endif
-    {"SIOCSIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr)},
+    { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
+    { "DIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
+#endif
+    { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
 
 static const struct options OptArray[] = {
-    {"metric",      N_ARG,         ARG_METRIC,      0},
-    {"mtu",         N_ARG,         ARG_MTU,         0},
-    {"txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0},
-    {"dstaddr",     N_ARG,         ARG_DSTADDR,     0},
-    {"netmask",     N_ARG,         ARG_NETMASK,     0},
-    {"broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST},
-#if ENABLE_FEATURE_IFCONFIG_HW
-    {"hw",          N_ARG, ARG_HW,                  0},
-#endif
-    {"pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT},
+    { "metric",      N_ARG,         ARG_METRIC,      0 },
+    { "mtu",         N_ARG,         ARG_MTU,         0 },
+    { "txqueuelen",  N_ARG,         ARG_TXQUEUELEN,  0 },
+    { "dstaddr",     N_ARG,         ARG_DSTADDR,     0 },
+    { "netmask",     N_ARG,         ARG_NETMASK,     0 },
+    { "broadcast",   N_ARG | M_CLR, ARG_BROADCAST,   IFF_BROADCAST },
+#if ENABLE_FEATURE_IFCONFIG_HW
+    { "hw",          N_ARG,         ARG_HW,          0 },
+#endif
+    { "pointopoint", N_ARG | M_CLR, ARG_POINTOPOINT, IFF_POINTOPOINT },
 #ifdef SIOCSKEEPALIVE
-    {"keepalive",   N_ARG,         ARG_KEEPALIVE,   0},
+    { "keepalive",   N_ARG,         ARG_KEEPALIVE,   0 },
 #endif
 #ifdef SIOCSOUTFILL
-    {"outfill",     N_ARG,         ARG_OUTFILL,     0},
+    { "outfill",     N_ARG,         ARG_OUTFILL,     0 },
 #endif
 #if ENABLE_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ
-    {"mem_start",   N_ARG,         ARG_MEM_START,   0},
-    {"io_addr",     N_ARG,         ARG_IO_ADDR,     0},
-    {"irq",         N_ARG,         ARG_IRQ,         0},
+    { "mem_start",   N_ARG,         ARG_MEM_START,   0 },
+    { "io_addr",     N_ARG,         ARG_IO_ADDR,     0 },
+    { "irq",         N_ARG,         ARG_IRQ,         0 },
 #endif
 #if ENABLE_FEATURE_IPV6
-    {"add",         N_ARG,         ARG_ADD_DEL,     0},
-    {"del",         N_ARG,         ARG_ADD_DEL,     0},
-#endif
-    {"arp",         N_CLR | M_SET, 0,               IFF_NOARP},
-    {"trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS},
-    {"promisc",     N_SET | M_CLR, 0,               IFF_PROMISC},
-    {"multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST},
-    {"allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI},
-    {"dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC},
-    {"up",          N_SET,         0,               (IFF_UP | IFF_RUNNING)},
-    {"down",        N_CLR,         0,               IFF_UP},
-    {NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING)}
+    { "add",         N_ARG,         ARG_ADD_DEL,     0 },
+    { "del",         N_ARG,         ARG_ADD_DEL,     0 },
+#endif
+    { "arp",         N_CLR | M_SET, 0,               IFF_NOARP },
+    { "trailers",    N_CLR | M_SET, 0,               IFF_NOTRAILERS },
+    { "promisc",     N_SET | M_CLR, 0,               IFF_PROMISC },
+    { "multicast",   N_SET | M_CLR, 0,               IFF_MULTICAST },
+    { "allmulti",    N_SET | M_CLR, 0,               IFF_ALLMULTI },
+    { "dynamic",     N_SET | M_CLR, 0,               IFF_DYNAMIC },
+    { "up",          N_SET,         0,               (IFF_UP | IFF_RUNNING) },
+    { "down",        N_CLR,         0,               IFF_UP },
+    { NULL,          0,             ARG_HOSTNAME,    (IFF_UP | IFF_RUNNING) }
 };
 
@@ -253 +253 @@
  * A couple of prototypes.
  */
-
 #if ENABLE_FEATURE_IFCONFIG_HW
 static int in_ether(const char *bufp, struct sockaddr *sap);
@@ -261 +260 @@
  * Our main function.
  */
-
-int ifconfig_main(int argc, char **argv);
-int ifconfig_main(int argc, char **argv)
+int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ifconfig_main(int argc UNUSED_PARAM, char **argv)
 {
     struct ifreq ifr;
@@ -294 +292 @@
     /* skip argv[0] */
     ++argv;
-    --argc;
 
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-    if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
+    if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) {
         interface_opt_a = 1;
-        --argc;
         ++argv;
     }
 #endif
 
-    if (argc <= 1) {
+    if (!argv[0] || !argv[1]) { /* one or no args */
 #if ENABLE_FEATURE_IFCONFIG_STATUS
-        return display_interfaces(argc ? *argv : NULL);
+        return display_interfaces(argv[0] /* can be NULL */);
 #else
         bb_error_msg_and_die("no support for status display");
@@ -316 +312 @@
 
     /* get interface name */
-    safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
+    strncpy_IFNAMSIZ(ifr.ifr_name, *argv);
 
     /* Process the remaining arguments. */
@@ -375 +371 @@
                         sai.sin_family = AF_INET;
                         sai.sin_port = 0;
-                        if (!strcmp(host, bb_str_default)) {
+                        if (strcmp(host, "default") == 0) {
                             /* Default is special, meaning 0.0.0.0. */
                             sai.sin_addr.s_addr = INADDR_ANY;
@@ -393 +389 @@
                             lsa = xhost2sockaddr(host, 0);
 #if ENABLE_FEATURE_IPV6
-                            if (lsa->sa.sa_family == AF_INET6) {
+                            if (lsa->u.sa.sa_family == AF_INET6) {
                                 int sockfd6;
                                 struct in6_ifreq ifr6;
 
                                 memcpy((char *) &ifr6.ifr6_addr,
-                                        (char *) &(lsa->sin6.sin6_addr),
+                                        (char *) &(lsa->u.sin6.sin6_addr),
                                         sizeof(struct in6_addr));
 
@@ -406 +402 @@
                                 ifr6.ifr6_ifindex = ifr.ifr_ifindex;
                                 ifr6.ifr6_prefixlen = prefix_len;
-                                ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "%s", a1op->name);
+                                ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name);
                                 if (ENABLE_FEATURE_CLEAN_UP)
                                     free(lsa);
@@ -412 +408 @@
                             }
 #endif
-                            sai.sin_addr = lsa->sin.sin_addr;
+                            sai.sin_addr = lsa->u.sin.sin_addr;
                             if (ENABLE_FEATURE_CLEAN_UP)
                                 free(lsa);
@@ -426 +422 @@
                     } else {    /* A_CAST_HOST_COPY_IN_ETHER */
                         /* This is the "hw" arg case. */
-                        if (strcmp("ether", *argv) || !*++argv)
+                        smalluint hw_class= index_in_substrings("ether\0"
+                                IF_FEATURE_HWIB("infiniband\0"), *argv) + 1;
+                        if (!hw_class || !*++argv)
                             bb_show_usage();
                         /*safe_strncpy(host, *argv, sizeof(host));*/
                         host = *argv;
-                        if (in_ether(host, &sa))
+                        if (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
                             bb_error_msg_and_die("invalid hw-addr %s", host);
                         p = (char *) &sa;
@@ -458 +456 @@
                 }
 
-                ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "%s", a1op->name);
+                ioctl_or_perror_and_die(sockfd, a1op->selector, &ifr, "SIOC%s", a1op->name);
 #ifdef QUESTIONABLE_ALIAS_CASE
                 if (mask & A_COLON_CHK) {
@@ -507 +505 @@
 
     sap->sa_family = ARPHRD_ETHER;
-    ptr = sap->sa_data;
+    ptr = (char *) sap->sa_data;
 
     i = 0;