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

tools: connect to the manager socket by default

Browse source 
This gives the tools unrestricted access by default if access.socket is defined
in the configuration access module.
This commit is contained in:
Julian Bouzas 2026-04-07 11:39:36 -04:00 • committed by Wim Taymans
parent b12b7f785e
commit 14b74962d6
9 changed files with 56 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/tools/pw-dot.c
View file

@ -1025,6 +1025,7 @@ static int get_data_from_pipewire(struct data *data, const char *opt_remote)
{ {
struct pw_loop *l; struct pw_loop *l;
struct global *g; struct global *g;
const char *remote_name;
data->loop = pw_main_loop_new(NULL); data->loop = pw_main_loop_new(NULL);
if (data->loop == NULL) { if (data->loop == NULL) {
@ -1043,9 +1044,13 @@ static int get_data_from_pipewire(struct data *data, const char *opt_remote)
return -1; return -1;
} }
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (opt_remote)
remote_name = opt_remote;
data->core = pw_context_connect(data->context, data->core = pw_context_connect(data->context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data->core == NULL) { if (data->core == NULL) {

8
src/tools/pw-dump.c
View file

@ -1422,7 +1422,7 @@ int main(int argc, char *argv[])
struct data data = { 0 }; struct data data = { 0 };
struct object *o; struct object *o;
struct pw_loop *l; struct pw_loop *l;
const char *opt_remote = NULL; const char *opt_remote = NULL, *remote_name;
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' },
@ -1528,10 +1528,14 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (opt_remote)
remote_name = opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_INTENTION, "manager", PW_KEY_REMOTE_INTENTION, "manager",
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {

7
src/tools/pw-link.c
View file

@ -932,6 +932,7 @@ static int run(int argc, char *argv[])
.target_links = SPA_LIST_INIT(&data.target_links), .target_links = SPA_LIST_INIT(&data.target_links),
}; };
int res = 0, c; int res = 0, c;
const char *remote_name;
struct spa_error_location loc; struct spa_error_location loc;
static const struct option long_options[] = { static const struct option long_options[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
@ -1070,9 +1071,13 @@ static int run(int argc, char *argv[])
return -1; return -1;
} }
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (data.opt_remote)
remote_name = data.opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, data.opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {

10
src/tools/pw-loopback.c
View file

@ -91,7 +91,7 @@ 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, *remote_name;
char cname[256], value[256]; char cname[256], value[256];
char *args; char *args;
size_t size; size_t size;
@ -221,8 +221,12 @@ int main(int argc, char *argv[])
fprintf(f, "{"); fprintf(f, "{");
if (opt_remote != NULL) remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
fprintf(f, " remote.name = \"%s\"", opt_remote); if (opt_remote)
remote_name = opt_remote;
fprintf(f, " remote.name = \"%s\"", remote_name);
if (data.latency != 0) if (data.latency != 0)
fprintf(f, " node.latency = %u/%u", data.latency, DEFAULT_RATE); fprintf(f, " node.latency = %u/%u", data.latency, DEFAULT_RATE);
if (data.delay != 0.0f) if (data.delay != 0.0f)

7
src/tools/pw-metadata.c
View file

@ -180,6 +180,7 @@ int main(int argc, char *argv[])
{ {
struct data data = { 0, }; struct data data = { 0, };
int res = 0, c; int res = 0, c;
const char *remote_name;
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' },
@ -257,9 +258,13 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (data.opt_remote)
remote_name = data.opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, data.opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {

8
src/tools/pw-mididump.c
View file

@ -150,6 +150,8 @@ static void do_quit(void *userdata, int signal_number)
static int dump_filter(struct data *data) static int dump_filter(struct data *data)
{ {
const char *remote_name;
data->loop = pw_main_loop_new(NULL); data->loop = pw_main_loop_new(NULL);
if (data->loop == NULL) if (data->loop == NULL)
return -errno; return -errno;
@ -157,11 +159,15 @@ static int dump_filter(struct data *data)
pw_loop_add_signal(pw_main_loop_get_loop(data->loop), SIGINT, do_quit, data); pw_loop_add_signal(pw_main_loop_get_loop(data->loop), SIGINT, do_quit, data);
pw_loop_add_signal(pw_main_loop_get_loop(data->loop), SIGTERM, do_quit, data); pw_loop_add_signal(pw_main_loop_get_loop(data->loop), SIGTERM, do_quit, data);
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (data->opt_remote)
remote_name = data->opt_remote;
data->filter = pw_filter_new_simple( data->filter = pw_filter_new_simple(
pw_main_loop_get_loop(data->loop), pw_main_loop_get_loop(data->loop),
"midi-dump", "midi-dump",
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, data->opt_remote, PW_KEY_REMOTE_NAME, remote_name,
PW_KEY_MEDIA_TYPE, "Midi", PW_KEY_MEDIA_TYPE, "Midi",
PW_KEY_MEDIA_CATEGORY, "Filter", PW_KEY_MEDIA_CATEGORY, "Filter",
PW_KEY_MEDIA_ROLE, "DSP", PW_KEY_MEDIA_ROLE, "DSP",

8
src/tools/pw-mon.c
View file

@ -789,7 +789,7 @@ 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, *remote_name;
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' },
@ -884,10 +884,14 @@ int main(int argc, char *argv[])
spa_list_init(&data.pending_list); spa_list_init(&data.pending_list);
spa_list_init(&data.global_list); spa_list_init(&data.global_list);
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (opt_remote)
remote_name = opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_INTENTION, "manager", PW_KEY_REMOTE_INTENTION, "manager",
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {

8
src/tools/pw-profiler.c
View file

@ -678,7 +678,7 @@ 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, *remote_name;
const char *opt_output = DEFAULT_FILENAME; const char *opt_output = DEFAULT_FILENAME;
static const struct option long_options[] = { static const struct option long_options[] = {
{ "help", no_argument, NULL, 'h' }, { "help", no_argument, NULL, 'h' },
@ -743,9 +743,13 @@ int main(int argc, char *argv[])
pw_context_load_module(data.context, PW_EXTENSION_MODULE_PROFILER, NULL, NULL); pw_context_load_module(data.context, PW_EXTENSION_MODULE_PROFILER, NULL, NULL);
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (opt_remote)
remote_name = opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {

8
src/tools/pw-top.c
View file

@ -872,7 +872,7 @@ 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, *remote_name;
static const struct option long_options[] = { static const struct option long_options[] = {
{ "batch-mode", no_argument, NULL, 'b' }, { "batch-mode", no_argument, NULL, 'b' },
{ "iterations", required_argument, NULL, 'n' }, { "iterations", required_argument, NULL, 'n' },
@ -947,10 +947,14 @@ int main(int argc, char *argv[])
pw_context_load_module(data.context, PW_EXTENSION_MODULE_PROFILER, NULL, NULL); pw_context_load_module(data.context, PW_EXTENSION_MODULE_PROFILER, NULL, NULL);
remote_name = "[" PW_DEFAULT_REMOTE "-manager," PW_DEFAULT_REMOTE "]";
if (opt_remote)
remote_name = opt_remote;
data.core = pw_context_connect(data.context, data.core = pw_context_connect(data.context,
pw_properties_new( pw_properties_new(
PW_KEY_REMOTE_INTENTION, "manager", PW_KEY_REMOTE_INTENTION, "manager",
PW_KEY_REMOTE_NAME, opt_remote, PW_KEY_REMOTE_NAME, remote_name,
NULL), NULL),
0); 0);
if (data.core == NULL) { if (data.core == NULL) {