]> rtime.felk.cvut.cz Git - lisovros/iproute2_canprio.git/blobdiff - ip/iplink.c
iproute2 - Fix up and simplify variables pointing to install directories
[lisovros/iproute2_canprio.git] / ip / iplink.c
index 8f82a08bdd989f101a08a5056dfabcd0b9b8ead7..679091e6831b71538cce495f6f13d6626bf49e0e 100644 (file)
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <syslog.h>
 #include <fcntl.h>
+#include <dlfcn.h>
 #include <errno.h>
 #include <sys/socket.h>
 #include <linux/if.h>
 #include "utils.h"
 #include "ip_common.h"
 
+#define IPLINK_IOCTL_COMPAT    1
+#ifndef LIBDIR
+#define LIBDIR "/usr/lib"
+#endif
 
 static void usage(void) __attribute__((noreturn));
+static int iplink_have_newlink(void);
 
 void iplink_usage(void)
 {
-       fprintf(stderr, "Usage: ip link set DEVICE { up | down |\n");
-       fprintf(stderr, "                            arp { on | off } |\n");
-       fprintf(stderr, "                            dynamic { on | off } |\n");
-       fprintf(stderr, "                            multicast { on | off } |\n");
-       fprintf(stderr, "                            allmulticast { on | off } |\n");
-       fprintf(stderr, "                            promisc { on | off } |\n");
-       fprintf(stderr, "                            trailers { on | off } |\n");
-       fprintf(stderr, "                            txqueuelen PACKETS |\n");
-       fprintf(stderr, "                            name NEWNAME |\n");
-       fprintf(stderr, "                            address LLADDR | broadcast LLADDR |\n");
-       fprintf(stderr, "                            mtu MTU }\n");
-       fprintf(stderr, "       ip link show [ DEVICE ]\n");
+       if (iplink_have_newlink()) {
+               fprintf(stderr, "Usage: ip link add [link DEV] [ name ] NAME\n");
+               fprintf(stderr, "                   [ txqueuelen PACKETS ]\n");
+               fprintf(stderr, "                   [ address LLADDR ]\n");
+               fprintf(stderr, "                   [ broadcast LLADDR ]\n");
+               fprintf(stderr, "                   [ mtu MTU ]\n");
+               fprintf(stderr, "                   type TYPE [ ARGS ]\n");
+               fprintf(stderr, "       ip link delete DEV type TYPE [ ARGS ]\n");
+               fprintf(stderr, "\n");
+               fprintf(stderr, "       ip link set { dev DEVICE | group DEVGROUP } [ { up | down } ]\n");
+       } else
+               fprintf(stderr, "Usage: ip link set DEVICE [ { up | down } ]\n");
+
+       fprintf(stderr, "                         [ arp { on | off } ]\n");
+       fprintf(stderr, "                         [ dynamic { on | off } ]\n");
+       fprintf(stderr, "                         [ multicast { on | off } ]\n");
+       fprintf(stderr, "                         [ allmulticast { on | off } ]\n");
+       fprintf(stderr, "                         [ promisc { on | off } ]\n");
+       fprintf(stderr, "                         [ trailers { on | off } ]\n");
+       fprintf(stderr, "                         [ txqueuelen PACKETS ]\n");
+       fprintf(stderr, "                         [ name NEWNAME ]\n");
+       fprintf(stderr, "                         [ address LLADDR ]\n");
+       fprintf(stderr, "                         [ broadcast LLADDR ]\n");
+       fprintf(stderr, "                         [ mtu MTU ]\n");
+       fprintf(stderr, "                         [ netns PID ]\n");
+       fprintf(stderr, "                         [ netns NAME ]\n");
+       fprintf(stderr, "                         [ alias NAME ]\n");
+       fprintf(stderr, "                         [ vf NUM [ mac LLADDR ]\n");
+       fprintf(stderr, "                                  [ vlan VLANID [ qos VLAN-QOS ] ]\n");
+
+       fprintf(stderr, "                                  [ rate TXRATE ] ] \n");
+
+       fprintf(stderr, "                                  [ spoofchk { on | off} ] ] \n");
+       fprintf(stderr, "                         [ master DEVICE ]\n");
+       fprintf(stderr, "                         [ nomaster ]\n");
+       fprintf(stderr, "       ip link show [ DEVICE | group GROUP ]\n");
+
+       if (iplink_have_newlink()) {
+               fprintf(stderr, "\n");
+               fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can | bridge }\n");
+       }
        exit(-1);
 }
 
@@ -62,6 +97,499 @@ static int on_off(char *msg)
        return -1;
 }
 
+static void *BODY;             /* cached dlopen(NULL) handle */
+static struct link_util *linkutil_list;
+
+struct link_util *get_link_kind(const char *id)
+{
+       void *dlh;
+       char buf[256];
+       struct link_util *l;
+
+       for (l = linkutil_list; l; l = l->next)
+               if (strcmp(l->id, id) == 0)
+                       return l;
+
+       snprintf(buf, sizeof(buf), LIBDIR "/ip/link_%s.so", id);
+       dlh = dlopen(buf, RTLD_LAZY);
+       if (dlh == NULL) {
+               /* look in current binary, only open once */
+               dlh = BODY;
+               if (dlh == NULL) {
+                       dlh = BODY = dlopen(NULL, RTLD_LAZY);
+                       if (dlh == NULL)
+                               return NULL;
+               }
+       }
+
+       snprintf(buf, sizeof(buf), "%s_link_util", id);
+       l = dlsym(dlh, buf);
+       if (l == NULL)
+               return NULL;
+
+       l->next = linkutil_list;
+       linkutil_list = l;
+       return l;
+}
+
+int get_link_mode(const char *mode)
+{
+       if (strcasecmp(mode, "default") == 0)
+               return IF_LINK_MODE_DEFAULT;
+       if (strcasecmp(mode, "dormant") == 0)
+               return IF_LINK_MODE_DORMANT;
+       return -1;
+}
+
+#if IPLINK_IOCTL_COMPAT
+static int have_rtnl_newlink = -1;
+
+static int accept_msg(const struct sockaddr_nl *who,
+                     struct nlmsghdr *n, void *arg)
+{
+       struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n);
+
+       if (n->nlmsg_type == NLMSG_ERROR &&
+           (err->error == -EOPNOTSUPP || err->error == -EINVAL))
+               have_rtnl_newlink = 0;
+       else
+               have_rtnl_newlink = 1;
+       return -1;
+}
+
+static int iplink_have_newlink(void)
+{
+       struct {
+               struct nlmsghdr         n;
+               struct ifinfomsg        i;
+               char                    buf[1024];
+       } req;
+
+       if (have_rtnl_newlink < 0) {
+               memset(&req, 0, sizeof(req));
+
+               req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+               req.n.nlmsg_flags = NLM_F_REQUEST|NLM_F_ACK;
+               req.n.nlmsg_type = RTM_NEWLINK;
+               req.i.ifi_family = AF_UNSPEC;
+
+               rtnl_send(&rth, &req.n, req.n.nlmsg_len);
+               rtnl_listen(&rth, accept_msg, NULL);
+       }
+       return have_rtnl_newlink;
+}
+#else /* IPLINK_IOCTL_COMPAT */
+static int iplink_have_newlink(void)
+{
+       return 1;
+}
+#endif /* ! IPLINK_IOCTL_COMPAT */
+
+struct iplink_req {
+       struct nlmsghdr         n;
+       struct ifinfomsg        i;
+       char                    buf[1024];
+};
+
+int iplink_parse_vf(int vf, int *argcp, char ***argvp,
+                          struct iplink_req *req)
+{
+       int len, argc = *argcp;
+       char **argv = *argvp;
+       struct rtattr *vfinfo;
+
+       vfinfo = addattr_nest(&req->n, sizeof(*req), IFLA_VF_INFO);
+
+       while (NEXT_ARG_OK()) {
+               NEXT_ARG();
+               if (matches(*argv, "mac") == 0) {
+                       struct ifla_vf_mac ivm;
+                       NEXT_ARG();
+                       ivm.vf = vf;
+                       len = ll_addr_a2n((char *)ivm.mac, 32, *argv);
+                       if (len < 0)
+                               return -1;
+                       addattr_l(&req->n, sizeof(*req), IFLA_VF_MAC, &ivm, sizeof(ivm));
+               } else if (matches(*argv, "vlan") == 0) {
+                       struct ifla_vf_vlan ivv;
+                       NEXT_ARG();
+                       if (get_unsigned(&ivv.vlan, *argv, 0)) {
+                               invarg("Invalid \"vlan\" value\n", *argv);
+                       }
+                       ivv.vf = vf;
+                       ivv.qos = 0;
+                       if (NEXT_ARG_OK()) {
+                               NEXT_ARG();
+                               if (matches(*argv, "qos") == 0) {
+                                       NEXT_ARG();
+                                       if (get_unsigned(&ivv.qos, *argv, 0)) {
+                                               invarg("Invalid \"qos\" value\n", *argv);
+                                       }
+                               } else {
+                                       /* rewind arg */
+                                       PREV_ARG();
+                               }
+                       }
+                       addattr_l(&req->n, sizeof(*req), IFLA_VF_VLAN, &ivv, sizeof(ivv));
+               } else if (matches(*argv, "rate") == 0) {
+                       struct ifla_vf_tx_rate ivt;
+                       NEXT_ARG();
+                       if (get_unsigned(&ivt.rate, *argv, 0)) {
+                               invarg("Invalid \"rate\" value\n", *argv);
+                       }
+                       ivt.vf = vf;
+                       addattr_l(&req->n, sizeof(*req), IFLA_VF_TX_RATE, &ivt, sizeof(ivt));
+               
+               } else if (matches(*argv, "spoofchk") == 0) {
+                       struct ifla_vf_spoofchk ivs;
+                       NEXT_ARG();
+                       if (matches(*argv, "on") == 0)
+                               ivs.setting = 1;
+                       else if (matches(*argv, "off") == 0)
+                               ivs.setting = 0;
+                       else
+                               invarg("Invalid \"spoofchk\" value\n", *argv);
+                       ivs.vf = vf;
+                       addattr_l(&req->n, sizeof(*req), IFLA_VF_SPOOFCHK, &ivs, sizeof(ivs));
+
+               } else {
+                       /* rewind arg */
+                       PREV_ARG();
+                       break;
+               }
+       }
+
+       if (argc == *argcp)
+               incomplete_command();
+
+       addattr_nest_end(&req->n, vfinfo);
+
+       *argcp = argc;
+       *argvp = argv;
+       return 0;
+}
+
+
+int iplink_parse(int argc, char **argv, struct iplink_req *req,
+               char **name, char **type, char **link, char **dev, int *group)
+{
+       int ret, len;
+       char abuf[32];
+       int qlen = -1;
+       int mtu = -1;
+       int netns = -1;
+       int vf = -1;
+
+       *group = -1;
+       ret = argc;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "up") == 0) {
+                       req->i.ifi_change |= IFF_UP;
+                       req->i.ifi_flags |= IFF_UP;
+               } else if (strcmp(*argv, "down") == 0) {
+                       req->i.ifi_change |= IFF_UP;
+                       req->i.ifi_flags &= ~IFF_UP;
+               } else if (strcmp(*argv, "name") == 0) {
+                       NEXT_ARG();
+                       *name = *argv;
+               } else if (matches(*argv, "link") == 0) {
+                       NEXT_ARG();
+                       *link = *argv;
+               } else if (matches(*argv, "address") == 0) {
+                       NEXT_ARG();
+                       len = ll_addr_a2n(abuf, sizeof(abuf), *argv);
+                       if (len < 0)
+                               return -1;
+                       addattr_l(&req->n, sizeof(*req), IFLA_ADDRESS, abuf, len);
+               } 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("Invalid \"txqueuelen\" value\n", *argv);
+                       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("Invalid \"mtu\" value\n", *argv);
+                       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("Invalid \"netns\" value\n", *argv);
+               } 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");
+               } 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");
+               } 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");
+               } 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");
+               } 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");
+               } else if (strcmp(*argv, "vf") == 0) {
+                       struct rtattr *vflist;
+                       NEXT_ARG();
+                       if (get_integer(&vf,  *argv, 0)) {
+                               invarg("Invalid \"vf\" value\n", *argv);
+                       }
+                       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("Device does not exist\n", *argv);
+                       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");
+               } else if (matches(*argv, "type") == 0) {
+                       NEXT_ARG();
+                       *type = *argv;
+                       argc--; argv++;
+                       break;
+               } 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("Invalid \"group\" value\n", *argv);
+               } else if (strcmp(*argv, "mode") == 0) {
+                       int mode;
+                       NEXT_ARG();
+                       mode = get_link_mode(*argv);
+                       if (mode < 0)
+                               invarg("Invalid link mode\n", *argv);
+                       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("Invalid operstate\n", *argv);
+
+                       addattr8(&req->n, sizeof(*req), IFLA_OPERSTATE, state);
+               } else {
+                       if (strcmp(*argv, "dev") == 0) {
+                               NEXT_ARG();
+                       }
+                       if (matches(*argv, "help") == 0)
+                               usage();
+                       if (*dev)
+                               duparg2("dev", *argv);
+                       *dev = *argv;
+               }
+               argc--; argv++;
+       }
+
+       return ret - argc;
+}
+
+static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
+{
+       int len;
+       char *dev = NULL;
+       char *name = NULL;
+       char *link = NULL;
+       char *type = NULL;
+       int group;
+       struct link_util *lu = NULL;
+       struct iplink_req req;
+       int ret;
+
+       memset(&req, 0, sizeof(req));
+
+       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg));
+       req.n.nlmsg_flags = NLM_F_REQUEST|flags;
+       req.n.nlmsg_type = cmd;
+       req.i.ifi_family = preferred_family;
+
+       ret = iplink_parse(argc, argv, &req, &name, &type, &link, &dev, &group);
+       if (ret < 0)
+               return ret;
+
+       argc -= ret;
+       argv += ret;
+
+       if (group != -1) {
+               if (dev)
+                       addattr_l(&req.n, sizeof(req), IFLA_GROUP,
+                                       &group, sizeof(group));
+               else {
+                       if (argc) {
+                               fprintf(stderr, "Garbage instead of arguments "
+                                               "\"%s ...\". Try \"ip link "
+                                               "help\".\n", *argv);
+                               return -1;
+                       }
+                       if (flags & NLM_F_CREATE) {
+                               fprintf(stderr, "group cannot be used when "
+                                               "creating devices.\n");
+                               return -1;
+                       }
+
+                       req.i.ifi_index = 0;
+                       addattr32(&req.n, sizeof(req), IFLA_GROUP, group);
+                       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
+                               exit(2);
+                       return 0;
+               }
+       }
+
+       ll_init_map(&rth);
+
+       if (!(flags & NLM_F_CREATE)) {
+               if (!dev) {
+                       fprintf(stderr, "Not enough information: \"dev\" "
+                                       "argument is required.\n");
+                       exit(-1);
+               }
+
+               req.i.ifi_index = ll_name_to_index(dev);
+               if (req.i.ifi_index == 0) {
+                       fprintf(stderr, "Cannot find device \"%s\"\n", dev);
+                       return -1;
+               }
+       } else {
+               /* Allow "ip link add dev" and "ip link add name" */
+               if (!name)
+                       name = dev;
+
+               if (link) {
+                       int ifindex;
+
+                       ifindex = ll_name_to_index(link);
+                       if (ifindex == 0) {
+                               fprintf(stderr, "Cannot find device \"%s\"\n",
+                                       link);
+                               return -1;
+                       }
+                       addattr_l(&req.n, sizeof(req), IFLA_LINK, &ifindex, 4);
+               }
+       }
+
+       if (name) {
+               len = strlen(name) + 1;
+               if (len == 1)
+                       invarg("\"\" is not a valid device identifier\n", "name");
+               if (len > IFNAMSIZ)
+                       invarg("\"name\" too long\n", name);
+               addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, len);
+       }
+
+       if (type) {
+               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,
+                        strlen(type));
+
+               lu = get_link_kind(type);
+               if (lu && argc) {
+                       struct rtattr * data = NLMSG_TAIL(&req.n);
+                       addattr_l(&req.n, sizeof(req), IFLA_INFO_DATA, NULL, 0);
+
+                       if (lu->parse_opt &&
+                           lu->parse_opt(lu, argc, argv, &req.n))
+                               return -1;
+
+                       data->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)data;
+               } else if (argc) {
+                       if (matches(*argv, "help") == 0)
+                               usage();
+                       fprintf(stderr, "Garbage instead of arguments \"%s ...\". "
+                                       "Try \"ip link help\".\n", *argv);
+                       return -1;
+               }
+               linkinfo->rta_len = (void *)NLMSG_TAIL(&req.n) - (void *)linkinfo;
+       } else if (flags & NLM_F_CREATE) {
+               fprintf(stderr, "Not enough information: \"type\" argument "
+                               "is required\n");
+               return -1;
+       }
+
+       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
+               exit(2);
+
+       return 0;
+}
+
+#if IPLINK_IOCTL_COMPAT
 static int get_ctl_fd(void)
 {
        int s_errno;
@@ -340,7 +868,6 @@ static int do_set(int argc, char **argv)
                                flags |= IFF_NOARP;
                        } else
                                return on_off("noarp");
-#ifdef IFF_DYNAMIC
                } else if (matches(*argv, "dynamic") == 0) {
                        NEXT_ARG();
                        mask |= IFF_DYNAMIC;
@@ -350,7 +877,6 @@ static int do_set(int argc, char **argv)
                                flags &= ~IFF_DYNAMIC;
                        } else
                                return on_off("dynamic");
-#endif
                } else {
                         if (strcmp(*argv, "dev") == 0) {
                                NEXT_ARG();
@@ -384,6 +910,8 @@ static int do_set(int argc, char **argv)
        }
 
        if (newname && strcmp(dev, newname)) {
+               if (strlen(newname) == 0)
+                       invarg("\"\" is not a valid device identifier\n", "name");
                if (do_changename(dev, newname) < 0)
                        return -1;
                dev = newname;
@@ -410,12 +938,33 @@ static int do_set(int argc, char **argv)
                return do_chflags(dev, flags, mask);
        return 0;
 }
+#endif /* IPLINK_IOCTL_COMPAT */
 
 int do_iplink(int argc, char **argv)
 {
        if (argc > 0) {
-               if (matches(*argv, "set") == 0)
-                       return do_set(argc-1, argv+1);
+               if (iplink_have_newlink()) {
+                       if (matches(*argv, "add") == 0)
+                               return iplink_modify(RTM_NEWLINK,
+                                                    NLM_F_CREATE|NLM_F_EXCL,
+                                                    argc-1, argv+1);
+                       if (matches(*argv, "set") == 0 ||
+                           matches(*argv, "change") == 0)
+                               return iplink_modify(RTM_NEWLINK, 0,
+                                                    argc-1, argv+1);
+                       if (matches(*argv, "replace") == 0)
+                               return iplink_modify(RTM_NEWLINK,
+                                                    NLM_F_CREATE|NLM_F_REPLACE,
+                                                    argc-1, argv+1);
+                       if (matches(*argv, "delete") == 0)
+                               return iplink_modify(RTM_DELLINK, 0,
+                                                    argc-1, argv+1);
+               } else {
+#if IPLINK_IOCTL_COMPAT
+                       if (matches(*argv, "set") == 0)
+                               return do_set(argc-1, argv+1);
+#endif
+               }
                if (matches(*argv, "show") == 0 ||
                    matches(*argv, "lst") == 0 ||
                    matches(*argv, "list") == 0)