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

branches/3.3/mindi-busybox/networking/libiproute/ipaddress.c

@@ -14 +14 @@
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
@@ -40 +41 @@
 typedef struct filter_t filter_t;
 
-#define G_filter (*(filter_t*)&bb_common_bufsiz1)
-
+#define G_filter (*(filter_t*)bb_common_bufsiz1)
+#define INIT_G() do { setup_common_bufsiz(); } while (0)
 
 static void print_link_flags(unsigned flags, unsigned mdown)
@@ -138 +139 @@
         unsigned m_flag = 0;
         if (tb[IFLA_LINK]) {
-            SPRINT_BUF(b1);
             int iflink = *(int*)RTA_DATA(tb[IFLA_LINK]);
             if (iflink == 0)
                 printf("@NONE: ");
             else {
-                printf("@%s: ", ll_idx_n2a(iflink, b1));
+                printf("@%s: ", ll_index_to_name(iflink));
                 m_flag = ll_index_to_flags(iflink);
                 m_flag = !(m_flag & IFF_UP);
@@ -159 +159 @@
 #ifdef IFLA_MASTER
     if (tb[IFLA_MASTER]) {
-        SPRINT_BUF(b1);
-        printf("master %s ", ll_idx_n2a(*(int*)RTA_DATA(tb[IFLA_MASTER]), b1));
+        printf("master %s ", ll_index_to_name(*(int*)RTA_DATA(tb[IFLA_MASTER])));
     }
 #endif
@@ -217 +216 @@
     struct ifaddrmsg *ifa = NLMSG_DATA(n);
     int len = n->nlmsg_len;
-    struct rtattr * rta_tb[IFA_MAX+1];
-    char abuf[256];
-    SPRINT_BUF(b1);
+    struct rtattr *rta_tb[IFA_MAX+1];
 
     if (n->nlmsg_type != RTM_NEWADDR && n->nlmsg_type != RTM_DELADDR)
@@ -251 +248 @@
             label = RTA_DATA(rta_tb[IFA_LABEL]);
         else
-            label = ll_idx_n2a(ifa->ifa_index, b1);
+            label = ll_index_to_name(ifa->ifa_index);
         if (fnmatch(G_filter.label, label, 0) != 0)
             return 0;
@@ -295 +292 @@
 
     if (rta_tb[IFA_LOCAL]) {
-        fputs(rt_addr_n2a(ifa->ifa_family,
-                          RTA_DATA(rta_tb[IFA_LOCAL]),
-                          abuf, sizeof(abuf)), stdout);
+        fputs(rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_LOCAL])),
+            stdout
+        );
 
         if (rta_tb[IFA_ADDRESS] == NULL
@@ -305 +302 @@
         } else {
             printf(" peer %s/%d ",
-                rt_addr_n2a(ifa->ifa_family,
-                        RTA_DATA(rta_tb[IFA_ADDRESS]),
-                        abuf, sizeof(abuf)),
-                ifa->ifa_prefixlen);
+                rt_addr_n2a(ifa->ifa_family, RTA_DATA(rta_tb[IFA_ADDRESS])),
+                ifa->ifa_prefixlen
+            );
         }
     }
@@ -315 +311 @@
         printf("brd %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_DATA(rta_tb[IFA_BROADCAST]),
-                    abuf, sizeof(abuf))
+                RTA_DATA(rta_tb[IFA_BROADCAST]))
         );
     }
@@ -322 +317 @@
         printf("any %s ",
             rt_addr_n2a(ifa->ifa_family,
-                    RTA_DATA(rta_tb[IFA_ANYCAST]),
-                    abuf, sizeof(abuf))
+                RTA_DATA(rta_tb[IFA_ANYCAST]))
         );
     }
-    printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope, b1));
+    printf("scope %s ", rtnl_rtscope_n2a(ifa->ifa_scope));
     if (ifa->ifa_flags & IFA_F_SECONDARY) {
         ifa->ifa_flags &= ~IFA_F_SECONDARY;
@@ -459 +453 @@
             if (rtnl_rtscope_a2n(&scope, *argv)) {
                 if (strcmp(*argv, "all") != 0) {
-                    invarg(*argv, "scope");
+                    invarg_1_to_2(*argv, "scope");
                 }
                 scope = RT_SCOPE_NOWHERE;
@@ -557 +551 @@
                     }
                     if (G_filter.label) {
-                        SPRINT_BUF(b1);
                         const char *label;
                         if (tb[IFA_LABEL])
                             label = RTA_DATA(tb[IFA_LABEL]);
                         else
-                            label = ll_idx_n2a(ifa->ifa_index, b1);
+                            label = ll_index_to_name(ifa->ifa_index);
                         if (fnmatch(G_filter.label, label, 0) != 0)
                             continue;
@@ -599 +592 @@
 
 /* Return value becomes exitcode. It's okay to not return at all */
-static int ipaddr_modify(int cmd, char **argv)
+static int ipaddr_modify(int cmd, int flags, char **argv)
 {
     static const char option[] ALIGN1 =
@@ -623 +616 @@
 
     req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg));
-    req.n.nlmsg_flags = NLM_F_REQUEST;
+    req.n.nlmsg_flags = NLM_F_REQUEST | flags;
     req.n.nlmsg_type = cmd;
     req.ifa.ifa_family = preferred_family;
 
     while (*argv) {
-        const smalluint arg = index_in_strings(option, *argv);
+        unsigned arg = index_in_strings(option, *argv);
+        /* if search fails, "local" is assumed */
+        if ((int)arg >= 0)
+            NEXT_ARG();
+
         if (arg <= 1) { /* peer, remote */
-            NEXT_ARG();
-
             if (peer_len) {
                 duparg("peer", *argv);
@@ -644 +639 @@
         } else if (arg <= 3) { /* broadcast, brd */
             inet_prefix addr;
-            NEXT_ARG();
             if (brd_len) {
                 duparg("broadcast", *argv);
@@ -661 +655 @@
         } else if (arg == 4) { /* anycast */
             inet_prefix addr;
-            NEXT_ARG();
             if (any_len) {
                 duparg("anycast", *argv);
@@ -673 +666 @@
         } else if (arg == 5) { /* scope */
             uint32_t scope = 0;
-            NEXT_ARG();
             if (rtnl_rtscope_a2n(&scope, *argv)) {
-                invarg(*argv, "scope");
+                invarg_1_to_2(*argv, "scope");
             }
             req.ifa.ifa_scope = scope;
             scoped = 1;
         } else if (arg == 6) { /* dev */
-            NEXT_ARG();
             d = *argv;
         } else if (arg == 7) { /* label */
-            NEXT_ARG();
             l = *argv;
             addattr_l(&req.n, sizeof(req), IFA_LABEL, l, strlen(l) + 1);
         } else {
-            if (arg == 8) /* local */
-                NEXT_ARG();
+            /* local (specified or assumed) */
             if (local_len) {
                 duparg2("local", *argv);
@@ -706 +695 @@
         bb_error_msg_and_die("need \"dev IFACE\"");
     }
-    if (l && strncmp(d, l, strlen(d)) != 0) {
+    if (l && !is_prefixed_with(l, d)) {
         bb_error_msg_and_die("\"dev\" (%s) must match \"label\" (%s)", d, l);
     }
@@ -725 +714 @@
         brd = peer;
         if (brd.bitlen <= 30) {
-            for (i=31; i>=brd.bitlen; i--) {
+            for (i = 31; i >= brd.bitlen; i--) {
                 if (brd_len == -1)
                     brd.data[0] |= htonl(1<<(31-i));
@@ -754 +743 @@
 {
     static const char commands[] ALIGN1 =
-        "add\0""delete\0""list\0""show\0""lst\0""flush\0";
-    smalluint cmd = 2;
+        /* 0    1         2      3          4         5       6       7      8 */
+        "add\0""change\0""chg\0""replace\0""delete\0""list\0""show\0""lst\0""flush\0";
+    int cmd = 2;
+
+    INIT_G();
+
     if (*argv) {
         cmd = index_in_substrings(commands, *argv);
-        if (cmd > 5)
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        if (cmd < 0)
+            invarg_1_to_2(*argv, applet_name);
         argv++;
-        if (cmd <= 1)
-            return ipaddr_modify((cmd == 0) ? RTM_NEWADDR : RTM_DELADDR, argv);
-    }
-    /* 2 == list, 3 == show, 4 == lst */
-    return ipaddr_list_or_flush(argv, cmd == 5);
-}
+        if (cmd <= 4) {
+            return ipaddr_modify(
+                /*cmd:*/ cmd == 4 ? RTM_DELADDR : RTM_NEWADDR,
+                /*flags:*/
+                    cmd == 0 ? NLM_F_CREATE|NLM_F_EXCL : /* add */
+                    cmd == 1 || cmd == 2 ? NLM_F_REPLACE : /* change */
+                    cmd == 3 ? NLM_F_CREATE|NLM_F_REPLACE : /* replace */
+                    0 /* delete */
+            , argv);
+        }
+    }
+    return ipaddr_list_or_flush(argv, cmd == 8);
+}