Use libbsd for strlcpy if available

[mirror_iproute2.git] / ip / iplink.c

diff --git a/ip/iplink.c b/ip/iplink.c
index 22afe0221f3c8a109d2809ce4bb33cff9d6ec125..067f5409e569ef42c75711d1c78526e1f036452d 100644 (file)
--- a/ip/iplink.c
+++ b/ip/iplink.c
@@ -24,6 +24,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <string.h>
+#ifdef HAVE_LIBBSD
+#include <bsd/string.h>
+#endif
 #include <sys/ioctl.h>
 #include <stdbool.h>
 #include <linux/mpls.h>
@@ -85,7 +88,7 @@ void iplink_usage(void)
                "                         [ broadcast LLADDR ]\n"
                "                         [ mtu MTU ]\n"
                "                         [ netns { PID | NAME } ]\n"
-               "                         [ link-netnsid ID ]\n"
+               "                         [ link-netns NAME | link-netnsid ID ]\n"
                "                         [ alias NAME ]\n"
                "                         [ vf NUM [ mac LLADDR ]\n"
                "                                  [ vlan VLANID [ qos VLAN-QOS ] [ proto VLAN-PROTO ] ]\n"
@@ -120,8 +123,8 @@ void iplink_usage(void)
                        "TYPE := { vlan | veth | vcan | vxcan | dummy | ifb | macvlan | macvtap |\n"
                        "          bridge | bond | team | ipoib | ip6tnl | ipip | sit | vxlan |\n"
                        "          gre | gretap | erspan | ip6gre | ip6gretap | ip6erspan |\n"
-                       "          vti | nlmon | team_slave | bond_slave | ipvlan | geneve |\n"
-                       "          bridge_slave | vrf | macsec | netdevsim }\n");
+                       "          vti | nlmon | team_slave | bond_slave | bridge_slave |\n"
+                       "          ipvlan | ipvtap | geneve | vrf | macsec | netdevsim | rmnet }\n");
        }
        exit(-1);
 }
@@ -199,8 +202,7 @@ static int get_addr_gen_mode(const char *mode)
 #if IPLINK_IOCTL_COMPAT
 static int have_rtnl_newlink = -1;
 
-static int accept_msg(const struct sockaddr_nl *who,
-                     struct rtnl_ctrl_data *ctrl,
+static int accept_msg(struct rtnl_ctrl_data *ctrl,
                      struct nlmsghdr *n, void *arg)
 {
        struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n);
@@ -242,9 +244,10 @@ static int iplink_have_newlink(void)
 }
 #endif /* ! IPLINK_IOCTL_COMPAT */
 
-static int nl_get_ll_addr_len(unsigned int dev_index)
+static int nl_get_ll_addr_len(const char *ifname)
 {
        int len;
+       int dev_index = ll_name_to_index(ifname);
        struct iplink_req req = {
                .n = {
                        .nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
@@ -259,6 +262,9 @@ static int nl_get_ll_addr_len(unsigned int dev_index)
        struct nlmsghdr *answer;
        struct rtattr *tb[IFLA_MAX+1];
 
+       if (dev_index == 0)
+               return -1;
+
        if (rtnl_talk(&rth, &req.n, &answer) < 0)
                return -1;
 
@@ -337,7 +343,7 @@ static void iplink_parse_vf_vlan_info(int vf, int *argcp, char ***argvp,
 }
 
 static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
-                          struct iplink_req *req, int dev_index)
+                          struct iplink_req *req, const char *dev)
 {
        char new_rate_api = 0, count = 0, override_legacy_rate = 0;
        struct ifla_vf_rate tivt;
@@ -373,7 +379,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                NEXT_ARG();
                if (matches(*argv, "mac") == 0) {
                        struct ifla_vf_mac ivm = { 0 };
-                       int halen = nl_get_ll_addr_len(dev_index);
+                       int halen = nl_get_ll_addr_len(dev);
 
                        NEXT_ARG();
                        ivm.vf = vf;
@@ -542,7 +548,7 @@ static int iplink_parse_vf(int vf, int *argcp, char ***argvp,
                int tmin, tmax;
 
                if (tivt.min_tx_rate == -1 || tivt.max_tx_rate == -1) {
-                       ipaddr_get_vf_rate(tivt.vf, &tmin, &tmax, dev_index);
+                       ipaddr_get_vf_rate(tivt.vf, &tmin, &tmax, dev);
                        if (tivt.min_tx_rate == -1)
                                tivt.min_tx_rate = tmin;
                        if (tivt.max_tx_rate == -1)
@@ -583,7 +589,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
        int vf = -1;
        int numtxqueues = -1;
        int numrxqueues = -1;
-       int dev_index = 0;
        int link_netnsid = -1;
        int index = 0;
        int group = -1;
@@ -605,10 +610,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        if (check_ifname(*argv))
                                invarg("\"name\" not a valid ifname", *argv);
                        name = *argv;
-                       if (!dev) {
+                       if (!dev)
                                dev = name;
-                               dev_index = ll_name_to_index(dev);
-                       }
                } else if (strcmp(*argv, "index") == 0) {
                        NEXT_ARG();
                        if (index)
@@ -660,7 +663,7 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        bool offload = strcmp(*argv, "xdpoffload") == 0;
 
                        NEXT_ARG();
-                       if (xdp_parse(&argc, &argv, req, dev_index,
+                       if (xdp_parse(&argc, &argv, req, dev,
                                      generic, drv, offload))
                                exit(-1);
 
@@ -750,10 +753,10 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
 
                        vflist = addattr_nest(&req->n, sizeof(*req),
                                              IFLA_VFINFO_LIST);
-                       if (dev_index == 0)
+                       if (!dev)
                                missarg("dev");
 
-                       len = iplink_parse_vf(vf, &argc, &argv, req, dev_index);
+                       len = iplink_parse_vf(vf, &argc, &argv, req, dev);
                        if (len < 0)
                                return -1;
                        addattr_nest_end(&req->n, vflist);
@@ -864,10 +867,24 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                                 IFLA_INET6_ADDR_GEN_MODE, mode);
                        addattr_nest_end(&req->n, afs6);
                        addattr_nest_end(&req->n, afs);
+               } else if (matches(*argv, "link-netns") == 0) {
+                       NEXT_ARG();
+                       if (link_netnsid != -1)
+                               duparg("link-netns/link-netnsid", *argv);
+                       link_netnsid = get_netnsid_from_name(*argv);
+                       /* No nsid? Try to assign one. */
+                       if (link_netnsid < 0)
+                               set_netnsid_from_name(*argv, -1);
+                       link_netnsid = get_netnsid_from_name(*argv);
+                       if (link_netnsid < 0)
+                               invarg("Invalid \"link-netns\" value\n",
+                                      *argv);
+                       addattr32(&req->n, sizeof(*req), IFLA_LINK_NETNSID,
+                                 link_netnsid);
                } else if (matches(*argv, "link-netnsid") == 0) {
                        NEXT_ARG();
                        if (link_netnsid != -1)
-                               duparg("link-netnsid", *argv);
+                               duparg("link-netns/link-netnsid", *argv);
                        if (get_integer(&link_netnsid, *argv, 0))
                                invarg("Invalid \"link-netnsid\" value\n",
                                       *argv);
@@ -916,7 +933,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
                        if (check_ifname(*argv))
                                invarg("\"dev\" not a valid ifname", *argv);
                        dev = *argv;
-                       dev_index = ll_name_to_index(dev);
                }
                argc--; argv++;
        }
@@ -931,8 +947,8 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req, char **type)
        else if (!strcmp(name, dev))
                name = dev;
 
-       if (dev_index && addr_len) {
-               int halen = nl_get_ll_addr_len(dev_index);
+       if (dev && addr_len) {
+               int halen = nl_get_ll_addr_len(dev);
 
                if (halen >= 0 && halen != addr_len) {
                        fprintf(stderr,
@@ -1073,11 +1089,11 @@ static int iplink_modify(int cmd, unsigned int flags, int argc, char **argv)
        return 0;
 }
 
-int iplink_get(unsigned int flags, char *name, __u32 filt_mask)
+int iplink_get(char *name, __u32 filt_mask)
 {
        struct iplink_req req = {
                .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ifinfomsg)),
-               .n.nlmsg_flags = NLM_F_REQUEST | flags,
+               .n.nlmsg_flags = NLM_F_REQUEST,
                .n.nlmsg_type = RTM_GETLINK,
                .i.ifi_family = preferred_family,
        };
@@ -1093,7 +1109,7 @@ int iplink_get(unsigned int flags, char *name, __u32 filt_mask)
                return -2;
 
        open_json_object(NULL);
-       print_linkinfo(NULL, answer, stdout);
+       print_linkinfo(answer, stdout);
        close_json_object();
 
        free(answer);
@@ -1522,9 +1538,7 @@ struct af_stats_ctx {
        int ifindex;
 };
 
-static int print_af_stats(const struct sockaddr_nl *who,
-                         struct nlmsghdr *n,
-                         void *arg)
+static int print_af_stats(struct nlmsghdr *n, void *arg)
 {
        struct if_stats_msg *ifsm = NLMSG_DATA(n);
        struct rtattr *tb[IFLA_STATS_MAX+1];
@@ -1587,9 +1601,7 @@ static int iplink_afstats(int argc, char **argv)
                }
        }
 
-       if (rtnl_wilddump_stats_req_filter(&rth, AF_UNSPEC,
-                                          RTM_GETSTATS,
-                                          filt_mask) < 0) {
+       if (rtnl_statsdump_req_filter(&rth, AF_UNSPEC, filt_mask) < 0) {
                perror("Cannont send dump request");
                return 1;
        }