External/passt
1
0
Fork 0
mirror of https://passt.top/passt synced 2024-06-30 15:02:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename pasta_setup_ns() to pasta_spawn_cmd()

Browse Source 
pasta_setup_ns() no longer has much to do with setting up a namespace.
Instead it's really about starting the shell or other command we want to
run with pasta connectivity.  Rename it and its argument structure to be
less misleading.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2022-10-14 15:25:37 +11:00 committed by Stefano Brivio
parent eb3d03a588
commit 40abd447c8
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pasta.c
View File

@ -148,29 +148,29 @@ void pasta_open_ns(struct ctx *c, const char *netns)
} }
/** /**
* struct pasta_setup_ns_arg - Argument for pasta_setup_ns() * struct pasta_spawn_cmd_arg - Argument for pasta_spawn_cmd()
* @exe: Executable to run * @exe: Executable to run
* @argv: Command and arguments to run * @argv: Command and arguments to run
*/ */
struct pasta_setup_ns_arg { struct pasta_spawn_cmd_arg {
const char *exe; const char *exe;
char *const *argv; char *const *argv;
}; };
/** /**
* pasta_setup_ns() - Map credentials, enable access to ping sockets, run shell * pasta_spawn_cmd() - Prepare new netns, start command or shell
* @arg: See @pasta_setup_ns_arg * @arg: See @pasta_spawn_cmd_arg
* *
* Return: this function never returns * Return: this function never returns
*/ */
static int pasta_setup_ns(void *arg) static int pasta_spawn_cmd(void *arg)
{ {
const struct pasta_setup_ns_arg *a; const struct pasta_spawn_cmd_arg *a;
if (write_file("/proc/sys/net/ipv4/ping_group_range", "0 0")) if (write_file("/proc/sys/net/ipv4/ping_group_range", "0 0"))
warn("Cannot set ping_group_range, ICMP requests might fail"); warn("Cannot set ping_group_range, ICMP requests might fail");
a = (const struct pasta_setup_ns_arg *)arg; a = (const struct pasta_spawn_cmd_arg *)arg;
execvp(a->exe, a->argv); execvp(a->exe, a->argv);
perror("execvp"); perror("execvp");
@ -188,7 +188,7 @@ static int pasta_setup_ns(void *arg)
void pasta_start_ns(struct ctx *c, uid_t uid, gid_t gid, void pasta_start_ns(struct ctx *c, uid_t uid, gid_t gid,
int argc, char *argv[]) int argc, char *argv[])
{ {
struct pasta_setup_ns_arg arg = { struct pasta_spawn_cmd_arg arg = {
.exe = argv[0], .exe = argv[0],
.argv = argv, .argv = argv,
}; };
@ -226,7 +226,7 @@ void pasta_start_ns(struct ctx *c, uid_t uid, gid_t gid,
arg.argv = sh_argv; arg.argv = sh_argv;
} }
pasta_child_pid = clone(pasta_setup_ns, pasta_child_pid = clone(pasta_spawn_cmd,
ns_fn_stack + sizeof(ns_fn_stack) / 2, ns_fn_stack + sizeof(ns_fn_stack) / 2,
CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNET | CLONE_NEWIPC | CLONE_NEWPID | CLONE_NEWNET |
CLONE_NEWUTS, CLONE_NEWUTS,