Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/networking/libiproute/utils.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/libiproute/utils.c (modified) (7 diffs)

branches/3.2/mindi-busybox/networking/libiproute/utils.c

@@ -84 +84 @@
     }
 
-    addr->family = AF_INET;
     if (family != AF_UNSPEC && family != AF_INET)
         return -1;
+
+    /* Try to parse it as IPv4 */
+    addr->family = AF_INET;
+#if 0 /* Doesn't handle e.g. "10.10", for example, "ip r l root 10.10/16" */
     if (inet_pton(AF_INET, name, addr->data) <= 0)
         return -1;
+#else
+    {
+        unsigned i = 0;
+        unsigned n = 0;
+        const char *cp = name - 1;
+        while (*++cp) {
+            if ((unsigned char)(*cp - '0') <= 9) {
+                n = 10 * n + (unsigned char)(*cp - '0');
+                if (n >= 256)
+                    return -1;
+                ((uint8_t*)addr->data)[i] = n;
+                continue;
+            }
+            if (*cp == '.' && ++i <= 3) {
+                n = 0;
+                continue;
+            }
+            return -1;
+        }
+    }
+#endif
     addr->bytelen = 4;
     addr->bitlen = -1;
+
     return 0;
 }
 
-static int get_prefix_1(inet_prefix *dst, char *arg, int family)
-{
-    int err;
-    unsigned plen;
+static void get_prefix_1(inet_prefix *dst, char *arg, int family)
+{
     char *slash;
 
@@ -109 +132 @@
         /*dst->bytelen = 0; - done by memset */
         /*dst->bitlen = 0;*/
-        return 0;
+        return;
     }
 
@@ -115 +138 @@
     if (slash)
         *slash = '\0';
-    err = get_addr_1(dst, arg, family);
-    if (err == 0) {
+
+    if (get_addr_1(dst, arg, family) == 0) {
         dst->bitlen = (dst->family == AF_INET6) ? 128 : 32;
         if (slash) {
+            unsigned plen;
             inet_prefix netmask_pfx;
 
@@ -124 +148 @@
             plen = bb_strtou(slash + 1, NULL, 0);
             if ((errno || plen > dst->bitlen)
-             && (get_addr_1(&netmask_pfx, slash + 1, family)))
-                err = -1;
-            else if (netmask_pfx.family == AF_INET) {
+             && get_addr_1(&netmask_pfx, slash + 1, family) != 0
+            ) {
+                goto bad;
+            }
+            if (netmask_pfx.family == AF_INET) {
                 /* fill in prefix length of dotted quad */
                 uint32_t mask = ntohl(netmask_pfx.data[0]);
@@ -132 +158 @@
 
                 /* a valid netmask must be 2^n - 1 */
-                if (!(host & (host + 1))) {
-                    for (plen = 0; mask; mask <<= 1)
-                        ++plen;
-                    if (plen <= dst->bitlen) {
-                        dst->bitlen = plen;
-                        /* dst->flags |= PREFIXLEN_SPECIFIED; */
-                    } else
-                        err = -1;
-                } else
-                    err = -1;
-            } else {
-                /* plain prefix */
-                dst->bitlen = plen;
-            }
-        }
-    }
+                if (host & (host + 1))
+                    goto bad;
+
+                for (plen = 0; mask; mask <<= 1)
+                    ++plen;
+                if (plen > dst->bitlen)
+                    goto bad;
+                /* dst->flags |= PREFIXLEN_SPECIFIED; */
+            }
+            dst->bitlen = plen;
+        }
+    }
+
     if (slash)
         *slash = '/';
-    return err;
+    return;
+ bad:
+    bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
 }
 
@@ -164 +189 @@
 }
 
-int get_prefix(inet_prefix *dst, char *arg, int family)
+void get_prefix(inet_prefix *dst, char *arg, int family)
 {
     if (family == AF_PACKET) {
         bb_error_msg_and_die("\"%s\" may be inet %s, but it is not allowed in this context", arg, "prefix");
     }
-    if (get_prefix_1(dst, arg, family)) {
-        bb_error_msg_and_die("an %s %s is expected rather than \"%s\"", "inet", "prefix", arg);
-    }
-    return 0;
+    get_prefix_1(dst, arg, family);
 }
 
@@ -205 +227 @@
 }
 
-int inet_addr_match(inet_prefix *a, inet_prefix *b, int bits)
-{
-    uint32_t *a1 = a->data;
-    uint32_t *a2 = b->data;
+int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits)
+{
+    const uint32_t *a1 = a->data;
+    const uint32_t *a2 = b->data;
     int words = bits >> 5;