Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/iplink.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/libiproute/iplink.c (modified) (16 diffs)

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * iplink.c "ip link".
- *
  * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-//#include <sys/ioctl.h>
-//#include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_packet.h>
@@ -19 +14 @@
 #include "utils.h"
 
+#ifndef IFLA_LINKINFO
+# define IFLA_LINKINFO 18
+# define IFLA_INFO_KIND 1
+#endif
+
 /* taken from linux/sockios.h */
-#define SIOCSIFNAME 0x8923      /* set interface name */
-
-static void on_off(const char *msg) ATTRIBUTE_NORETURN;
-static void on_off(const char *msg)
-{
-    bb_error_msg_and_die("error: argument of \"%s\" must be \"on\" or \"off\"", msg);
-}
+#define SIOCSIFNAME  0x8923  /* set interface name */
 
 /* Exits on error */
@@ -48 +42 @@
     int fd;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     fd = get_ctl_fd();
     xioctl(fd, SIOCGIFFLAGS, &ifr);
@@ -65 +59 @@
     int fd;
 
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
-    strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
+    strncpy_IFNAMSIZ(ifr.ifr_newname, newdev);
     fd = get_ctl_fd();
     xioctl(fd, SIOCSIFNAME, &ifr);
@@ -80 +74 @@
     s = get_ctl_fd();
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     ifr.ifr_qlen = qlen;
     xioctl(s, SIOCSIFTXQLEN, &ifr);
@@ -94 +88 @@
     s = get_ctl_fd();
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     ifr.ifr_mtu = mtu;
     xioctl(s, SIOCSIFMTU, &ifr);
@@ -111 +105 @@
 
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
+    strncpy_IFNAMSIZ(ifr.ifr_name, dev);
     xioctl(s, SIOCGIFINDEX, &ifr);
 
@@ -119 +113 @@
     me.sll_protocol = htons(ETH_P_LOOP);
     xbind(s, (struct sockaddr*)&me, sizeof(me));
-
     alen = sizeof(me);
-    if (getsockname(s, (struct sockaddr*)&me, &alen) == -1) {
-        bb_perror_msg_and_die("getsockname");
-    }
+    getsockname(s, (struct sockaddr*)&me, &alen);
+    //never happens:
+    //if (getsockname(s, (struct sockaddr*)&me, &alen) == -1)
+    //  bb_perror_msg_and_die("getsockname");
     close(s);
     *htype = me.sll_hatype;
@@ -135 +129 @@
 
     memset(ifr, 0, sizeof(*ifr));
-    strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
+    strncpy_IFNAMSIZ(ifr->ifr_name, dev);
     ifr->ifr_hwaddr.sa_family = hatype;
-    alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), 14, lla);
+
+    alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/;
+    alen = ll_addr_a2n((unsigned char *)(ifr->ifr_hwaddr.sa_data), alen, lla);
     if (alen < 0)
-        exit(1);
+        exit(EXIT_FAILURE);
     if (alen != halen) {
         bb_error_msg_and_die("wrong address (%s) length: expected %d bytes", lla, halen);
@@ -159 +155 @@
 
 
+static void die_must_be_on_off(const char *msg) NORETURN;
+static void die_must_be_on_off(const char *msg)
+{
+    bb_error_msg_and_die("argument of \"%s\" must be \"on\" or \"off\"", msg);
+}
+
 /* Return value becomes exitcode. It's okay to not return at all */
-static int do_set(int argc, char **argv)
+static int do_set(char **argv)
 {
     char *dev = NULL;
@@ -173 +175 @@
     int htype, halen;
     static const char keywords[] ALIGN1 =
-        "up\0""down\0""name\0""mtu\0""multicast\0""arp\0""addr\0""dev\0"
-        "on\0""off\0";
-    enum { ARG_up = 1, ARG_down, ARG_name, ARG_mtu, ARG_multicast, ARG_arp,
-        ARG_addr, ARG_dev, PARM_on, PARM_off };
+        "up\0""down\0""name\0""mtu\0""qlen\0""multicast\0"
+        "arp\0""address\0""dev\0";
+    enum { ARG_up = 0, ARG_down, ARG_name, ARG_mtu, ARG_qlen, ARG_multicast,
+        ARG_arp, ARG_addr, ARG_dev };
+    static const char str_on_off[] ALIGN1 = "on\0""off\0";
+    enum { PARM_on = 0, PARM_off };
     smalluint key;
 
-    while (argc > 0) {
-        key = index_in_strings(keywords, *argv) + 1;
+    while (*argv) {
+        /* substring search ensures that e.g. "addr" and "address"
+         * are both accepted */
+        key = index_in_substrings(keywords, *argv);
         if (key == ARG_up) {
             mask |= IFF_UP;
@@ -194 +200 @@
             if (mtu != -1)
                 duparg("mtu", *argv);
-            if (get_integer(&mtu, *argv, 0))
-                invarg(*argv, "mtu");
-        } else if (key == ARG_multicast) {
-            NEXT_ARG();
-            mask |= IFF_MULTICAST;
-            key = index_in_strings(keywords, *argv) + 1;
-            if (key == PARM_on) {
-                flags |= IFF_MULTICAST;
-            } else if (key == PARM_off) {
-                flags &= ~IFF_MULTICAST;
-            } else
-                on_off("multicast");
-        } else if (key == ARG_arp) {
-            NEXT_ARG();
-            mask |= IFF_NOARP;
-            key = index_in_strings(keywords, *argv) + 1;
-            if (key == PARM_on) {
-                flags &= ~IFF_NOARP;
-            } else if (key == PARM_off) {
-                flags |= IFF_NOARP;
-            } else
-                on_off("arp");
+            mtu = get_unsigned(*argv, "mtu");
+        } else if (key == ARG_qlen) {
+            NEXT_ARG();
+            if (qlen != -1)
+                duparg("qlen", *argv);
+            qlen = get_unsigned(*argv, "qlen");
         } else if (key == ARG_addr) {
             NEXT_ARG();
             newaddr = *argv;
-        } else {
+        } else if (key >= ARG_dev) {
             if (key == ARG_dev) {
                 NEXT_ARG();
@@ -226 +216 @@
                 duparg2("dev", *argv);
             dev = *argv;
-        }
-        argc--; argv++;
+        } else {
+            int param;
+            NEXT_ARG();
+            param = index_in_strings(str_on_off, *argv);
+            if (key == ARG_multicast) {
+                if (param < 0)
+                    die_must_be_on_off("multicast");
+                mask |= IFF_MULTICAST;
+                if (param == PARM_on)
+                    flags |= IFF_MULTICAST;
+                else
+                    flags &= ~IFF_MULTICAST;
+            } else if (key == ARG_arp) {
+                if (param < 0)
+                    die_must_be_on_off("arp");
+                mask |= IFF_NOARP;
+                if (param == PARM_on)
+                    flags &= ~IFF_NOARP;
+                else
+                    flags |= IFF_NOARP;
+            }
+        }
+        argv++;
     }
 
@@ -238 +249 @@
         if (newaddr) {
             parse_address(dev, htype, halen, newaddr, &ifr0);
+            set_address(&ifr0, 0);
         }
         if (newbrd) {
             parse_address(dev, htype, halen, newbrd, &ifr1);
+            set_address(&ifr1, 1);
         }
     }
@@ -254 +267 @@
         set_mtu(dev, mtu);
     }
-    if (newaddr || newbrd) {
-        if (newbrd) {
-            set_address(&ifr1, 1);
-        }
-        if (newaddr) {
-            set_address(&ifr0, 0);
-        }
-    }
     if (mask)
         do_chflags(dev, flags, mask);
@@ -267 +272 @@
 }
 
-static int ipaddr_list_link(int argc, char **argv)
+static int ipaddr_list_link(char **argv)
 {
     preferred_family = AF_PACKET;
-    return ipaddr_list_or_flush(argc, argv, 0);
-}
-
+    return ipaddr_list_or_flush(argv, 0);
+}
+
+#ifndef NLMSG_TAIL
+#define NLMSG_TAIL(nmsg) \
+    ((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
+#endif
 /* Return value becomes exitcode. It's okay to not return at all */
-int do_iplink(int argc, char **argv)
+static int do_change(char **argv, const unsigned rtm)
 {
     static const char keywords[] ALIGN1 =
-        "set\0""show\0""lst\0""list\0";
-    smalluint key;
-    if (argc <= 0)
-        return ipaddr_list_link(0, NULL);
-    key = index_in_substrings(keywords, *argv) + 1;
-    if (key == 0)
-        bb_error_msg_and_die(bb_msg_invalid_arg, *argv, applet_name);
-    argc--; argv++;
-    if (key == 1) /* set */
-        return do_set(argc, argv);
-    else /* show, lst, list */
-        return ipaddr_list_link(argc, argv);
-}
+        "link\0""name\0""type\0""dev\0";
+    enum {
+        ARG_link,
+        ARG_name,
+        ARG_type,
+        ARG_dev,
+    };
+    struct rtnl_handle rth;
+    struct {
+        struct nlmsghdr  n;
+        struct ifinfomsg i;
+        char             buf[1024];
+    } req;
+    smalluint arg;
+    char *name_str = NULL, *link_str = NULL, *type_str = NULL, *dev_str = NULL;
+
+    memset(&req, 0, sizeof(req));
+
+    req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+    req.n.nlmsg_flags = NLM_F_REQUEST;
+    req.n.nlmsg_type = rtm;
+    req.i.ifi_family = preferred_family;
+    if (rtm == RTM_NEWLINK)
+        req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
+
+    while (*argv) {
+        arg = index_in_substrings(keywords, *argv);
+        if (arg == ARG_link) {
+            NEXT_ARG();
+            link_str = *argv;
+        } else if (arg == ARG_name) {
+            NEXT_ARG();
+            name_str = *argv;
+        } else if (arg == ARG_type) {
+            NEXT_ARG();
+            type_str = *argv;
+        } else {
+            if (arg == ARG_dev) {
+                if (dev_str)
+                    duparg(*argv, "dev");
+                NEXT_ARG();
+            }
+            dev_str = *argv;
+        }
+        argv++;
+    }
+    xrtnl_open(&rth);
+    ll_init_map(&rth);
+    if (type_str) {
+        struct rtattr *linkinfo = NLMSG_TAIL(&req.n);
+
+        addattr_l(&req.n, sizeof(req), IFLA_LINKINFO, NULL, 0);
+        addattr_l(&req.n, sizeof(req), IFLA_INFO_KIND, type_str,
+                strlen(type_str));
+        linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo;
+    }
+    if (rtm != RTM_NEWLINK) {
+        if (!dev_str)
+            return 1; /* Need a device to delete */
+        req.i.ifi_index = xll_name_to_index(dev_str);
+    } else {
+        if (!name_str)
+            name_str = dev_str;
+        if (link_str) {
+            int idx = xll_name_to_index(link_str);
+            addattr_l(&req.n, sizeof(req), IFLA_LINK, &idx, 4);
+        }
+    }
+    if (name_str) {
+        const size_t name_len = strlen(name_str) + 1;
+        if (name_len < 2 || name_len > IFNAMSIZ)
+            invarg(name_str, "name");
+        addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name_str, name_len);
+    }
+    if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+        return 2;
+    return 0;
+}
+
+/* Return value becomes exitcode. It's okay to not return at all */
+int FAST_FUNC do_iplink(char **argv)
+{
+    static const char keywords[] ALIGN1 =
+        "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);
+        argv++;
+        if (key <= 1) /* add/delete */
+            return do_change(argv, key ? RTM_DELLINK : RTM_NEWLINK);
+        else if (key == 2) /* set */
+            return do_set(argv);
+    }
+    /* show, lst, list */
+    return ipaddr_list_link(argv);
+}