Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / ip / ipnetns.c

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index e06100f4ad2d2896705c76ff43167965d8c09975..03879b496343a52c91fc6793a18b014ccd693ea1 100644 (file)
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -35,6 +35,7 @@ static int usage(void)
        fprintf(stderr, "       ip [-all] netns exec [NAME] cmd ...\n");
        fprintf(stderr, "       ip netns monitor\n");
        fprintf(stderr, "       ip netns list-id\n");
+       fprintf(stderr, "NETNSID := auto | POSITIVE-INT\n");
        exit(-1);
 }
 
@@ -43,8 +44,7 @@ static struct rtnl_handle rtnsh = { .fd = -1 };
 
 static int have_rtnl_getnsid = -1;
 
-static int ipnetns_accept_msg(const struct sockaddr_nl *who,
-                             struct rtnl_ctrl_data *ctrl,
+static int ipnetns_accept_msg(struct rtnl_ctrl_data *ctrl,
                              struct nlmsghdr *n, void *arg)
 {
        struct nlmsgerr *err = (struct nlmsgerr *)NLMSG_DATA(n);
@@ -91,7 +91,7 @@ static int ipnetns_have_nsid(void)
        return have_rtnl_getnsid;
 }
 
-static int get_netnsid_from_name(const char *name)
+int get_netnsid_from_name(const char *name)
 {
        struct {
                struct nlmsghdr n;
@@ -108,6 +108,8 @@ static int get_netnsid_from_name(const char *name)
        struct rtgenmsg *rthdr;
        int len, fd;
 
+       netns_nsid_socket_init();
+
        fd = netns_get_fd(name);
        if (fd < 0)
                return fd;
@@ -169,6 +171,20 @@ static struct nsid_cache *netns_map_get_by_nsid(int nsid)
        return NULL;
 }
 
+char *get_name_from_nsid(int nsid)
+{
+       struct nsid_cache *c;
+
+       netns_nsid_socket_init();
+       netns_map_init();
+
+       c = netns_map_get_by_nsid(nsid);
+       if (c)
+               return c->name;
+
+       return NULL;
+}
+
 static int netns_map_add(int nsid, const char *name)
 {
        struct nsid_cache *c;
@@ -268,7 +284,7 @@ static int netns_get_name(int nsid, char *name)
        return -ENOENT;
 }
 
-int print_nsid(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int print_nsid(struct nlmsghdr *n, void *arg)
 {
        struct rtgenmsg *rthdr = NLMSG_DATA(n);
        struct rtattr *tb[NETNSA_MAX+1];
@@ -330,7 +346,7 @@ static int netns_list_id(int argc, char **argv)
                return -ENOTSUP;
        }
 
-       if (rtnl_wilddump_request(&rth, AF_UNSPEC, RTM_GETNSID) < 0) {
+       if (rtnl_nsiddump_req(&rth, AF_UNSPEC) < 0) {
                perror("Cannot send dump request");
                exit(1);
        }
@@ -691,7 +707,7 @@ out_delete:
        return -1;
 }
 
-static int set_netnsid_from_name(const char *name, int nsid)
+int set_netnsid_from_name(const char *name, int nsid)
 {
        struct {
                struct nlmsghdr n;
@@ -705,6 +721,8 @@ static int set_netnsid_from_name(const char *name, int nsid)
        };
        int fd, err = 0;
 
+       netns_nsid_socket_init();
+
        fd = netns_get_fd(name);
        if (fd < 0)
                return fd;
@@ -722,8 +740,7 @@ static int netns_set(int argc, char **argv)
 {
        char netns_path[PATH_MAX];
        const char *name;
-       unsigned int nsid;
-       int netns;
+       int netns, nsid;
 
        if (argc < 1) {
                fprintf(stderr, "No netns name specified\n");
@@ -737,8 +754,10 @@ static int netns_set(int argc, char **argv)
        /* If a negative nsid is specified the kernel will select the nsid. */
        if (strcmp(argv[1], "auto") == 0)
                nsid = -1;
-       else if (get_unsigned(&nsid, argv[1], 0))
+       else if (get_integer(&nsid, argv[1], 0))
                invarg("Invalid \"netnsid\" value\n", argv[1]);
+       else if (nsid < 0)
+               invarg("\"netnsid\" value should be >= 0\n", argv[1]);
 
        snprintf(netns_path, sizeof(netns_path), "%s/%s", NETNS_RUN_DIR, name);
        netns = open(netns_path, O_RDONLY | O_CLOEXEC);