ip/ipnetns: move internals of get_netnsid_from_name() into namespace.c

In order to be able to reuse get_netnsid_from_name() function outside of
ip code, move the internals to lib/namespace.c to a new function called
netns_id_from_name().

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/include/namespace.h b/include/namespace.h
index e47f9b5d49d12fae39be243763d2a87df0446f7a..2843f4bb5742b1d2b1c09fce43bccb8da876304b 100644 (file)
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 #include <errno.h>
+#include <libnetlink.h>
 
 #ifndef NETNS_RUN_DIR
 #define NETNS_RUN_DIR "/var/run/netns"
@@ -58,4 +59,6 @@ struct netns_func {
        void *arg;
 };
 
+int netns_id_from_name(struct rtnl_handle *rtnl, const char *name);
+
 #endif /* __NAMESPACE_H__ */

diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index 9d996832aef867a9413511419b084f78fbd5ab2a..0ae46a874a0c9d8914d4173a4c59a5010eae6aa6 100644 (file)
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -105,52 +105,9 @@ static int ipnetns_have_nsid(void)
 
 int get_netnsid_from_name(const char *name)
 {
-       struct {
-               struct nlmsghdr n;
-               struct rtgenmsg g;
-               char            buf[1024];
-       } req = {
-               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg)),
-               .n.nlmsg_flags = NLM_F_REQUEST,
-               .n.nlmsg_type = RTM_GETNSID,
-               .g.rtgen_family = AF_UNSPEC,
-       };
-       struct nlmsghdr *answer;
-       struct rtattr *tb[NETNSA_MAX + 1];
-       struct rtgenmsg *rthdr;
-       int len, fd, ret = -1;
-
        netns_nsid_socket_init();
 
-       fd = netns_get_fd(name);
-       if (fd < 0)
-               return fd;
-
-       addattr32(&req.n, 1024, NETNSA_FD, fd);
-       if (rtnl_talk(&rtnsh, &req.n, &answer) < 0) {
-               close(fd);
-               return -2;
-       }
-       close(fd);
-
-       /* Validate message and parse attributes */
-       if (answer->nlmsg_type == NLMSG_ERROR)
-               goto out;
-
-       rthdr = NLMSG_DATA(answer);
-       len = answer->nlmsg_len - NLMSG_SPACE(sizeof(*rthdr));
-       if (len < 0)
-               goto out;
-
-       parse_rtattr(tb, NETNSA_MAX, NETNS_RTA(rthdr), len);
-
-       if (tb[NETNSA_NSID]) {
-               ret = rta_getattr_s32(tb[NETNSA_NSID]);
-       }
-
-out:
-       free(answer);
-       return ret;
+       return netns_id_from_name(&rtnsh, name);
 }
 
 struct nsid_cache {

diff --git a/lib/namespace.c b/lib/namespace.c
index 1202fa85f97deff0bbf9288c291f215b327eba6e..f03f4bbabcebc390f909475b918606fdcaf27ec8 100644 (file)
--- a/lib/namespace.c
+++ b/lib/namespace.c
@@ -7,9 +7,11 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <limits.h>
+#include <linux/net_namespace.h>
 
 #include "utils.h"
 #include "namespace.h"
+#include "libnetlink.h"
 
 static void bind_etc(const char *name)
 {
@@ -139,3 +141,50 @@ int netns_foreach(int (*func)(char *nsname, void *arg), void *arg)
        closedir(dir);
        return 0;
 }
+
+int netns_id_from_name(struct rtnl_handle *rtnl, const char *name)
+{
+       struct {
+               struct nlmsghdr n;
+               struct rtgenmsg g;
+               char            buf[1024];
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .n.nlmsg_type = RTM_GETNSID,
+               .g.rtgen_family = AF_UNSPEC,
+       };
+       struct nlmsghdr *answer;
+       struct rtattr *tb[NETNSA_MAX + 1];
+       struct rtgenmsg *rthdr;
+       int len, fd, ret = -1;
+
+       fd = netns_get_fd(name);
+       if (fd < 0)
+               return fd;
+
+       addattr32(&req.n, 1024, NETNSA_FD, fd);
+       if (rtnl_talk(rtnl, &req.n, &answer) < 0) {
+               close(fd);
+               return -2;
+       }
+       close(fd);
+
+       /* Validate message and parse attributes */
+       if (answer->nlmsg_type == NLMSG_ERROR)
+               goto out;
+
+       rthdr = NLMSG_DATA(answer);
+       len = answer->nlmsg_len - NLMSG_SPACE(sizeof(*rthdr));
+       if (len < 0)
+               goto out;
+
+       parse_rtattr(tb, NETNSA_MAX, NETNS_RTA(rthdr), len);
+
+       if (tb[NETNSA_NSID])
+               ret = rta_getattr_s32(tb[NETNSA_NSID]);
+
+out:
+       free(answer);
+       return ret;
+}