Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/libiproute

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/Kbuild.src (modified) (1 diff)
• mindi-busybox/networking/libiproute/ip_common.h (modified) (1 diff)
• mindi-busybox/networking/libiproute/ip_parse_common_args.c (modified) (1 diff)
• mindi-busybox/networking/libiproute/ipaddress.c (modified) (20 diffs)
• mindi-busybox/networking/libiproute/iplink.c (modified) (11 diffs)
• mindi-busybox/networking/libiproute/ipneigh.c (added)
• mindi-busybox/networking/libiproute/iproute.c (modified) (21 diffs)
• mindi-busybox/networking/libiproute/iprule.c (modified) (15 diffs)
• mindi-busybox/networking/libiproute/iptunnel.c (modified) (6 diffs)
• mindi-busybox/networking/libiproute/libnetlink.c (modified) (3 diffs)
• mindi-busybox/networking/libiproute/linux (deleted)
• mindi-busybox/networking/libiproute/ll_map.c (modified) (4 diffs)
• mindi-busybox/networking/libiproute/ll_map.h (modified) (1 diff)
• mindi-busybox/networking/libiproute/ll_proto.c (modified) (1 diff)
• mindi-busybox/networking/libiproute/ll_types.c (modified) (2 diffs)
• mindi-busybox/networking/libiproute/rt_names.c (modified) (16 diffs)
• mindi-busybox/networking/libiproute/rt_names.h (modified) (1 diff)
• mindi-busybox/networking/libiproute/rtm_map.c (modified) (2 diffs)
• mindi-busybox/networking/libiproute/rtm_map.h (modified) (1 diff)
• mindi-busybox/networking/libiproute/utils.c (modified) (8 diffs)
• mindi-busybox/networking/libiproute/utils.h (modified) (2 diffs)

branches/3.3/mindi-busybox/networking/libiproute/Kbuild.src

@@ -65 +65 @@
     rt_names.o \
     utils.o
+
+lib-$(CONFIG_FEATURE_IP_NEIGH) += \
+    ip_parse_common_args.o \
+    ipneigh.o \
+    libnetlink.o \
+    ll_map.o \
+    rt_names.o \
+    utils.o

branches/3.3/mindi-busybox/networking/libiproute/ip_common.h

@@ -25 +25 @@
 int FAST_FUNC do_iproute(char **argv);
 int FAST_FUNC do_iprule(char **argv);
-//int FAST_FUNC do_ipneigh(char **argv);
+int FAST_FUNC do_ipneigh(char **argv);
 int FAST_FUNC do_iptunnel(char **argv);
 int FAST_FUNC do_iplink(char **argv);

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

@@ -68 +68 @@
             arg = index_in_strings(families, *argv);
             if (arg < 0)
-                invarg(*argv, "protocol family");
+                invarg_1_to_2(*argv, "family");
             /* now arg == 0, 1 or 2 */
         } else {

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);
+}

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

@@ -2 +2 @@
 /*
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *          Patrick McHardy <kaber@trash.net>
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include <net/if.h>
-#include <net/if_packet.h>
+/*#include <net/if_packet.h> - not needed? */
 #include <netpacket/packet.h>
 #include <netinet/if_ether.h>
 
+#include <linux/if_vlan.h>
 #include "ip_common.h"  /* #include "libbb.h" is inside */
 #include "rt_names.h"
 #include "utils.h"
 
+#undef  ETH_P_8021AD
+#define ETH_P_8021AD            0x88A8
+#undef  VLAN_FLAG_REORDER_HDR
+#define VLAN_FLAG_REORDER_HDR   0x1
+#undef  VLAN_FLAG_GVRP
+#define VLAN_FLAG_GVRP          0x2
+#undef  VLAN_FLAG_LOOSE_BINDING
+#define VLAN_FLAG_LOOSE_BINDING 0x4
+#undef  VLAN_FLAG_MVRP
+#define VLAN_FLAG_MVRP          0x8
+#undef  IFLA_VLAN_PROTOCOL
+#define IFLA_VLAN_PROTOCOL      5
+
 #ifndef IFLA_LINKINFO
 # define IFLA_LINKINFO 18
 # define IFLA_INFO_KIND 1
+# define IFLA_INFO_DATA 2
+#endif
+
+#ifndef IFLA_VLAN_MAX
+# define IFLA_VLAN_ID 1
+# define IFLA_VLAN_FLAGS 2
+struct ifla_vlan_flags {
+    uint32_t    flags;
+    uint32_t    mask;
+};
 #endif
 
 /* taken from linux/sockios.h */
 #define SIOCSIFNAME  0x8923  /* set interface name */
+
+#if 0
+# define dbg(...) bb_error_msg(__VA_ARGS__)
+#else
+# define dbg(...) ((void)0)
+#endif
 
 /* Exits on error */
@@ -278 +309 @@
 }
 
+static void vlan_parse_opt(char **argv, struct nlmsghdr *n, unsigned int size)
+{
+    static const char keywords[] ALIGN1 =
+        "id\0"
+        "protocol\0"
+        "reorder_hdr\0"
+        "gvrp\0"
+        "mvrp\0"
+        "loose_binding\0"
+    ;
+    static const char protocols[] ALIGN1 =
+        "802.1q\0"
+        "802.1ad\0"
+    ;
+    static const char str_on_off[] ALIGN1 =
+        "on\0"
+        "off\0"
+    ;
+    enum {
+        ARG_id = 0,
+        ARG_reorder_hdr,
+        ARG_gvrp,
+        ARG_mvrp,
+        ARG_loose_binding,
+        ARG_protocol,
+    };
+    enum {
+        PROTO_8021Q = 0,
+        PROTO_8021AD,
+    };
+    enum {
+        PARM_on = 0,
+        PARM_off
+    };
+    int arg;
+    uint16_t id, proto;
+    struct ifla_vlan_flags flags = {};
+
+    while (*argv) {
+        arg = index_in_substrings(keywords, *argv);
+        if (arg < 0)
+            invarg_1_to_2(*argv, "type vlan");
+
+        NEXT_ARG();
+        if (arg == ARG_id) {
+            id = get_u16(*argv, "id");
+            addattr_l(n, size, IFLA_VLAN_ID, &id, sizeof(id));
+        } else if (arg == ARG_protocol) {
+            arg = index_in_substrings(protocols, *argv);
+            if (arg == PROTO_8021Q)
+                proto = ETH_P_8021Q;
+            else if (arg == PROTO_8021AD)
+                proto = ETH_P_8021AD;
+            else
+                bb_error_msg_and_die("unknown VLAN encapsulation protocol '%s'",
+                                     *argv);
+            addattr_l(n, size, IFLA_VLAN_PROTOCOL, &proto, sizeof(proto));
+        } else {
+            int param = index_in_strings(str_on_off, *argv);
+            if (param < 0)
+                die_must_be_on_off(nth_string(keywords, arg));
+
+            if (arg == ARG_reorder_hdr) {
+                flags.mask |= VLAN_FLAG_REORDER_HDR;
+                flags.flags &= ~VLAN_FLAG_REORDER_HDR;
+                if (param == PARM_on)
+                    flags.flags |= VLAN_FLAG_REORDER_HDR;
+            } else if (arg == ARG_gvrp) {
+                flags.mask |= VLAN_FLAG_GVRP;
+                flags.flags &= ~VLAN_FLAG_GVRP;
+                if (param == PARM_on)
+                    flags.flags |= VLAN_FLAG_GVRP;
+            } else if (arg == ARG_mvrp) {
+                flags.mask |= VLAN_FLAG_MVRP;
+                flags.flags &= ~VLAN_FLAG_MVRP;
+                if (param == PARM_on)
+                    flags.flags |= VLAN_FLAG_MVRP;
+            } else { /*if (arg == ARG_loose_binding) */
+                flags.mask |= VLAN_FLAG_LOOSE_BINDING;
+                flags.flags &= ~VLAN_FLAG_LOOSE_BINDING;
+                if (param == PARM_on)
+                    flags.flags |= VLAN_FLAG_LOOSE_BINDING;
+            }
+        }
+        argv++;
+    }
+
+    if (flags.mask)
+        addattr_l(n, size, IFLA_VLAN_FLAGS, &flags, sizeof(flags));
+}
+
 #ifndef NLMSG_TAIL
 #define NLMSG_TAIL(nmsg) \
@@ -283 +405 @@
 #endif
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_change(char **argv, const unsigned rtm)
+static int do_add_or_delete(char **argv, const unsigned rtm)
 {
     static const char keywords[] ALIGN1 =
-        "link\0""name\0""type\0""dev\0";
+        "link\0""name\0""type\0""dev\0""address\0";
     enum {
         ARG_link,
@@ -292 +414 @@
         ARG_type,
         ARG_dev,
+        ARG_address,
     };
     struct rtnl_handle rth;
@@ -300 +423 @@
     } req;
     smalluint arg;
-    char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
+    char *name_str = NULL;
+    char *link_str = NULL;
+    char *type_str = NULL;
+    char *dev_str = NULL;
+    char *address_str = NULL;
 
     memset(&req, 0, sizeof(req));
@@ -313 +440 @@
     while (*argv) {
         arg = index_in_substrings(keywords, *argv);
+        if (arg == ARG_type) {
+            NEXT_ARG();
+            type_str = *argv++;
+            dbg("type_str:'%s'", type_str);
+            break;
+        }
         if (arg == ARG_link) {
             NEXT_ARG();
             link_str = *argv;
+            dbg("link_str:'%s'", link_str);
         } else if (arg == ARG_name) {
             NEXT_ARG();
             name_str = *argv;
-        } else if (arg == ARG_type) {
-            NEXT_ARG();
-            type_str = *argv;
+            dbg("name_str:'%s'", name_str);
+        } else if (arg == ARG_address) {
+            NEXT_ARG();
+            address_str = *argv;
+            dbg("address_str:'%s'", name_str);
         } else {
             if (arg == ARG_dev) {
@@ -329 +465 @@
             }
             dev_str = *argv;
+            dbg("dev_str:'%s'", dev_str);
         }
         argv++;
@@ -340 +477 @@
         addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type_str,
                 strlen(type_str));
+
+        if (*argv) {
+            struct rtattr *data = NLMSG_TAIL(&req.n);
+            addattr_l(&req.n, sizeof(req), IFLA_INFO_DATA, NULL, 0);
+
+            if (strcmp(type_str, "vlan") == 0)
+                vlan_parse_opt(argv, &req.n, sizeof(req));
+
+            data->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)data;
+        }
+
         linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo;
     }
@@ -353 +501 @@
             addattr_l(&req.n, sizeof(req), IFLA_LINK, &idx, 4);
         }
+        if (address_str) {
+            unsigned char abuf[32];
+            int len = ll_addr_a2n(abuf, sizeof(abuf), address_str);
+            dbg("address len:%d", len);
+            if (len < 0)
+                return -1;
+            addattr_l(&req.n, sizeof(req), IFLA_ADDRESS, abuf, len);
+        }
     }
     if (name_str) {
         const size_t name_len = strlen(name_str) + 1;
         if (name_len < 2 || name_len > IFNAMSIZ)
-            invarg(name_str, "name");
+            invarg_1_to_2(name_str, "name");
         addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name_str, name_len);
     }
@@ -365 +521 @@
 }
 
+/* Other keywords recognized by iproute2-3.12.0: */
+#if 0
+        } else if (matches(*argv, "broadcast") == 0 ||
+                strcmp(*argv, "brd") == 0) {
+            NEXT_ARG();
+            len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
+            if (len < 0)
+                return -1;
+            addattr_l(&req->n, sizeof(*req), IFLA_BROADCAST, abuf, len);
+        } else if (matches(*argv, "txqueuelen") == 0 ||
+                strcmp(*argv, "qlen") == 0 ||
+                matches(*argv, "txqlen") == 0) {
+            NEXT_ARG();
+            if (qlen != -1)
+                duparg("txqueuelen", *argv);
+            if (get_integer(&qlen,  *argv, 0))
+                invarg_1_to_2(*argv, "txqueuelen");
+            addattr_l(&req->n, sizeof(*req), IFLA_TXQLEN, &qlen, 4);
+        } else if (strcmp(*argv, "mtu") == 0) {
+            NEXT_ARG();
+            if (mtu != -1)
+                duparg("mtu", *argv);
+            if (get_integer(&mtu, *argv, 0))
+                invarg_1_to_2(*argv, "mtu");
+            addattr_l(&req->n, sizeof(*req), IFLA_MTU, &mtu, 4);
+                } else if (strcmp(*argv, "netns") == 0) {
+                        NEXT_ARG();
+                        if (netns != -1)
+                                duparg("netns", *argv);
+            if ((netns = get_netns_fd(*argv)) >= 0)
+                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_FD, &netns, 4);
+            else if (get_integer(&netns, *argv, 0) == 0)
+                addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
+            else
+                                invarg_1_to_2(*argv, "netns");
+        } else if (strcmp(*argv, "multicast") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_MULTICAST;
+            if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags |= IFF_MULTICAST;
+            } else if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags &= ~IFF_MULTICAST;
+            } else
+                return on_off("multicast", *argv);
+        } else if (strcmp(*argv, "allmulticast") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_ALLMULTI;
+            if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags |= IFF_ALLMULTI;
+            } else if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags &= ~IFF_ALLMULTI;
+            } else
+                return on_off("allmulticast", *argv);
+        } else if (strcmp(*argv, "promisc") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_PROMISC;
+            if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags |= IFF_PROMISC;
+            } else if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags &= ~IFF_PROMISC;
+            } else
+                return on_off("promisc", *argv);
+        } else if (strcmp(*argv, "trailers") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_NOTRAILERS;
+            if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags |= IFF_NOTRAILERS;
+            } else if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags &= ~IFF_NOTRAILERS;
+            } else
+                return on_off("trailers", *argv);
+        } else if (strcmp(*argv, "arp") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_NOARP;
+            if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags &= ~IFF_NOARP;
+            } else if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags |= IFF_NOARP;
+            } else
+                return on_off("noarp", *argv);
+        } else if (strcmp(*argv, "vf") == 0) {
+            struct rtattr *vflist;
+            NEXT_ARG();
+            if (get_integer(&vf,  *argv, 0)) {
+                invarg_1_to_2(*argv, "vf");
+            }
+            vflist = addattr_nest(&req->n, sizeof(*req),
+                          IFLA_VFINFO_LIST);
+            len = iplink_parse_vf(vf, &argc, &argv, req);
+            if (len < 0)
+                return -1;
+            addattr_nest_end(&req->n, vflist);
+        } else if (matches(*argv, "master") == 0) {
+            int ifindex;
+            NEXT_ARG();
+            ifindex = ll_name_to_index(*argv);
+            if (!ifindex)
+                invarg_1_to_2(*argv, "master");
+            addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
+                  &ifindex, 4);
+        } else if (matches(*argv, "nomaster") == 0) {
+            int ifindex = 0;
+            addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
+                  &ifindex, 4);
+        } else if (matches(*argv, "dynamic") == 0) {
+            NEXT_ARG();
+            req->i.ifi_change |= IFF_DYNAMIC;
+            if (strcmp(*argv, "on") == 0) {
+                req->i.ifi_flags |= IFF_DYNAMIC;
+            } else if (strcmp(*argv, "off") == 0) {
+                req->i.ifi_flags &= ~IFF_DYNAMIC;
+            } else
+                return on_off("dynamic", *argv);
+        } else if (matches(*argv, "alias") == 0) {
+            NEXT_ARG();
+            addattr_l(&req->n, sizeof(*req), IFLA_IFALIAS,
+                  *argv, strlen(*argv));
+            argc--; argv++;
+            break;
+        } else if (strcmp(*argv, "group") == 0) {
+            NEXT_ARG();
+            if (*group != -1)
+                duparg("group", *argv);
+            if (rtnl_group_a2n(group, *argv))
+                invarg_1_to_2(*argv, "group");
+        } else if (strcmp(*argv, "mode") == 0) {
+            int mode;
+            NEXT_ARG();
+            mode = get_link_mode(*argv);
+            if (mode < 0)
+                invarg_1_to_2(*argv, "mode");
+            addattr8(&req->n, sizeof(*req), IFLA_LINKMODE, mode);
+        } else if (strcmp(*argv, "state") == 0) {
+            int state;
+            NEXT_ARG();
+            state = get_operstate(*argv);
+            if (state < 0)
+                invarg_1_to_2(*argv, "state");
+            addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state);
+        } else if (matches(*argv, "numtxqueues") == 0) {
+            NEXT_ARG();
+            if (numtxqueues != -1)
+                duparg("numtxqueues", *argv);
+            if (get_integer(&numtxqueues, *argv, 0))
+                invarg_1_to_2(*argv, "numtxqueues");
+            addattr_l(&req->n, sizeof(*req), IFLA_NUM_TX_QUEUES,
+                  &numtxqueues, 4);
+        } else if (matches(*argv, "numrxqueues") == 0) {
+            NEXT_ARG();
+            if (numrxqueues != -1)
+                duparg("numrxqueues", *argv);
+            if (get_integer(&numrxqueues, *argv, 0))
+                invarg_1_to_2(*argv, "numrxqueues");
+            addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+                  &numrxqueues, 4);
+        }
+#endif
+
 /* Return value becomes exitcode. It's okay to not return at all */
 int FAST_FUNC do_iplink(char **argv)
@@ -371 +685 @@
         "add\0""delete\0""set\0""show\0""lst\0""list\0";
     if (*argv) {
-        smalluint key = index_in_substrings(keywords, *argv);
-        if (key > 5) /* invalid argument */
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        int key = index_in_substrings(keywords, *argv);
+        if (key < 0) /* invalid argument */
+            invarg_1_to_2(*argv, applet_name);
         argv++;
         if (key <= 1) /* add/delete */
-            return do_change(argv, key ? RTM_DELLINK : RTM_NEWLINK);
-        else if (key == 2) /* set */
+            return do_add_or_delete(argv, key ? RTM_DELLINK : RTM_NEWLINK);
+        if (key == 2) /* set */
             return do_set(argv);
     }

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

@@ -12 +12 @@
 
 #include "ip_common.h"  /* #include "libbb.h" is inside */
+#include "common_bufsiz.h"
 #include "rt_names.h"
 #include "utils.h"
@@ -44 +45 @@
 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 int flush_update(void)
@@ -54 +56 @@
     G_filter.flushp = 0;
     return 0;
-}
-
-static unsigned get_hz(void)
-{
-    static unsigned hz_internal;
-    FILE *fp;
-
-    if (hz_internal)
-        return hz_internal;
-
-    fp = fopen_for_read("/proc/net/psched");
-    if (fp) {
-        unsigned nom, denom;
-
-        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
-            if (nom == 1000000)
-                hz_internal = denom;
-        fclose(fp);
-    }
-    if (!hz_internal)
-        hz_internal = sysconf(_SC_CLK_TCK);
-    return hz_internal;
 }
 
@@ -84 +64 @@
     int len = n->nlmsg_len;
     struct rtattr *tb[RTA_MAX+1];
-    char abuf[256];
     inet_prefix dst;
     inet_prefix src;
     int host_len = -1;
-    SPRINT_BUF(b1);
 
     if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
@@ -219 +197 @@
         if (NLMSG_ALIGN(G_filter.flushp) + n->nlmsg_len > G_filter.flushe) {
             if (flush_update())
-                bb_error_msg_and_die("flush");
+                xfunc_die();
         }
         fn = (void*)(G_filter.flushb + NLMSG_ALIGN(G_filter.flushp));
@@ -237 +215 @@
     }
     if (r->rtm_type != RTN_UNICAST /* && !G_filter.type - always 0 */) {
-        printf("%s ", rtnl_rtntype_n2a(r->rtm_type, b1));
+        printf("%s ", rtnl_rtntype_n2a(r->rtm_type));
     }
 
     if (tb[RTA_DST]) {
         if (r->rtm_dst_len != host_len) {
-            printf("%s/%u ", rt_addr_n2a(r->rtm_family,
-                        RTA_DATA(tb[RTA_DST]),
-                        abuf, sizeof(abuf)),
-                    r->rtm_dst_len
-                    );
+            printf("%s/%u ",
+                rt_addr_n2a(r->rtm_family, RTA_DATA(tb[RTA_DST])),
+                r->rtm_dst_len
+            );
         } else {
             printf("%s ", format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_DST]),
-                        RTA_DATA(tb[RTA_DST]),
-                        abuf, sizeof(abuf))
-                    );
+                        RTA_DATA(tb[RTA_DST]))
+            );
         }
     } else if (r->rtm_dst_len) {
@@ -261 +237 @@
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            printf("from %s/%u ", rt_addr_n2a(r->rtm_family,
-                        RTA_DATA(tb[RTA_SRC]),
-                        abuf, sizeof(abuf)),
-                    r->rtm_src_len
-                    );
+            printf("from %s/%u ",
+                rt_addr_n2a(r->rtm_family, RTA_DATA(tb[RTA_SRC])),
+                r->rtm_src_len
+            );
         } else {
             printf("from %s ", format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_SRC]),
-                        RTA_DATA(tb[RTA_SRC]),
-                        abuf, sizeof(abuf))
-                    );
+                        RTA_DATA(tb[RTA_SRC]))
+            );
         }
     } else if (r->rtm_src_len) {
@@ -279 +253 @@
         printf("via %s ", format_host(r->rtm_family,
                     RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                    RTA_DATA(tb[RTA_GATEWAY]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(tb[RTA_GATEWAY]))
+        );
     }
     if (tb[RTA_OIF]) {
@@ -293 +267 @@
          */
         printf(" src %s ", rt_addr_n2a(r->rtm_family,
-                    RTA_DATA(tb[RTA_PREFSRC]),
-                    abuf, sizeof(abuf)));
+                    RTA_DATA(tb[RTA_PREFSRC])));
     }
     if (tb[RTA_PRIORITY]) {
         printf(" metric %d ", *(uint32_t*)RTA_DATA(tb[RTA_PRIORITY]));
     }
+    if (r->rtm_flags & RTNH_F_DEAD) {
+        printf("dead ");
+    }
+    if (r->rtm_flags & RTNH_F_ONLINK) {
+        printf("onlink ");
+    }
+    if (r->rtm_flags & RTNH_F_PERVASIVE) {
+        printf("pervasive ");
+    }
+    if (r->rtm_flags & RTM_F_NOTIFY) {
+        printf("notify ");
+    }
+
     if (r->rtm_family == AF_INET6) {
         struct rta_cacheinfo *ci = NULL;
@@ -330 +316 @@
 {
     static const char keywords[] ALIGN1 =
-        "src\0""via\0""mtu\0""lock\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
-        "dev\0""oif\0""to\0""metric\0";
+        "src\0""via\0""mtu\0""lock\0""scope\0""protocol\0"IF_FEATURE_IP_RULE("table\0")
+        "dev\0""oif\0""to\0""metric\0""onlink\0";
     enum {
         ARG_src,
         ARG_via,
         ARG_mtu, PARM_lock,
+        ARG_scope,
         ARG_protocol,
 IF_FEATURE_IP_RULE(ARG_table,)
@@ -342 +329 @@
         ARG_to,
         ARG_metric,
+        ARG_onlink,
     };
     enum {
@@ -360 +348 @@
     char *d = NULL;
     smalluint ok = 0;
+    smalluint scope_ok = 0;
     int arg;
 
@@ -368 +357 @@
     req.n.nlmsg_type = cmd;
     req.r.rtm_family = preferred_family;
-    if (RT_TABLE_MAIN) /* if it is zero, memset already did it */
+    if (RT_TABLE_MAIN != 0) /* if it is zero, memset already did it */
         req.r.rtm_table = RT_TABLE_MAIN;
-    if (RT_SCOPE_NOWHERE)
+    if (RT_SCOPE_NOWHERE != 0)
         req.r.rtm_scope = RT_SCOPE_NOWHERE;
 
     if (cmd != RTM_DELROUTE) {
-        req.r.rtm_protocol = RTPROT_BOOT;
         req.r.rtm_scope = RT_SCOPE_UNIVERSE;
-        req.r.rtm_type = RTN_UNICAST;
+        if (RTPROT_BOOT != 0)
+            req.r.rtm_protocol = RTPROT_BOOT;
+        if (RTN_UNICAST != 0)
+            req.r.rtm_type = RTN_UNICAST;
     }
 
@@ -409 +400 @@
             mtu = get_unsigned(*argv, "mtu");
             rta_addattr32(mxrta, sizeof(mxbuf), RTAX_MTU, mtu);
+        } else if (arg == ARG_scope) {
+            uint32_t scope;
+            NEXT_ARG();
+            if (rtnl_rtscope_a2n(&scope, *argv))
+                invarg_1_to_2(*argv, "scope");
+            req.r.rtm_scope = scope;
+            scope_ok = 1;
         } else if (arg == ARG_protocol) {
             uint32_t prot;
             NEXT_ARG();
             if (rtnl_rtprot_a2n(&prot, *argv))
-                invarg(*argv, "protocol");
+                invarg_1_to_2(*argv, "protocol");
             req.r.rtm_protocol = prot;
             ok |= proto_ok;
@@ -421 +419 @@
             NEXT_ARG();
             if (rtnl_rttable_a2n(&tid, *argv))
-                invarg(*argv, "table");
+                invarg_1_to_2(*argv, "table");
             req.r.rtm_table = tid;
 #endif
@@ -432 +430 @@
             metric = get_u32(*argv, "metric");
             addattr32(&req.n, sizeof(req), RTA_PRIORITY, metric);
+        } else if (arg == ARG_onlink) {
+            req.r.rtm_flags |= RTNH_F_ONLINK;
         } else {
             int type;
@@ -483 +483 @@
     }
 
-    if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
-        req.r.rtm_scope = RT_SCOPE_HOST;
-    else
-    if (req.r.rtm_type == RTN_BROADCAST
-     || req.r.rtm_type == RTN_MULTICAST
-     || req.r.rtm_type == RTN_ANYCAST
-    ) {
-        req.r.rtm_scope = RT_SCOPE_LINK;
-    }
-    else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
-        if (cmd == RTM_DELROUTE)
-            req.r.rtm_scope = RT_SCOPE_NOWHERE;
-        else if (!(ok & gw_ok))
+    if (!scope_ok) {
+        if (req.r.rtm_type == RTN_LOCAL || req.r.rtm_type == RTN_NAT)
+            req.r.rtm_scope = RT_SCOPE_HOST;
+        else
+        if (req.r.rtm_type == RTN_BROADCAST
+         || req.r.rtm_type == RTN_MULTICAST
+         || req.r.rtm_type == RTN_ANYCAST
+        ) {
             req.r.rtm_scope = RT_SCOPE_LINK;
+        }
+        else if (req.r.rtm_type == RTN_UNICAST || req.r.rtm_type == RTN_UNSPEC) {
+            if (cmd == RTM_DELROUTE)
+                req.r.rtm_scope = RT_SCOPE_NOWHERE;
+            else if (!(ok & gw_ok))
+                req.r.rtm_scope = RT_SCOPE_LINK;
+        }
     }
 
@@ -605 +607 @@
             if (rtnl_rtprot_a2n(&prot, *argv)) {
                 if (index_in_strings(keywords, *argv) != KW_all)
-                    invarg(*argv, "protocol");
+                    invarg_1_to_2(*argv, "protocol");
                 prot = 0;
                 //G_filter.protocolmask = 0;
@@ -630 +632 @@
                 uint32_t tid;
                 if (rtnl_rttable_a2n(&tid, *argv))
-                    invarg(*argv, "table");
+                    invarg_1_to_2(*argv, "table");
                 G_filter.tb = tid;
 #else
-                invarg(*argv, "table");
+                invarg_1_to_2(*argv, "table");
 #endif
             }
@@ -901 +903 @@
     unsigned flags = 0;
     int cmd = RTM_NEWROUTE;
+
+    INIT_G();
 
     if (!*argv)
@@ -940 +944 @@
             return iproute_list_or_flush(argv+1, 1);
         default:
-            bb_error_msg_and_die("unknown command %s", *argv);
+            invarg_1_to_2(*argv, applet_name);
     }
 

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

@@ -45 +45 @@
     int host_len = -1;
     struct rtattr * tb[RTA_MAX+1];
-    char abuf[256];
-    SPRINT_BUF(b1);
 
     if (n->nlmsg_type != RTM_NEWRULE)
@@ -73 +71 @@
     if (tb[RTA_SRC]) {
         if (r->rtm_src_len != host_len) {
-            printf("%s/%u", rt_addr_n2a(r->rtm_family,
-                            RTA_DATA(tb[RTA_SRC]),
-                            abuf, sizeof(abuf)),
+            printf("%s/%u",
+                rt_addr_n2a(r->rtm_family, RTA_DATA(tb[RTA_SRC])),
                 r->rtm_src_len
             );
@@ -81 +78 @@
             fputs(format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_SRC]),
-                        RTA_DATA(tb[RTA_SRC]),
-                        abuf, sizeof(abuf)),
+                        RTA_DATA(tb[RTA_SRC])),
                 stdout
             );
@@ -96 +92 @@
         if (r->rtm_dst_len != host_len) {
             printf("to %s/%u ", rt_addr_n2a(r->rtm_family,
-                             RTA_DATA(tb[RTA_DST]),
-                             abuf, sizeof(abuf)),
+                             RTA_DATA(tb[RTA_DST])),
                 r->rtm_dst_len
                 );
@@ -103 +98 @@
             printf("to %s ", format_host(r->rtm_family,
                                RTA_PAYLOAD(tb[RTA_DST]),
-                               RTA_DATA(tb[RTA_DST]),
-                               abuf, sizeof(abuf)));
+                               RTA_DATA(tb[RTA_DST])));
         }
     } else if (r->rtm_dst_len) {
@@ -111 +105 @@
 
     if (r->rtm_tos) {
-        printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos, b1));
+        printf("tos %s ", rtnl_dsfield_n2a(r->rtm_tos));
     }
     if (tb[RTA_PROTOINFO]) {
@@ -122 +116 @@
 
     if (r->rtm_table)
-        printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table, b1));
+        printf("lookup %s ", rtnl_rttable_n2a(r->rtm_table));
 
     if (tb[RTA_FLOW]) {
@@ -130 +124 @@
         if (from) {
             printf("realms %s/",
-                rtnl_rtrealm_n2a(from, b1));
+                rtnl_rtrealm_n2a(from));
         }
         printf("%s ",
-            rtnl_rtrealm_n2a(to, b1));
+            rtnl_rtrealm_n2a(to));
     }
 
@@ -141 +135 @@
                 format_host(r->rtm_family,
                         RTA_PAYLOAD(tb[RTA_GATEWAY]),
-                        RTA_DATA(tb[RTA_GATEWAY]),
-                        abuf, sizeof(abuf)));
+                        RTA_DATA(tb[RTA_GATEWAY]))
+            );
         } else
             printf("masquerade");
     } else if (r->rtm_type != RTN_UNICAST)
-        fputs(rtnl_rtntype_n2a(r->rtm_type, b1), stdout);
+        fputs(rtnl_rtntype_n2a(r->rtm_type), stdout);
 
     bb_putchar('\n');
@@ -216 +210 @@
         key = index_in_substrings(keywords, *argv) + 1;
         if (key == 0) /* no match found in keywords array, bail out. */
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+            invarg_1_to_2(*argv, applet_name);
         if (key == ARG_from) {
             inet_prefix dst;
@@ -241 +235 @@
             NEXT_ARG();
             if (rtnl_dsfield_a2n(&tos, *argv))
-                invarg(*argv, "TOS");
+                invarg_1_to_2(*argv, "TOS");
             req.r.rtm_tos = tos;
         } else if (key == ARG_fwmark) {
@@ -252 +246 @@
             NEXT_ARG();
             if (get_rt_realms(&realm, *argv))
-                invarg(*argv, "realms");
+                invarg_1_to_2(*argv, "realms");
             addattr32(&req.n, sizeof(req), RTA_FLOW, realm);
         } else if (key == ARG_table ||
@@ -260 +254 @@
             NEXT_ARG();
             if (rtnl_rttable_a2n(&tid, *argv))
-                invarg(*argv, "table ID");
+                invarg_1_to_2(*argv, "table ID");
             req.r.rtm_table = tid;
             table_ok = 1;
@@ -283 +277 @@
                 bb_show_usage();
             if (rtnl_rtntype_a2n(&type, *argv))
-                invarg(*argv, "type");
+                invarg_1_to_2(*argv, "type");
             req.r.rtm_type = type;
         }
@@ -309 +303 @@
         "add\0""delete\0""list\0""show\0";
     if (*argv) {
-        smalluint cmd = index_in_substrings(ip_rule_commands, *argv);
-        if (cmd > 3)
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        int cmd = index_in_substrings(ip_rule_commands, *argv);
+        if (cmd < 0)
+            invarg_1_to_2(*argv, applet_name);
         argv++;
         if (cmd < 2)

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

@@ -295 +295 @@
                 uval = get_unsigned(*argv, "TTL");
                 if (uval > 255)
-                    invarg(*argv, "TTL must be <=255");
+                    invarg_1_to_2(*argv, "TTL");
                 p->iph.ttl = uval;
             }
@@ -306 +306 @@
             if (key != ARG_inherit) {
                 if (rtnl_dsfield_a2n(&uval, *argv))
-                    invarg(*argv, "TOS");
+                    invarg_1_to_2(*argv, "TOS");
                 p->iph.tos = uval;
             } else
@@ -405 +405 @@
 static void print_tunnel(struct ip_tunnel_parm *p)
 {
-    char s1[256];
-    char s2[256];
-    char s3[64];
-    char s4[64];
-
-    format_host(AF_INET, 4, &p->iph.daddr, s1, sizeof(s1));
-    format_host(AF_INET, 4, &p->iph.saddr, s2, sizeof(s2));
-    inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
-    inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
+    char s3[INET_ADDRSTRLEN];
+    char s4[INET_ADDRSTRLEN];
 
     printf("%s: %s/ip  remote %s  local %s ",
-           p->name,
-           p->iph.protocol == IPPROTO_IPIP ? "ip" :
-           (p->iph.protocol == IPPROTO_GRE ? "gre" :
-        (p->iph.protocol == IPPROTO_IPV6 ? "ipv6" : "unknown")),
-           p->iph.daddr ? s1 : "any", p->iph.saddr ? s2 : "any");
+        p->name,
+        p->iph.protocol == IPPROTO_IPIP ? "ip" :
+            p->iph.protocol == IPPROTO_GRE ? "gre" :
+            p->iph.protocol == IPPROTO_IPV6 ? "ipv6" :
+            "unknown",
+        p->iph.daddr ? format_host(AF_INET, 4, &p->iph.daddr) : "any",
+        p->iph.saddr ? format_host(AF_INET, 4, &p->iph.saddr) : "any"
+    );
     if (p->link) {
         char *n = do_ioctl_get_ifname(p->link);
@@ -433 +429 @@
         printf(" ttl inherit ");
     if (p->iph.tos) {
-        SPRINT_BUF(b1);
         printf(" tos");
         if (p->iph.tos & 1)
@@ -439 +434 @@
         if (p->iph.tos & ~1)
             printf("%c%s ", p->iph.tos & 1 ? '/' : ' ',
-                rtnl_dsfield_n2a(p->iph.tos & ~1, b1));
+                rtnl_dsfield_n2a(p->iph.tos & ~1));
     }
     if (!(p->iph.frag_off & htons(IP_DF)))
         printf(" nopmtudisc");
 
+    inet_ntop(AF_INET, &p->i_key, s3, sizeof(s3));
+    inet_ntop(AF_INET, &p->o_key, s4, sizeof(s4));
     if ((p->i_flags & GRE_KEY) && (p->o_flags & GRE_KEY) && p->o_key == p->i_key)
         printf(" key %s", s3);
-    else if ((p->i_flags | p->o_flags) & GRE_KEY) {
+    else {
         if (p->i_flags & GRE_KEY)
             printf(" ikey %s ", s3);
@@ -562 +559 @@
 
     if (*argv) {
-        smalluint key = index_in_substrings(keywords, *argv);
-        if (key > 5)
-            bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
+        int key = index_in_substrings(keywords, *argv);
+        if (key < 0)
+            invarg_1_to_2(*argv, applet_name);
         argv++;
         if (key == ARG_add)

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

@@ -72 +72 @@
     struct sockaddr_nl nladdr;
     struct iovec iov[2] = { { &nlh, sizeof(nlh) }, { req, len } };
+    /* Use designated initializers, struct layout is non-portable */
     struct msghdr msg = {
-        (void*)&nladdr, sizeof(nladdr),
-        iov,  2,
-        NULL, 0,
-        0
+        .msg_name = (void*)&nladdr,
+        .msg_namelen = sizeof(nladdr),
+        .msg_iov = iov,
+        .msg_iovlen = 2,
+        .msg_control = NULL,
+        .msg_controllen = 0,
+        .msg_flags = 0
     };
 
@@ -105 +109 @@
         int status;
         struct nlmsghdr *h;
-
+        /* Use designated initializers, struct layout is non-portable */
         struct msghdr msg = {
-            (void*)&nladdr, sizeof(nladdr),
-            &iov, 1,
-            NULL, 0,
-            0
+            .msg_name = (void*)&nladdr,
+            .msg_namelen = sizeof(nladdr),
+            .msg_iov = &iov,
+            .msg_iovlen = 1,
+            .msg_control = NULL,
+            .msg_controllen = 0,
+            .msg_flags = 0
         };
 
@@ -212 +219 @@
     struct iovec iov = { (void*)n, n->nlmsg_len };
     char   *buf = xmalloc(8*1024); /* avoid big stack buffer */
+    /* Use designated initializers, struct layout is non-portable */
     struct msghdr msg = {
-        (void*)&nladdr, sizeof(nladdr),
-        &iov, 1,
-        NULL, 0,
-        0
+        .msg_name = (void*)&nladdr,
+        .msg_namelen = sizeof(nladdr),
+        .msg_iov = &iov,
+        .msg_iovlen = 1,
+        .msg_control = NULL,
+        .msg_controllen = 0,
+        .msg_flags = 0
     };
 

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

@@ -87 +87 @@
 }
 
-const char FAST_FUNC *ll_idx_n2a(int idx, char *buf)
+static
+const char FAST_FUNC *ll_idx_n2a(int idx/*, char *buf*/)
 {
     struct idxmap *im;
@@ -96 +97 @@
     if (im)
         return im->name;
-    snprintf(buf, 16, "if%d", idx);
-    return buf;
+    //snprintf(buf, 16, "if%d", idx);
+    //return buf;
+    return auto_string(xasprintf("if%d", idx));
 }
-
 
 const char FAST_FUNC *ll_index_to_name(int idx)
 {
-    static char nbuf[16];
-
-    return ll_idx_n2a(idx, nbuf);
+    //static char nbuf[16];
+    return ll_idx_n2a(idx/*, nbuf*/);
 }
 
@@ -137 +137 @@
 {
     int ret = 0;
-    int sock_fd;
 
 /* caching is not warranted - no users which repeatedly call it */
@@ -165 +164 @@
         }
     }
-    /* We have not found the interface in our cache, but the kernel
-     * may still know about it. One reason is that we may be using
-     * module on-demand loading, which means that the kernel will
-     * load the module and make the interface exist only when
-     * we explicitely request it (check for dev_load() in net/core/dev.c).
-     * I can think of other similar scenario, but they are less common...
-     * Jean II */
 #endif
-
-    sock_fd = socket(AF_INET, SOCK_DGRAM, 0);
-    if (sock_fd >= 0) {
-        struct ifreq ifr;
-        int tmp;
-
-        strncpy_IFNAMSIZ(ifr.ifr_name, name);
-        ifr.ifr_ifindex = -1;
-        tmp = ioctl(sock_fd, SIOCGIFINDEX, &ifr);
-        close(sock_fd);
-        if (tmp >= 0)
-            /* In theory, we should redump the interface list
-             * to update our cache, this is left as an exercise
-             * to the reader... Jean II */
-            ret = ifr.ifr_ifindex;
-    }
+    ret = if_nametoindex(name);
 /* out:*/
     if (ret <= 0)

branches/3.3/mindi-busybox/networking/libiproute/ll_map.h

@@ -8 +8 @@
 int ll_init_map(struct rtnl_handle *rth) FAST_FUNC;
 int xll_name_to_index(const char *name) FAST_FUNC;
+//static: const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
 const char *ll_index_to_name(int idx) FAST_FUNC;
-const char *ll_idx_n2a(int idx, char *buf) FAST_FUNC;
 /* int ll_index_to_type(int idx); */
 unsigned ll_index_to_flags(int idx) FAST_FUNC;

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

@@ -85 +85 @@
 /* Keep declarations above and below in sync! */
 
-static const char llproto_names[] =
+static const char llproto_names[] ALIGN1 =
 #define __PF(f,n) #n "\0"
 __PF(LOOP,loop)

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

@@ -17 +17 @@
 const char* FAST_FUNC ll_type_n2a(int type, char *buf)
 {
-    static const char arphrd_name[] =
+    static const char arphrd_name[] ALIGN1 =
     /* 0,                  */ "generic" "\0"
     /* ARPHRD_LOOPBACK,    */ "loopback" "\0"
@@ -106 +106 @@
     /* Keep these arrays in sync! */
 
-    static const uint16_t arphrd_type[] = {
+    static const uint16_t arphrd_type[] ALIGN2 = {
     0,                  /* "generic" "\0" */
     ARPHRD_LOOPBACK,    /* "loopback" "\0" */

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

@@ -11 +11 @@
 #include "rt_names.h"
 
+#define CONFDIR          CONFIG_FEATURE_IP_ROUTE_DIR
+
 typedef struct rtnl_tab_t {
     const char *cached_str;
     unsigned cached_result;
-    const char *tab[256];
+    /* upstream version switched to a hash table and removed
+     * id < 256 limit. For now bbox bumps this array size from 256
+     * to 1024. If you plan to change this to a hash table,
+     * consider merging several hash tables we have (for example,
+     * awk has resizable one!
+     */
+#define RT_TABLE_MAX 1023
+    const char *tab[RT_TABLE_MAX+1];
 } rtnl_tab_t;
 
@@ -20 +29 @@
 {
     char *token[2];
-    parser_t *parser = config_open2(file, fopen_for_read);
-
+    char fullname[sizeof(CONFDIR"/rt_dsfield") + 8];
+    parser_t *parser;
+
+    sprintf(fullname, CONFDIR"/rt_%s", file);
+    parser = config_open2(fullname, fopen_for_read);
     while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL)) {
         unsigned id = bb_strtou(token[0], NULL, 0);
-        if (id > 256) {
+        if (id > RT_TABLE_MAX) {
             bb_error_msg("database %s is corrupted at line %d",
                 file, parser->lineno);
@@ -43 +55 @@
     }
 
-    for (i = 0; i < 256; i++) {
+    for (i = 0; i <= RT_TABLE_MAX; i++) {
         if (tab->tab[i]
          && strcmp(tab->tab[i], arg) == 0
@@ -55 +67 @@
 
     i = bb_strtou(arg, NULL, base);
-    if (i > 255)
+    if (i > RT_TABLE_MAX)
         return -1;
     *id = i;
@@ -86 +98 @@
     rtnl_rtprot_tab = xzalloc(sizeof(*rtnl_rtprot_tab));
     memcpy(rtnl_rtprot_tab->tab, init_tab, sizeof(init_tab));
-    rtnl_tab_initialize("/etc/iproute2/rt_protos", rtnl_rtprot_tab->tab);
-}
-
-const char* FAST_FUNC rtnl_rtprot_n2a(int id, char *buf)
-{
-    if (id < 0 || id >= 256) {
-        sprintf(buf, "%d", id);
-        return buf;
+    rtnl_tab_initialize("protos", rtnl_rtprot_tab->tab);
+}
+
+#if 0 /* UNUSED */
+const char* FAST_FUNC rtnl_rtprot_n2a(int id)
+{
+    if (id < 0 || id > RT_TABLE_MAX) {
+        return itoa(id);
     }
 
@@ -100 +112 @@
     if (rtnl_rtprot_tab->tab[id])
         return rtnl_rtprot_tab->tab[id];
-    /* buf is SPRINT_BSIZE big */
-    sprintf(buf, "%d", id);
-    return buf;
-}
+    return itoa(id);
+}
+#endif
 
 int FAST_FUNC rtnl_rtprot_a2n(uint32_t *id, char *arg)
@@ -124 +135 @@
     rtnl_rtscope_tab->tab[253] = "link";
     rtnl_rtscope_tab->tab[200] = "site";
-    rtnl_tab_initialize("/etc/iproute2/rt_scopes", rtnl_rtscope_tab->tab);
-}
-
-const char* FAST_FUNC rtnl_rtscope_n2a(int id, char *buf)
-{
-    if (id < 0 || id >= 256) {
-        sprintf(buf, "%d", id);
-        return buf;
+    rtnl_tab_initialize("scopes", rtnl_rtscope_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_rtscope_n2a(int id)
+{
+    if (id < 0 || id > RT_TABLE_MAX) {
+        return itoa(id);
     }
 
@@ -138 +148 @@
     if (rtnl_rtscope_tab->tab[id])
         return rtnl_rtscope_tab->tab[id];
-    /* buf is SPRINT_BSIZE big */
-    sprintf(buf, "%d", id);
-    return buf;
+    return itoa(id);
 }
 
@@ -157 +165 @@
     rtnl_rtrealm_tab = xzalloc(sizeof(*rtnl_rtrealm_tab));
     rtnl_rtrealm_tab->tab[0] = "unknown";
-    rtnl_tab_initialize("/etc/iproute2/rt_realms", rtnl_rtrealm_tab->tab);
+    rtnl_tab_initialize("realms", rtnl_rtrealm_tab->tab);
 }
 
@@ -167 +175 @@
 
 #if ENABLE_FEATURE_IP_RULE
-const char* FAST_FUNC rtnl_rtrealm_n2a(int id, char *buf)
-{
-    if (id < 0 || id >= 256) {
-        sprintf(buf, "%d", id);
-        return buf;
+const char* FAST_FUNC rtnl_rtrealm_n2a(int id)
+{
+    if (id < 0 || id > RT_TABLE_MAX) {
+        return itoa(id);
     }
 
@@ -178 +185 @@
     if (rtnl_rtrealm_tab->tab[id])
         return rtnl_rtrealm_tab->tab[id];
-    /* buf is SPRINT_BSIZE big */
-    sprintf(buf, "%d", id);
-    return buf;
+    return itoa(id);
 }
 #endif
@@ -192 +197 @@
     rtnl_rtdsfield_tab = xzalloc(sizeof(*rtnl_rtdsfield_tab));
     rtnl_rtdsfield_tab->tab[0] = "0";
-    rtnl_tab_initialize("/etc/iproute2/rt_dsfield", rtnl_rtdsfield_tab->tab);
-}
-
-const char* FAST_FUNC rtnl_dsfield_n2a(int id, char *buf)
-{
-    if (id < 0 || id >= 256) {
-        sprintf(buf, "%d", id);
-        return buf;
+    rtnl_tab_initialize("dsfield", rtnl_rtdsfield_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_dsfield_n2a(int id)
+{
+    if (id < 0 || id > RT_TABLE_MAX) {
+        return itoa(id);
     }
 
@@ -206 +210 @@
     if (rtnl_rtdsfield_tab->tab[id])
         return rtnl_rtdsfield_tab->tab[id];
-    /* buf is SPRINT_BSIZE big */
-    sprintf(buf, "0x%02x", id);
-    return buf;
+    return itoa(id);
 }
 
@@ -223 +225 @@
 static void rtnl_rttable_initialize(void)
 {
-    if (rtnl_rtdsfield_tab) return;
+    if (rtnl_rttable_tab)
+        return;
+
     rtnl_rttable_tab = xzalloc(sizeof(*rtnl_rttable_tab));
     rtnl_rttable_tab->tab[0] = "unspec";
@@ -229 +233 @@
     rtnl_rttable_tab->tab[254] = "main";
     rtnl_rttable_tab->tab[253] = "default";
-    rtnl_tab_initialize("/etc/iproute2/rt_tables", rtnl_rttable_tab->tab);
-}
-
-const char* FAST_FUNC rtnl_rttable_n2a(int id, char *buf)
-{
-    if (id < 0 || id >= 256) {
-        sprintf(buf, "%d", id);
-        return buf;
+    rtnl_tab_initialize("tables", rtnl_rttable_tab->tab);
+}
+
+const char* FAST_FUNC rtnl_rttable_n2a(int id)
+{
+    if (id < 0 || id > RT_TABLE_MAX) {
+        return itoa(id);
     }
 
@@ -243 +246 @@
     if (rtnl_rttable_tab->tab[id])
         return rtnl_rttable_tab->tab[id];
-    /* buf is SPRINT_BSIZE big */
-    sprintf(buf, "%d", id);
-    return buf;
+    return itoa(id);
 }
 

branches/3.3/mindi-busybox/networking/libiproute/rt_names.h

@@ -5 +5 @@
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* buf is SPRINT_BSIZE big */
-extern const char* rtnl_rtprot_n2a(int id, char *buf) FAST_FUNC;
-extern const char* rtnl_rtscope_n2a(int id, char *buf) FAST_FUNC;
-extern const char* rtnl_rtrealm_n2a(int id, char *buf) FAST_FUNC;
-extern const char* rtnl_dsfield_n2a(int id, char *buf) FAST_FUNC;
-extern const char* rtnl_rttable_n2a(int id, char *buf) FAST_FUNC;
+extern const char* rtnl_rtprot_n2a(int id) FAST_FUNC;
+extern const char* rtnl_rtscope_n2a(int id) FAST_FUNC;
+extern const char* rtnl_rtrealm_n2a(int id) FAST_FUNC;
+extern const char* rtnl_dsfield_n2a(int id) FAST_FUNC;
+extern const char* rtnl_rttable_n2a(int id) FAST_FUNC;
 extern int rtnl_rtprot_a2n(uint32_t *id, char *arg) FAST_FUNC;
 extern int rtnl_rtscope_a2n(uint32_t *id, char *arg) FAST_FUNC;

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

@@ -13 +13 @@
 #include "utils.h"
 
-const char* FAST_FUNC rtnl_rtntype_n2a(int id, char *buf)
+const char* FAST_FUNC rtnl_rtntype_n2a(int id)
 {
     switch (id) {
@@ -41 +41 @@
         return "xresolve";
     default:
-        /* buf is SPRINT_BSIZE big */
-        sprintf(buf, "%d", id);
-        return buf;
+        return itoa(id);
     }
 }

branches/3.3/mindi-busybox/networking/libiproute/rtm_map.h

@@ -5 +5 @@
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-const char *rtnl_rtntype_n2a(int id, char *buf) FAST_FUNC;
+const char *rtnl_rtntype_n2a(int id) FAST_FUNC;
 int rtnl_rtntype_a2n(int *id, char *arg) FAST_FUNC;
 

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

@@ -14 +14 @@
 #include "inet_common.h"
 
+unsigned get_hz(void)
+{
+    static unsigned hz_internal;
+    FILE *fp;
+
+    if (hz_internal)
+        return hz_internal;
+
+    fp = fopen_for_read("/proc/net/psched");
+    if (fp) {
+        unsigned nom, denom;
+
+        if (fscanf(fp, "%*08x%*08x%08x%08x", &nom, &denom) == 2)
+            if (nom == 1000000)
+                hz_internal = denom;
+        fclose(fp);
+    }
+    if (!hz_internal)
+        hz_internal = bb_clk_tck();
+    return hz_internal;
+}
+
 unsigned get_unsigned(char *arg, const char *errmsg)
 {
@@ -26 +48 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -41 +63 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -56 +78 @@
         }
     }
-    invarg(arg, errmsg); /* does not return */
+    invarg_1_to_2(arg, errmsg); /* does not return */
 }
 
@@ -209 +231 @@
 void incomplete_command(void)
 {
-    bb_error_msg_and_die("command line is not complete, try option \"help\"");
-}
-
-void invarg(const char *arg, const char *opt)
-{
-    bb_error_msg_and_die(bb_msg_invalid_arg, arg, opt);
+    bb_error_msg_and_die("command line is not complete, try \"help\"");
+}
+
+void invarg_1_to_2(const char *arg, const char *opt)
+{
+    bb_error_msg_and_die(bb_msg_invalid_arg_to, arg, opt);
 }
 
@@ -255 +277 @@
 }
 
-const char *rt_addr_n2a(int af,
-        void *addr, char *buf, int buflen)
+const char *rt_addr_n2a(int af, void *addr)
 {
     switch (af) {
     case AF_INET:
     case AF_INET6:
-        return inet_ntop(af, addr, buf, buflen);
+        return inet_ntop(af, addr,
+            auto_string(xzalloc(INET6_ADDRSTRLEN)), INET6_ADDRSTRLEN
+        );
     default:
         return "???";
@@ -268 +291 @@
 
 #ifdef RESOLVE_HOSTNAMES
-const char *format_host(int af, int len, void *addr, char *buf, int buflen)
+const char *format_host(int af, int len, void *addr)
 {
     if (resolve_hosts) {
@@ -287 +310 @@
             h_ent = gethostbyaddr(addr, len, af);
             if (h_ent != NULL) {
-                safe_strncpy(buf, h_ent->h_name, buflen);
-                return buf;
-            }
-        }
-    }
-    return rt_addr_n2a(af, addr, buf, buflen);
+                return auto_string(xstrdup(h_ent->h_name));
+            }
+        }
+    }
+    return rt_addr_n2a(af, addr);
 }
 #endif

branches/3.3/mindi-busybox/networking/libiproute/utils.h

@@ -67 +67 @@
 extern uint16_t get_u16(char *arg, const char *errmsg);
 
-extern const char *rt_addr_n2a(int af, void *addr, char *buf, int buflen);
+extern const char *rt_addr_n2a(int af, void *addr);
 #ifdef RESOLVE_HOSTNAMES
-extern const char *format_host(int af, int len, void *addr, char *buf, int buflen);
+extern const char *format_host(int af, int len, void *addr);
 #else
-#define format_host(af, len, addr, buf, buflen) \
-    rt_addr_n2a(af, addr, buf, buflen)
+#define format_host(af, len, addr) \
+    rt_addr_n2a(af, addr)
 #endif
 
-void invarg(const char *, const char *) NORETURN;
+void invarg_1_to_2(const char *, const char *) NORETURN;
 void duparg(const char *, const char *) NORETURN;
 void duparg2(const char *, const char *) NORETURN;
@@ -86 +86 @@
 int ipx_pton(int af, const char *src, void *addr);
 
+unsigned get_hz(void);
+
 POP_SAVED_FUNCTION_VISIBILITY