From: Andrew Lunn <andrew@lunn.ch>
To: Antonio Quartulli <a@unstable.cc>
Cc: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH] batctl: Add support for network namespaces
Date: Thu, 28 Jan 2016 04:54:19 +0100 [thread overview]
Message-ID: <1453953259-30022-1-git-send-email-andrew@lunn.ch> (raw)
When running within a network namespace, access to files within
debugfs have to take into account the network name space. Each
namespace has its own directory under
/sys/kernel/debug/batman_adv/netns.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
debug.h | 2 +-
debugfs.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/debug.h b/debug.h
index df65f50..ac7a97b 100644
--- a/debug.h
+++ b/debug.h
@@ -25,7 +25,7 @@
#include <stddef.h>
#include "main.h"
-#define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s"
+#define DEBUG_BATIF_PATH_FMT "%s/batman_adv/%s%s"
#define DEBUG_TRANSTABLE_GLOBAL "transtable_global"
#define DEBUG_LOG "log"
#define DEBUG_ROUTING_ALGOS "routing_algos"
diff --git a/debugfs.c b/debugfs.c
index 3c58195..a66dbdd 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -20,11 +20,15 @@
#include "debugfs.h"
#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
#include <stdio.h>
#include <string.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/statfs.h>
+#include <sys/types.h>
+#include <unistd.h>
#ifndef DEBUGFS_MAGIC
#define DEBUGFS_MAGIC 0x64626720
@@ -39,15 +43,58 @@ static const char *debugfs_known_mountpoints[] = {
NULL,
};
+/* Return the current net namespace number. 0 is never a valid
+ * namespace, so use it to return that there is no name space
+ * support.
+ */
+
+static unsigned int debugfs_get_netns_inum(void)
+{
+ char net_path[] = "/proc/self/ns/net";
+ struct stat netst;
+ int netns;
+
+ netns = open(net_path, O_RDONLY);
+ if (netns < 0) {
+ if (errno == ENOENT)
+ /* Probably means no netns support in the kernel */
+ return 0;
+
+ fprintf(stderr,
+ "Error - can't open /proc/self/ns/net for read: %s\n",
+ strerror(errno));
+ return 0;
+ }
+
+ if (fstat(netns, &netst) < 0) {
+ fprintf(stderr, "Stat of netns failed: %s\n",
+ strerror(errno));
+ return 0;
+ }
+ close (netns);
+
+ return netst.st_ino;
+}
+
/* construct a full path to a debugfs element */
int debugfs_make_path(const char *fmt, char *mesh_iface, char *buffer, int size)
{
+ unsigned int ns = debugfs_get_netns_inum();
+ char ns_dir[PATH_MAX];
+
if (strlen(debugfs_mountpoint) == 0) {
buffer[0] = '\0';
return -1;
}
- return snprintf(buffer, size, fmt, debugfs_mountpoint, mesh_iface);
+ if (ns) {
+ snprintf(ns_dir, PATH_MAX, "netns/%u/", ns);
+ return snprintf(buffer, size, fmt, debugfs_mountpoint, ns_dir,
+ mesh_iface);
+ } else {
+ return snprintf(buffer, size, fmt, debugfs_mountpoint, "",
+ mesh_iface);
+ }
}
static int debugfs_found;
--
2.7.0.rc3
next reply other threads:[~2016-01-28 3:54 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-28 3:54 Andrew Lunn [this message]
2016-01-28 4:06 ` [B.A.T.M.A.N.] [PATCH] batctl: Add support for network namespaces Antonio Quartulli
2016-01-29 3:01 ` Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453953259-30022-1-git-send-email-andrew@lunn.ch \
--to=andrew@lunn.ch \
--cc=a@unstable.cc \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).