From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: bhutchings@solarflare.com
Cc: shemminger@vyatta.com, netdev@vger.kernel.org,
junwei.zhang@6wind.com,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH iproute2 v3] ipbatch: fix use of 'ip netns exec'
Date: Tue, 9 Jul 2013 12:26:52 +0200 [thread overview]
Message-ID: <1373365612-16402-1-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1373326605.1860.12.camel@bwh-desktop.uk.level5networks.com>
From: JunweiZhang <junwei.zhang@6wind.com>
execvp() does not return when the command succeed, hence all commands in the
batch file after the line 'ip netns exec' are not executed.
Let's fork before calling execvp().
Example:
$ cat test.batch
netns add netns1
netns exec netns1 ip l
netns
$ ip -b test.batch
1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
2: sit0: <NOARP> mtu 1480 qdisc noop state DOWN mode DEFAULT
link/sit 0.0.0.0 brd 0.0.0.0
All command after 'netns exec' are never executed.
With the patch:
$ ip -b test.batch
1: lo: <LOOPBACK> mtu 65536 qdisc noop state DOWN mode DEFAULT
link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00
2: sit0: <NOARP> mtu 1480 qdisc noop state DOWN mode DEFAULT
link/sit 0.0.0.0 brd 0.0.0.0
netns1
Now, existing netns are displayed.
Signed-off-by: JunweiZhang <junwei.zhang@6wind.com>
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
v3: be more verbose on error (fork(), waitpid())
when child fails, just exit to avoid double cleanning
check WIFEXITED() and waitpid() before using WEXITSTATUS()
v2: keep exit status of the child
add an example in the commit log
ip/ipnetns.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/ip/ipnetns.c b/ip/ipnetns.c
index fa2b681..474a296 100644
--- a/ip/ipnetns.c
+++ b/ip/ipnetns.c
@@ -138,6 +138,7 @@ static int netns_exec(int argc, char **argv)
const char *name, *cmd;
char net_path[MAXPATHLEN];
int netns;
+ int pid, status;
if (argc < 1) {
fprintf(stderr, "No netns name specified\n");
@@ -185,9 +186,32 @@ static int netns_exec(int argc, char **argv)
/* Setup bind mounts for config files in /etc */
bind_etc(name);
- if (execvp(cmd, argv + 1) < 0)
- fprintf(stderr, "exec of \"%s\" failed: %s\n",
- cmd, strerror(errno));
+ pid = fork();
+ if (pid < 0) {
+ perror("fork");
+ return EXIT_FAILURE;
+ } else if (pid == 0) {
+ /* Child */
+ if (execvp(cmd, argv + 1) < 0)
+ fprintf(stderr, "exec of \"%s\" failed: %s\n",
+ cmd, strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+
+ /* Parent */
+ if (waitpid(pid, &status, 0) < 0) {
+ perror("waitpid");
+ return EXIT_FAILURE;
+ }
+
+ if (WIFEXITED(status)) {
+ /* ip must returns the status of the child, but do_cmd() will
+ * add a minus to this returned value, so let's add another one
+ * here to cancel it.
+ */
+ return -WEXITSTATUS(status);
+ }
+
return EXIT_FAILURE;
}
--
1.8.2.1
next prev parent reply other threads:[~2013-07-09 10:27 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20130705141639.56b47e7e@samsung-9>
2013-07-08 9:44 ` [PATCH iproute2 v2] ipbatch: fix use of 'ip netns exec' Nicolas Dichtel
2013-07-08 23:36 ` Ben Hutchings
2013-07-09 10:26 ` Nicolas Dichtel [this message]
2013-07-09 13:20 ` [PATCH iproute2 v3] " Eric Dumazet
2013-07-09 15:55 ` [PATCH iproute2 v4] " Nicolas Dichtel
2013-07-09 16:19 ` Ben Hutchings
2013-07-09 16:59 ` Nicolas Dichtel
2013-07-09 18:13 ` Ben Hutchings
2013-07-10 9:52 ` Nicolas Dichtel
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=1373365612-16402-1-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=bhutchings@solarflare.com \
--cc=junwei.zhang@6wind.com \
--cc=netdev@vger.kernel.org \
--cc=shemminger@vyatta.com \
/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).