iproute: allow changing gretap parameters

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

diff --git a/ip/iplink.c b/ip/iplink.c
index 8c92bb1c1ed6dc8351fe11e166602cd947c28861..8481514b13e6e20d07e4d5de361651f89920ca83 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -43,7 +43,7 @@ static int iplink_have_newlink(void);
 void iplink_usage(void)
 {
        if (iplink_have_newlink()) {
-               fprintf(stderr, "Usage: ip link add link DEV [ name ] NAME\n");
+               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");
@@ -67,17 +67,21 @@ void iplink_usage(void)
        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 }\n");
+               fprintf(stderr, "TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | can | bridge }\n");
        }
        exit(-1);
 }
@@ -160,7 +164,7 @@ static int iplink_have_newlink(void)
                req.n.nlmsg_type = RTM_NEWLINK;
                req.i.ifi_family = AF_UNSPEC;
 
-               rtnl_send(&rth, (char *)&req.n, req.n.nlmsg_len);
+               rtnl_send(&rth, &req.n, req.n.nlmsg_len);
                rtnl_listen(&rth, accept_msg, NULL);
        }
        return have_rtnl_newlink;
@@ -227,6 +231,18 @@ int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                        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();
@@ -304,9 +320,12 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                         NEXT_ARG();
                         if (netns != -1)
                                 duparg("netns", *argv);
-                        if (get_integer(&netns, *argv, 0))
+                       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);
-                        addattr_l(&req->n, sizeof(*req), IFLA_NET_NS_PID, &netns, 4);
                } else if (strcmp(*argv, "multicast") == 0) {
                        NEXT_ARG();
                        req->i.ifi_change |= IFF_MULTICAST;
@@ -364,7 +383,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                        if (len < 0)
                                return -1;
                        addattr_nest_end(&req->n, vflist);
-#ifdef IFLA_MASTER
                } else if (matches(*argv, "master") == 0) {
                        int ifindex;
                        NEXT_ARG();
@@ -377,8 +395,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                        int ifindex = 0;
                        addattr_l(&req->n, sizeof(*req), IFLA_MASTER,
                                  &ifindex, 4);
-#endif
-#ifdef IFF_DYNAMIC
                } else if (matches(*argv, "dynamic") == 0) {
                        NEXT_ARG();
                        req->i.ifi_change |= IFF_DYNAMIC;
@@ -388,7 +404,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
                                req->i.ifi_flags &= ~IFF_DYNAMIC;
                        } else
                                return on_off("dynamic");
-#endif
                } else if (matches(*argv, "type") == 0) {
                        NEXT_ARG();
                        *type = *argv;
@@ -467,7 +482,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;
                }
@@ -475,36 +490,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\" "
@@ -544,7 +529,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;
@@ -829,7 +844,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;
@@ -839,7 +853,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();