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

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

@@ -90 +90 @@
 static const char* FAST_FUNC INET_sprint(struct sockaddr *sap, int numeric)
 {
-    static char *buff; /* defaults to NULL */
-
-    free(buff);
     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
         return "[NONE SET]";
-    buff = INET_rresolve((struct sockaddr_in *) sap, numeric, 0xffffff00);
-    return buff;
+    return auto_string(INET_rresolve((struct sockaddr_in *) sap, numeric, 0xffffff00));
 }
 
@@ -172 +168 @@
 static const char* FAST_FUNC INET6_sprint(struct sockaddr *sap, int numeric)
 {
-    static char *buff;
-
-    free(buff);
     if (sap->sa_family == 0xFFFF || sap->sa_family == 0)
         return "[NONE SET]";
-    buff = INET6_rresolve((struct sockaddr_in6 *) sap, numeric);
-    return buff;
+    return auto_string(INET6_rresolve((struct sockaddr_in6 *) sap, numeric));
 }
 
@@ -224 +216 @@
 static char* FAST_FUNC UNSPEC_print(unsigned char *ptr)
 {
-    static char *buff;
-
+    char *buff;
     char *pos;
     unsigned int i;
 
-    if (!buff)
-        buff = xmalloc(sizeof(struct sockaddr) * 3 + 1);
+    buff = auto_string(xmalloc(sizeof(struct sockaddr) * 3 + 1));
     pos = buff;
     for (i = 0; i < sizeof(struct sockaddr); i++) {
@@ -713 +703 @@
 static char* FAST_FUNC ether_print(unsigned char *ptr)
 {
-    static char *buff;
-
-    free(buff);
+    char *buff;
     buff = xasprintf("%02X:%02X:%02X:%02X:%02X:%02X",
              (ptr[0] & 0377), (ptr[1] & 0377), (ptr[2] & 0377),
              (ptr[3] & 0377), (ptr[4] & 0377), (ptr[5] & 0377)
         );
-    return buff;
-}
-
-static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap);
+    return auto_string(buff);
+}
 
 static const struct hwtype ether_hwtype = {
@@ -731 +717 @@
     .alen  = ETH_ALEN,
     .print = ether_print,
-    .input = ether_input
-};
-
-static unsigned hexchar2int(char c)
-{
-    if (isdigit(c))
-        return c - '0';
-    c &= ~0x20; /* a -> A */
-    if ((unsigned)(c - 'A') <= 5)
-        return c - ('A' - 10);
-    return ~0U;
-}
-
-/* Input an Ethernet address and convert to binary. */
-static int FAST_FUNC ether_input(const char *bufp, struct sockaddr *sap)
-{
-    unsigned char *ptr;
-    char c;
-    int i;
-    unsigned val;
-
-    sap->sa_family = ether_hwtype.type;
-    ptr = (unsigned char*) sap->sa_data;
-
-    i = 0;
-    while ((*bufp != '\0') && (i < ETH_ALEN)) {
-        val = hexchar2int(*bufp++) * 0x10;
-        if (val > 0xff) {
-            errno = EINVAL;
-            return -1;
-        }
-        c = *bufp;
-        if (c == ':' || c == 0)
-            val >>= 4;
-        else {
-            val |= hexchar2int(c);
-            if (val > 0xff) {
-                errno = EINVAL;
-                return -1;
-            }
-        }
-        if (c != 0)
-            bufp++;
-        *ptr++ = (unsigned char) val;
-        i++;
-
-        /* We might get a semicolon here - not required. */
-        if (*bufp == ':') {
-            bufp++;
-        }
-    }
-    return 0;
-}
+    .input = in_ether
+};
 
 static const struct hwtype ppp_hwtype = {
@@ -928 +863 @@
 {
     FILE *f;
-    char addr6[40], devname[20];
+    char addr6[40], devname[21];
     struct sockaddr_in6 sap;
     int plen, scope, dad_status, if_idx;
@@ -947 +882 @@
                     addr6p[0], addr6p[1], addr6p[2], addr6p[3],
                     addr6p[4], addr6p[5], addr6p[6], addr6p[7]);
+            memset(&sap, 0, sizeof(sap));
             inet_pton(AF_INET6, addr6,
                       (struct sockaddr *) &sap.sin6_addr);