From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top, Stefano Brivio <sbrivio@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Subject: [PATCH v2 04/14] nstool: Split some command line parsing and socket setup to subcommands
Date: Thu, 6 Apr 2023 13:28:09 +1000 [thread overview]
Message-ID: <20230406032819.707441-5-david@gibson.dropbear.id.au> (raw)
In-Reply-To: <20230406032819.707441-1-david@gibson.dropbear.id.au>
This will make it easier to differentiate the options to those commands
further in future.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
test/nstool.c | 102 +++++++++++++++++++++++++++++++++-----------------
1 file changed, 68 insertions(+), 34 deletions(-)
diff --git a/test/nstool.c b/test/nstool.c
index 92909c2..c75d458 100644
--- a/test/nstool.c
+++ b/test/nstool.c
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdbool.h>
#include <errno.h>
#include <unistd.h>
#include <sys/socket.h>
@@ -37,19 +38,55 @@ static void usage(void)
" terminate.\n");
}
-static void hold(int fd, const struct sockaddr_un *addr)
+static int connect_ctl(const char * sockpath, bool wait)
{
+ int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+ struct sockaddr_un addr = {
+ .sun_family = AF_UNIX,
+ };
int rc;
- rc = bind(fd, (struct sockaddr *)addr, sizeof(*addr));
+ if (fd < 0)
+ die("socket(): %s\n", strerror(errno));
+
+ strncpy(addr.sun_path, sockpath, UNIX_PATH_MAX);
+
+ do {
+ rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+ if (rc < 0 &&
+ (!wait || (errno != ENOENT && errno != ECONNREFUSED)))
+ die("connect() to %s: %s\n", sockpath, strerror(errno));
+ } while (rc < 0);
+
+ return fd;
+}
+
+static void cmd_hold(int argc, char *argv[])
+{
+ int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+ struct sockaddr_un addr = {
+ .sun_family = AF_UNIX,
+ };
+ const char *sockpath = argv[1];
+ int rc;
+
+ if (argc != 2)
+ usage();
+
+ if (fd < 0)
+ die("socket(): %s\n", strerror(errno));
+
+ strncpy(addr.sun_path, sockpath, UNIX_PATH_MAX);
+
+ rc = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
if (rc < 0)
- die("bind(): %s\n", strerror(errno));
+ die("bind() to %s: %s\n", sockpath, strerror(errno));
rc = listen(fd, 0);
if (rc < 0)
- die("listen(): %s\n", strerror(errno));
+ die("listen() on %s: %s\n", sockpath, strerror(errno));
- printf("nstool: local PID=%d local UID=%u local GID=%u\n",
+ printf("nstool hold: local PID=%d local UID=%u local GID=%u\n",
getpid(), getuid(), getgid());
do {
int afd = accept(fd, NULL, NULL);
@@ -63,71 +100,68 @@ static void hold(int fd, const struct sockaddr_un *addr)
die("read(): %s\n", strerror(errno));
} while (rc == 0);
- unlink(addr->sun_path);
+ unlink(sockpath);
}
-static void pid(int fd, const struct sockaddr_un *addr)
+static void cmd_pid(int argc, char *argv[])
{
- int rc;
+ const char *sockpath = argv[1];
struct ucred peercred;
socklen_t optlen = sizeof(peercred);
+ int fd, rc;
- do {
- rc = connect(fd, (struct sockaddr *)addr, sizeof(*addr));
- if (rc < 0 && errno != ENOENT && errno != ECONNREFUSED)
- die("connect(): %s\n", strerror(errno));
- } while (rc < 0);
+ if (argc != 2)
+ usage();
+
+ fd = connect_ctl(sockpath, true);
rc = getsockopt(fd, SOL_SOCKET, SO_PEERCRED,
&peercred, &optlen);
if (rc < 0)
- die("getsockopet(SO_PEERCRED): %s\n", strerror(errno));
+ die("getsockopet(SO_PEERCRED) %s: %s\n",
+ sockpath, strerror(errno));
close(fd);
printf("%d\n", peercred.pid);
}
-static void stop(int fd, const struct sockaddr_un *addr)
+static void cmd_stop(int argc, char *argv[])
{
- int rc;
+ const char *sockpath = argv[1];
+ int fd, rc;
char buf = 'Q';
- rc = connect(fd, (struct sockaddr *)addr, sizeof(*addr));
- if (rc < 0)
- die("connect(): %s\n", strerror(errno));
+ if (argc != 2)
+ usage();
+
+ fd = connect_ctl(sockpath, false);
rc = write(fd, &buf, sizeof(buf));
if (rc < 0)
- die("write(): %s\n", strerror(errno));
+ die("write() to %s: %s\n", sockpath, strerror(errno));
close(fd);
}
int main(int argc, char *argv[])
{
+ const char *subcmd = argv[1];
int fd;
- const char *sockname;
- struct sockaddr_un sockaddr = {
- .sun_family = AF_UNIX,
- };
- if (argc != 3)
+ if (argc < 2)
usage();
- sockname = argv[2];
- strncpy(sockaddr.sun_path, sockname, UNIX_PATH_MAX);
-
fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
if (fd < 0)
die("socket(): %s\n", strerror(errno));
- if (strcmp(argv[1], "hold") == 0)
- hold(fd, &sockaddr);
- else if (strcmp(argv[1], "pid") == 0)
- pid(fd, &sockaddr);
- else if (strcmp(argv[1], "stop") == 0)
- stop(fd, &sockaddr);
+ if (strcmp(subcmd, "hold") == 0)
+ cmd_hold(argc - 1, argv + 1);
+ else if (strcmp(subcmd, "pid") == 0)
+ cmd_pid(argc - 1, argv + 1);
+ else if (strcmp(subcmd, "stop") == 0)
+ cmd_stop(argc - 1, argv + 1);
else
usage();
--
@@ -11,6 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <stdbool.h>
#include <errno.h>
#include <unistd.h>
#include <sys/socket.h>
@@ -37,19 +38,55 @@ static void usage(void)
" terminate.\n");
}
-static void hold(int fd, const struct sockaddr_un *addr)
+static int connect_ctl(const char * sockpath, bool wait)
{
+ int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+ struct sockaddr_un addr = {
+ .sun_family = AF_UNIX,
+ };
int rc;
- rc = bind(fd, (struct sockaddr *)addr, sizeof(*addr));
+ if (fd < 0)
+ die("socket(): %s\n", strerror(errno));
+
+ strncpy(addr.sun_path, sockpath, UNIX_PATH_MAX);
+
+ do {
+ rc = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
+ if (rc < 0 &&
+ (!wait || (errno != ENOENT && errno != ECONNREFUSED)))
+ die("connect() to %s: %s\n", sockpath, strerror(errno));
+ } while (rc < 0);
+
+ return fd;
+}
+
+static void cmd_hold(int argc, char *argv[])
+{
+ int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
+ struct sockaddr_un addr = {
+ .sun_family = AF_UNIX,
+ };
+ const char *sockpath = argv[1];
+ int rc;
+
+ if (argc != 2)
+ usage();
+
+ if (fd < 0)
+ die("socket(): %s\n", strerror(errno));
+
+ strncpy(addr.sun_path, sockpath, UNIX_PATH_MAX);
+
+ rc = bind(fd, (struct sockaddr *)&addr, sizeof(addr));
if (rc < 0)
- die("bind(): %s\n", strerror(errno));
+ die("bind() to %s: %s\n", sockpath, strerror(errno));
rc = listen(fd, 0);
if (rc < 0)
- die("listen(): %s\n", strerror(errno));
+ die("listen() on %s: %s\n", sockpath, strerror(errno));
- printf("nstool: local PID=%d local UID=%u local GID=%u\n",
+ printf("nstool hold: local PID=%d local UID=%u local GID=%u\n",
getpid(), getuid(), getgid());
do {
int afd = accept(fd, NULL, NULL);
@@ -63,71 +100,68 @@ static void hold(int fd, const struct sockaddr_un *addr)
die("read(): %s\n", strerror(errno));
} while (rc == 0);
- unlink(addr->sun_path);
+ unlink(sockpath);
}
-static void pid(int fd, const struct sockaddr_un *addr)
+static void cmd_pid(int argc, char *argv[])
{
- int rc;
+ const char *sockpath = argv[1];
struct ucred peercred;
socklen_t optlen = sizeof(peercred);
+ int fd, rc;
- do {
- rc = connect(fd, (struct sockaddr *)addr, sizeof(*addr));
- if (rc < 0 && errno != ENOENT && errno != ECONNREFUSED)
- die("connect(): %s\n", strerror(errno));
- } while (rc < 0);
+ if (argc != 2)
+ usage();
+
+ fd = connect_ctl(sockpath, true);
rc = getsockopt(fd, SOL_SOCKET, SO_PEERCRED,
&peercred, &optlen);
if (rc < 0)
- die("getsockopet(SO_PEERCRED): %s\n", strerror(errno));
+ die("getsockopet(SO_PEERCRED) %s: %s\n",
+ sockpath, strerror(errno));
close(fd);
printf("%d\n", peercred.pid);
}
-static void stop(int fd, const struct sockaddr_un *addr)
+static void cmd_stop(int argc, char *argv[])
{
- int rc;
+ const char *sockpath = argv[1];
+ int fd, rc;
char buf = 'Q';
- rc = connect(fd, (struct sockaddr *)addr, sizeof(*addr));
- if (rc < 0)
- die("connect(): %s\n", strerror(errno));
+ if (argc != 2)
+ usage();
+
+ fd = connect_ctl(sockpath, false);
rc = write(fd, &buf, sizeof(buf));
if (rc < 0)
- die("write(): %s\n", strerror(errno));
+ die("write() to %s: %s\n", sockpath, strerror(errno));
close(fd);
}
int main(int argc, char *argv[])
{
+ const char *subcmd = argv[1];
int fd;
- const char *sockname;
- struct sockaddr_un sockaddr = {
- .sun_family = AF_UNIX,
- };
- if (argc != 3)
+ if (argc < 2)
usage();
- sockname = argv[2];
- strncpy(sockaddr.sun_path, sockname, UNIX_PATH_MAX);
-
fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
if (fd < 0)
die("socket(): %s\n", strerror(errno));
- if (strcmp(argv[1], "hold") == 0)
- hold(fd, &sockaddr);
- else if (strcmp(argv[1], "pid") == 0)
- pid(fd, &sockaddr);
- else if (strcmp(argv[1], "stop") == 0)
- stop(fd, &sockaddr);
+ if (strcmp(subcmd, "hold") == 0)
+ cmd_hold(argc - 1, argv + 1);
+ else if (strcmp(subcmd, "pid") == 0)
+ cmd_pid(argc - 1, argv + 1);
+ else if (strcmp(subcmd, "stop") == 0)
+ cmd_stop(argc - 1, argv + 1);
else
usage();
--
2.39.2
next prev parent reply other threads:[~2023-04-06 3:28 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 3:28 [PATCH v2 00/14] Improved tool for testing across multiple namespaces David Gibson
2023-04-06 3:28 ` [PATCH v2 01/14] nstool: Rename nsholder to nstool David Gibson
2023-04-06 3:28 ` [PATCH v2 02/14] nstool: Reverse parameters " David Gibson
2023-04-06 3:28 ` [PATCH v2 03/14] nstool: Move description of its operation modes from comment to usage David Gibson
2023-04-06 3:28 ` David Gibson [this message]
2023-04-06 3:28 ` [PATCH v2 05/14] nstool: Replace "pid" subcommand with "info" subcommand David Gibson
2023-04-06 3:28 ` [PATCH v2 06/14] nstool: Detect what namespaces target is in David Gibson
2023-04-06 3:28 ` [PATCH v2 07/14] nstool: Add magic number to advertized information David Gibson
2023-04-06 3:28 ` [PATCH v2 08/14] nstool: Helpers to iterate through namespace types David Gibson
2023-04-06 3:28 ` [PATCH v2 09/14] nstool: Add nstool exec command to execute commands in an nstool namespace David Gibson
2023-04-06 3:28 ` [PATCH v2 10/14] nstool: Add --keep-caps option to nstool exec David Gibson
2023-04-06 3:28 ` [PATCH v2 11/14] test: Initialise ${TRACE} properly David Gibson
2023-04-06 3:28 ` [PATCH v2 12/14] test: Use "nstool exec" to slightly simplify tests David Gibson
2023-04-06 3:28 ` [PATCH v2 13/14] nstool: Advertise the holder's cwd (in its mountns) across the socket David Gibson
2023-04-06 3:28 ` [PATCH v2 14/14] nstool: Enter holder's cwd when changing mount ns with nstool exec David Gibson
2023-04-07 23:12 ` [PATCH v2 00/14] Improved tool for testing across multiple namespaces Stefano Brivio
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=20230406032819.707441-5-david@gibson.dropbear.id.au \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
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 IMAP folder(s).