iproute2 - Fix up and simplify variables pointing to install directories

[lisovros/iproute2_canprio.git] / ip / iplink.c

diff --git a/ip/iplink.c b/ip/iplink.c
index d41605b379e0027d4fee211634eba394a87a61e4..679091e6831b71538cce495f6f13d6626bf49e0e 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -34,7 +34,7 @@
 
 #define IPLINK_IOCTL_COMPAT    1
 #ifndef LIBDIR
-#define LIBDIR "/usr/lib/"
+#define LIBDIR "/usr/lib"
 #endif
 
 static void usage(void) __attribute__((noreturn));
@@ -132,6 +132,15 @@ struct link_util *get_link_kind(const char *id)
        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;
 
@@ -421,6 +430,21 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                                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();
@@ -482,7 +506,7 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
 
                        req.i.ifi_index = 0;
                        addattr32(&req.n, sizeof(req), IFLA_GROUP, group);
-                       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+                       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
                                exit(2);
                        return 0;
                }
@@ -490,36 +514,6 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
 
        ll_init_map(&rth);
 
-       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 (!(flags & NLM_F_CREATE)) {
                if (!dev) {
                        fprintf(stderr, "Not enough information: \"dev\" "
@@ -559,7 +553,37 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
                addattr_l(&req.n, sizeof(req), IFLA_IFNAME, name, len);
        }
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+       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;