mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

protocol: improve manager socket handling

Browse source 
Some of the tools would like to connect to the manager socket first
because they are manager style apps. They however completely ignore any
of the configured sockets in the config and assume everything is the
default.

Fix this by adding a remote.intention = "manager" to those apps. This
instructs the protocol to first try to connect to a socket with the
-manager extension before attempting the regular configured socket.

This makes things work when you have sockets configured in /tmp
and have remote.name = /tmp/pipewire-0 in the config.
This commit is contained in:
Wim Taymans 2025-01-29 12:59:45 +01:00
parent 546de65c67
commit 516f86c329
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/module-protocol-native/local-socket.c
View file

@ -122,13 +122,20 @@ error:
}
static int try_connect_name(struct pw_protocol_client *client,
const char *name,
const char *name, bool manager,
void (*done_callback) (void *data, int res),
void *data)
{
const char *runtime_dir;
char path[PATH_MAX];
int res;
if (manager && !spa_strendswith(name, "-manager")) {
snprintf(path, sizeof(path), "%s-manager", name);
res = try_connect_name(client, path, false, done_callback, data);
if (res >= 0)
return res;
}
if (name[0] == '/') {
return try_connect(client, NULL, name, done_callback, data);
} else {
@ -155,16 +162,19 @@ int pw_protocol_native_connect_local_socket(struct pw_protocol_client *client,
struct spa_json it[1];
char path[PATH_MAX];
int res = -EINVAL;
bool manager;
manager = props && spa_streq(spa_dict_lookup(props, PW_KEY_REMOTE_INTENTION), "manager");
name = get_remote(props);
if (name == NULL)
return -EINVAL;
if (spa_json_begin_array(&it[0], name, strlen(name)) <= 0)
return try_connect_name(client, name, done_callback, data);
return try_connect_name(client, name, manager, done_callback, data);
while (spa_json_get_string(&it[0], path, sizeof(path)) > 0) {
res = try_connect_name(client, path, done_callback, data);
res = try_connect_name(client, path, manager, done_callback, data);
if (res < 0)
continue;
break;