mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2026-06-30 13:14:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw-container: Add socket path parameter

Browse source
This commit is contained in:
AMG 2026-06-24 14:51:21 +02:00 • committed by AMG AMG
parent 62e98466fa
commit b4b4e03816
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/tools/pw-container.c
View file

@ -129,6 +129,7 @@ static void show_help(struct data *d, const char *name, bool error)
" -h, --help Show this help\n" " -h, --help Show this help\n"
" --version Show version\n" " --version Show version\n"
" -r, --remote Remote daemon name\n" " -r, --remote Remote daemon name\n"
" -s, --socket-path Socket path\n"
" -P, --properties Context properties\n", " -P, --properties Context properties\n",
name); name);
fprintf(out, "\nDefault Context properties:\n"); fprintf(out, "\nDefault Context properties:\n");
@ -142,16 +143,19 @@ int main(int argc, char *argv[])
struct data data = { 0 }; struct data data = { 0 };
struct pw_loop *l; struct pw_loop *l;
const char *opt_remote = NULL; const char *opt_remote = NULL;
const char *opt_socket_path = NULL;
static const struct option long_options[] = { static const struct option long_options[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' }, { "version", no_argument, NULL, 'V' },
{ "remote", required_argument, NULL, 'r' }, { "remote", required_argument, NULL, 'r' },
{ "socket-path", required_argument, NULL, 's' },
{ "properties", required_argument, NULL, 'P' }, { "properties", required_argument, NULL, 'P' },
{ NULL, 0, NULL, 0} { NULL, 0, NULL, 0}
}; };
struct spa_error_location loc; struct spa_error_location loc;
int c, res, listen_fd, close_fd[2]; int c, res, listen_fd, close_fd[2];
char temp[] = "/tmp/pipewire-XXXXXX"; char temp[] = "/tmp/pipewire-XXXXXX";
const char *socket_path = temp;
struct sockaddr_un sockaddr = {0}; struct sockaddr_un sockaddr = {0};
data.props = pw_properties_new( data.props = pw_properties_new(
@ -162,7 +166,7 @@ int main(int argc, char *argv[])
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
pw_init(&argc, &argv); pw_init(&argc, &argv);
while ((c = getopt_long(argc, argv, "hVr:P:", long_options, NULL)) != -1) { while ((c = getopt_long(argc, argv, "hVr:s:P:", long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'h': case 'h':
show_help(&data, argv[0], false); show_help(&data, argv[0], false);
@ -178,6 +182,9 @@ int main(int argc, char *argv[])
case 'r': case 'r':
opt_remote = optarg; opt_remote = optarg;
break; break;
case 's':
opt_socket_path = optarg;
break;
case 'P': case 'P':
if (pw_properties_update_string_checked(data.props, optarg, strlen(optarg), &loc) < 0) { if (pw_properties_update_string_checked(data.props, optarg, strlen(optarg), &loc) < 0) {
spa_debug_file_error_location(stderr, &loc, spa_debug_file_error_location(stderr, &loc,
@ -235,13 +242,18 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
res = mkstemp(temp); if (opt_socket_path) {
if (res < 0) { unlink(opt_socket_path);
fprintf(stderr, "can't make temp file with template %s: %m\n", temp); socket_path = opt_socket_path;
return -1; } else {
res = mkstemp(temp);
if (res < 0) {
fprintf(stderr, "can't make temp file with template %s: %m\n", temp);
return -1;
}
close(res);
unlink(temp);
} }
close(res);
unlink(temp);
listen_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0); listen_fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
if (listen_fd < 0) { if (listen_fd < 0) {
@ -250,9 +262,9 @@ int main(int argc, char *argv[])
} }
sockaddr.sun_family = AF_UNIX; sockaddr.sun_family = AF_UNIX;
snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s", temp); snprintf(sockaddr.sun_path, sizeof(sockaddr.sun_path), "%s", socket_path);
if (bind(listen_fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) != 0) { if (bind(listen_fd, (struct sockaddr *) &sockaddr, sizeof (sockaddr)) != 0) {
fprintf(stderr, "can't bind unix socket to %s: %m\n", temp); fprintf(stderr, "can't bind unix socket to %s: %m\n", socket_path);
return -1; return -1;
} }
if (listen(listen_fd, 0) != 0) { if (listen(listen_fd, 0) != 0) {
@ -265,7 +277,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "can't create pipe: %m\n"); fprintf(stderr, "can't create pipe: %m\n");
return -1; return -1;
} }
setenv("PIPEWIRE_REMOTE", temp, 1); setenv("PIPEWIRE_REMOTE", socket_path, 1);
data.create_result = 0; data.create_result = 0;
data.pending_create = pw_security_context_create(data.sec, data.pending_create = pw_security_context_create(data.sec,
@ -296,10 +308,10 @@ int main(int argc, char *argv[])
} }
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
} else { } else {
fprintf(stdout, "new socket: %s\n", temp); fprintf(stdout, "new socket: %s\n", socket_path);
pw_main_loop_run(data.loop); pw_main_loop_run(data.loop);
} }
unlink(temp); unlink(socket_path);
spa_hook_remove(&data.registry_listener); spa_hook_remove(&data.registry_listener);
pw_proxy_destroy((struct pw_proxy*)data.sec); pw_proxy_destroy((struct pw_proxy*)data.sec);