ipnetns: parse nsid as a signed integer

[mirror_iproute2.git] / ip / ipnetns.c

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index 1fa539863132796ee32c8eb4921e7ecbc8c898d8..03879b496343a52c91fc6793a18b014ccd693ea1 100644 (file)
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 #define _ATFILE_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -21,6 +22,7 @@
 #include "list.h"
 #include "ip_common.h"
 #include "namespace.h"
+#include "json_print.h"
 
 static int usage(void)
 {
@@ -33,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);
 }
 
@@ -41,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);
@@ -89,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;
@@ -106,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;
@@ -167,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;
@@ -266,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];
@@ -292,26 +310,30 @@ int print_nsid(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                return -1;
        }
 
+       open_json_object(NULL);
        if (n->nlmsg_type == RTM_DELNSID)
-               fprintf(fp, "Deleted ");
+               print_bool(PRINT_ANY, "deleted", "Deleted ", true);
 
        nsid = rta_getattr_u32(tb[NETNSA_NSID]);
-       fprintf(fp, "nsid %u ", nsid);
+       print_uint(PRINT_ANY, "nsid", "nsid %u ", nsid);
 
        c = netns_map_get_by_nsid(nsid);
        if (c != NULL) {
-               fprintf(fp, "(iproute2 netns name: %s)", c->name);
+               print_string(PRINT_ANY, "name",
+                            "(iproute2 netns name: %s)", c->name);
                netns_map_del(c);
        }
 
        /* During 'ip monitor nsid', no chance to have new nsid in cache. */
        if (c == NULL && n->nlmsg_type == RTM_NEWNSID)
                if (netns_get_name(nsid, name) == 0) {
-                       fprintf(fp, "(iproute2 netns name: %s)", name);
+                       print_string(PRINT_ANY, "name",
+                                    "(iproute2 netns name: %s)", name);
                        netns_map_add(nsid, name);
                }
 
-       fprintf(fp, "\n");
+       print_string(PRINT_FP, NULL, "\n", NULL);
+       close_json_object();
        fflush(fp);
        return 0;
 }
@@ -324,14 +346,18 @@ 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);
        }
+
+       new_json_obj(json);
        if (rtnl_dump_filter(&rth, print_nsid, stdout) < 0) {
+               delete_json_obj();
                fprintf(stderr, "Dump terminated\n");
                exit(1);
        }
+       delete_json_obj();
        return 0;
 }
 
@@ -345,20 +371,27 @@ static int netns_list(int argc, char **argv)
        if (!dir)
                return 0;
 
+       new_json_obj(json);
        while ((entry = readdir(dir)) != NULL) {
                if (strcmp(entry->d_name, ".") == 0)
                        continue;
                if (strcmp(entry->d_name, "..") == 0)
                        continue;
-               printf("%s", entry->d_name);
+
+               open_json_object(NULL);
+               print_string(PRINT_ANY, "name",
+                            "%s", entry->d_name);
                if (ipnetns_have_nsid()) {
                        id = get_netnsid_from_name(entry->d_name);
                        if (id >= 0)
-                               printf(" (id: %d)", id);
+                               print_uint(PRINT_ANY, "id",
+                                          " (id: %d)", id);
                }
-               printf("\n");
+               print_string(PRINT_FP, NULL, "\n", NULL);
+               close_json_object();
        }
        closedir(dir);
+       delete_json_obj();
        return 0;
 }
 
@@ -674,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;
@@ -688,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;
@@ -705,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");
@@ -717,8 +751,13 @@ static int netns_set(int argc, char **argv)
                return -1;
        }
        name = argv[0];
-       if (get_unsigned(&nsid, argv[1], 0))
+       /* If a negative nsid is specified the kernel will select the nsid. */
+       if (strcmp(argv[1], "auto") == 0)
+               nsid = -1;
+       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);