Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/ifconfig.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

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

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

@@ -27 +27 @@
  */
 
+//usage:#define ifconfig_trivial_usage
+//usage:    IF_FEATURE_IFCONFIG_STATUS("[-a]") " interface [address]"
+//usage:#define ifconfig_full_usage "\n\n"
+//usage:       "Configure a network interface\n"
+//usage:     "\n"
+//usage:    IF_FEATURE_IPV6(
+//usage:       "    [add ADDRESS[/PREFIXLEN]]\n")
+//usage:    IF_FEATURE_IPV6(
+//usage:       "    [del ADDRESS[/PREFIXLEN]]\n")
+//usage:       "    [[-]broadcast [ADDRESS]] [[-]pointopoint [ADDRESS]]\n"
+//usage:       "    [netmask ADDRESS] [dstaddr ADDRESS]\n"
+//usage:    IF_FEATURE_IFCONFIG_SLIP(
+//usage:       "    [outfill NN] [keepalive NN]\n")
+//usage:       "    " IF_FEATURE_IFCONFIG_HW("[hw ether" IF_FEATURE_HWIB("|infiniband")" ADDRESS] ") "[metric NN] [mtu NN]\n"
+//usage:       "    [[-]trailers] [[-]arp] [[-]allmulti]\n"
+//usage:       "    [multicast] [[-]promisc] [txqueuelen NN] [[-]dynamic]\n"
+//usage:    IF_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ(
+//usage:       "    [mem_start NN] [io_addr NN] [irq NN]\n")
+//usage:       "    [up|down] ..."
+
+#include "libbb.h"
+#include "inet_common.h"
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
-#if defined(__GLIBC__) && __GLIBC__ >=2 && __GLIBC_MINOR__ >= 1
-#include <netpacket/packet.h>
-#include <net/ethernet.h>
-#else
-#include <sys/types.h>
-#include <netinet/if_ether.h>
-#endif
-#include "libbb.h"
-#include "inet_common.h"
+#ifdef HAVE_NET_ETHERNET_H
+# include <net/ethernet.h>
+#endif
 
 #if ENABLE_FEATURE_IFCONFIG_SLIP
@@ -159 +175 @@
 
 
-/*
- * Set up the tables.  Warning!  They must have corresponding order!
- */
-
 struct arg1opt {
     const char *name;
@@ -182 +194 @@
 
 #define ifreq_offsetof(x)  offsetof(struct ifreq, x)
+
+/*
+ * Set up the tables.  Warning!  They must have corresponding order!
+ */
 
 static const struct arg1opt Arg1Opt[] = {
@@ -205 +221 @@
     { "SIFMAP",     SIOCSIFMAP,     ifreq_offsetof(ifr_map.irq) },
 #endif
-    /* Last entry if for unmatched (possibly hostname) arg. */
 #if ENABLE_FEATURE_IPV6
     { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
     { "DIFADDR",    SIOCDIFADDR,    ifreq_offsetof(ifr_addr) }, /* IPv6 version ignores the offset */
 #endif
+    /* Last entry is for unmatched (assumed to be hostname/address) arg. */
     { "SIFADDR",    SIOCSIFADDR,    ifreq_offsetof(ifr_addr) },
 };
@@ -250 +266 @@
 };
 
-/*
- * A couple of prototypes.
- */
 #if ENABLE_FEATURE_IFCONFIG_HW
-static int in_ether(const char *bufp, struct sockaddr *sap);
-#endif
-
-/*
- * Our main function.
- */
+/* Input an Ethernet address and convert to binary. */
+static int in_ether(const char *bufp, struct sockaddr *sap)
+{
+    char *ptr;
+    int i, j;
+    unsigned char val;
+    unsigned char c;
+
+    sap->sa_family = ARPHRD_ETHER;
+    ptr = (char *) sap->sa_data;
+
+    i = 0;
+    do {
+        j = val = 0;
+
+        /* We might get a semicolon here - not required. */
+        if (i && (*bufp == ':')) {
+            bufp++;
+        }
+
+        do {
+            c = *bufp;
+            if (((unsigned char)(c - '0')) <= 9) {
+                c -= '0';
+            } else if ((unsigned char)((c|0x20) - 'a') <= 5) {
+                c = (unsigned char)((c|0x20) - 'a') + 10;
+            } else if (j && (c == ':' || c == 0)) {
+                break;
+            } else {
+                return -1;
+            }
+            ++bufp;
+            val <<= 4;
+            val += c;
+        } while (++j < 2);
+        *ptr++ = val;
+    } while (++i < ETH_ALEN);
+
+    return *bufp; /* Error if we don't end at end of string. */
+}
+#endif
+
 int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ifconfig_main(int argc UNUSED_PARAM, char **argv)
@@ -315 +364 @@
 
     /* Process the remaining arguments. */
-    while (*++argv != (char *) NULL) {
+    while (*++argv != NULL) {
         p = *argv;
         mask = N_MASK;
@@ -341 +390 @@
         if (mask & ARG_MASK) {
             mask = op->arg_flags;
-            a1op = Arg1Opt + (op - OptArray);
             if (mask & A_NETMASK & did_flags)
                 bb_show_usage();
+            a1op = Arg1Opt + (op - OptArray);
             if (*++argv == NULL) {
                 if (mask & A_ARG_REQ)
@@ -356 +405 @@
                     if (mask & A_CAST_RESOLVE) {
 #endif
-#if ENABLE_FEATURE_IPV6
-                        char *prefix;
-                        int prefix_len = 0;
-#endif
-                        /*safe_strncpy(host, *argv, (sizeof host));*/
                         host = *argv;
-#if ENABLE_FEATURE_IPV6
-                        prefix = strchr(host, '/');
-                        if (prefix) {
-                            prefix_len = xatou_range(prefix + 1, 0, 128);
-                            *prefix = '\0';
-                        }
-#endif
+                        if (strcmp(host, "inet") == 0)
+                            continue; /* compat stuff */
                         sai.sin_family = AF_INET;
                         sai.sin_port = 0;
@@ -376 +415 @@
                         }
 #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS
-                        else if ((host[0] == '+' && !host[1]) && (mask & A_BROADCAST)
+                        else if ((host[0] == '+' && !host[1])
+                         && (mask & A_BROADCAST)
                          && (did_flags & (A_NETMASK|A_HOSTNAME)) == (A_NETMASK|A_HOSTNAME)
                         ) {
@@ -385 +425 @@
                         else {
                             len_and_sockaddr *lsa;
-                            if (strcmp(host, "inet") == 0)
-                                continue; /* compat stuff */
+#if ENABLE_FEATURE_IPV6
+                            char *prefix;
+                            int prefix_len = 0;
+                            prefix = strchr(host, '/');
+                            if (prefix) {
+                                prefix_len = xatou_range(prefix + 1, 0, 128);
+                                *prefix = '\0';
+                            }
+ resolve:
+#endif
                             lsa = xhost2sockaddr(host, 0);
 #if ENABLE_FEATURE_IPV6
+                            if (lsa->u.sa.sa_family != AF_INET6 && prefix) {
+/* TODO: we do not support "ifconfig eth0 up 1.2.3.4/17".
+ * For now, just make it fail instead of silently ignoring "/17" part:
+ */
+                                *prefix = '/';
+                                goto resolve;
+                            }
                             if (lsa->u.sa.sa_family == AF_INET6) {
                                 int sockfd6;
                                 struct in6_ifreq ifr6;
 
-                                memcpy((char *) &ifr6.ifr6_addr,
-                                        (char *) &(lsa->u.sin6.sin6_addr),
-                                        sizeof(struct in6_addr));
-
-                                /* Create a channel to the NET kernel. */
                                 sockfd6 = xsocket(AF_INET6, SOCK_DGRAM, 0);
-                                xioctl(sockfd6, SIOGIFINDEX, &ifr);
+                                xioctl(sockfd6, SIOCGIFINDEX, &ifr);
                                 ifr6.ifr6_ifindex = ifr.ifr_ifindex;
                                 ifr6.ifr6_prefixlen = prefix_len;
+                                memcpy(&ifr6.ifr6_addr,
+                                        &lsa->u.sin6.sin6_addr,
+                                        sizeof(struct in6_addr));
                                 ioctl_or_perror_and_die(sockfd6, a1op->selector, &ifr6, "SIOC%s", a1op->name);
                                 if (ENABLE_FEATURE_CLEAN_UP)
@@ -422 +475 @@
                     } else {    /* A_CAST_HOST_COPY_IN_ETHER */
                         /* This is the "hw" arg case. */
-                        smalluint hw_class= index_in_substrings("ether\0"
+                        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 (hw_class == 1 ? in_ether(host, &sa) : in_ib(host, &sa))
@@ -433 +485 @@
                     }
 #endif
-                    memcpy( (((char *)&ifr) + a1op->ifr_offset),
-                           p, sizeof(struct sockaddr));
+                    memcpy( ((char *)&ifr) + a1op->ifr_offset,
+                        p, sizeof(struct sockaddr));
                 } else {
                     /* FIXME: error check?? */
@@ -443 +495 @@
                         xioctl(sockfd, SIOCGIFMAP, &ifr);
                         if ((mask & A_MAP_UCHAR) == A_MAP_UCHAR)
-                            *((unsigned char *) p) = i;
+                            *(unsigned char *) p = i;
                         else if (mask & A_MAP_USHORT)
-                            *((unsigned short *) p) = i;
+                            *(unsigned short *) p = i;
                         else
-                            *((unsigned long *) p) = i;
+                            *(unsigned long *) p = i;
                     } else
 #endif
                     if (mask & A_CAST_CHAR_PTR)
-                        *((caddr_t *) p) = (caddr_t) i;
+                        *(caddr_t *) p = (caddr_t) i;
                     else    /* A_CAST_INT */
-                        *((int *) p) = i;
+                        *(int *) p = i;
                 }
 
@@ -479 +531 @@
                 continue;
             mask = N_SET;
-        }
+        } /* if (mask & ARG_MASK) */
 
         xioctl(sockfd, SIOCGIFFLAGS, &ifr);
@@ -494 +546 @@
     return 0;
 }
-
-#if ENABLE_FEATURE_IFCONFIG_HW
-/* Input an Ethernet address and convert to binary. */
-static int in_ether(const char *bufp, struct sockaddr *sap)
-{
-    char *ptr;
-    int i, j;
-    unsigned char val;
-    unsigned char c;
-
-    sap->sa_family = ARPHRD_ETHER;
-    ptr = (char *) sap->sa_data;
-
-    i = 0;
-    do {
-        j = val = 0;
-
-        /* We might get a semicolon here - not required. */
-        if (i && (*bufp == ':')) {
-            bufp++;
-        }
-
-        do {
-            c = *bufp;
-            if (((unsigned char)(c - '0')) <= 9) {
-                c -= '0';
-            } else if (((unsigned char)((c|0x20) - 'a')) <= 5) {
-                c = (c|0x20) - ('a'-10);
-            } else if (j && (c == ':' || c == 0)) {
-                break;
-            } else {
-                return -1;
-            }
-            ++bufp;
-            val <<= 4;
-            val += c;
-        } while (++j < 2);
-        *ptr++ = val;
-    } while (++i < ETH_ALEN);
-
-    return *bufp; /* Error if we don't end at end of string. */
-}
-#endif