iplink: implement "set promisc on|off". Closes 4682

function                                             old     new   delta
do_iplink                                           1232    1269     +37
packed_usage                                       31337   31327     -10

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

2 files changed, 13 insertions, 22 deletions

diff --git a/networking/ip.c b/networking/ip.c
index 620795881..6fc43f653 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -154,8 +154,8 @@
 //usage:#define iplink_trivial_usage
 //usage:       "set IFACE [up|down] [arp on|off] | show [IFACE]"
 //usage:#define iplink_full_usage "\n\n"
-//usage:       "iplink set IFACE [up|down] [arp on|off] [multicast on|off] [mtu MTU]\n"
-//usage:       "        [name NAME] [qlen NUM] [address MAC]\n"
+//usage:       "iplink set IFACE [up|down] [arp on|off] [multicast on|off] [promisc on|off]\n"
+//usage:       "        [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
 //usage:       "iplink show [IFACE]"
 //usage:
 //usage:#define iproute_trivial_usage
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index f00c40215..aef5f6490 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -210,10 +210,10 @@ static int do_set(char **argv)
         /* If you add stuff here, update iplink_full_usage */
         static const char keywords[] ALIGN1 =
                 "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
-                "arp\0""address\0"
+                "arp\0""promisc\0""address\0"
                 "dev\0" /* must be last */;
         enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
-                ARG_arp, ARG_addr,
+                ARG_arp, ARG_promisc, ARG_addr,
                 ARG_dev };
         enum { PARM_on = 0, PARM_off };
         smalluint key;
@@ -237,6 +237,7 @@ static int do_set(char **argv)
                                 duparg("mtu", *argv);
                         mtu = get_unsigned(*argv, "mtu");
                 } else if (key == ARG_qlen) {
+//TODO: txqueuelen, txqlen are synonyms to qlen
                         NEXT_ARG();
                         if (qlen != -1)
                                 duparg("qlen", *argv);
@@ -273,6 +274,14 @@ static int do_set(char **argv)
                                         flags &= ~IFF_NOARP;
                                 else
                                         flags |= IFF_NOARP;
+                        } else if (key == ARG_promisc) {
+                                if (param < 0)
+                                        die_must_be_on_off("promisc");
+                                mask |= IFF_PROMISC;
+                                if (param == PARM_on)
+                                        flags |= IFF_PROMISC;
+                                else
+                                        flags &= ~IFF_PROMISC;
                         }
                 }
 
@@ -285,15 +294,6 @@ static int do_set(char **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, "netns") == 0) {
                         NEXT_ARG();
                         if (netns != -1)
@@ -313,15 +313,6 @@ static int do_set(char **argv)
                                 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;