system/pipewire
system/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire synced 2024-09-06 00:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

protocol-native: add props to the sockets keys

Browse source 
Make it possible to set extra properties on the sockets created from the
config options with a props key.
This commit is contained in:
Wim Taymans 2024-03-13 12:44:24 +01:00
parent e86a68db3f
commit c5e8da7247
1 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/modules/module-protocol-native.c
View file

@ -80,12 +80,15 @@ PW_LOG_TOPIC(mod_topic_connection, "conn." NAME);
*
* The module supports the following arguments:
*
* - `sockets`: `[ { name = "socket-name", owner = "owner", group = "group", mode = "mode", selinux.context = "context" }, ... ]`
* - `sockets`: `[ { name = "socket-name", owner = "owner", group = "group", mode = "mode", selinux.context = "context" }, props = { ... }, ... ]`
*
* Array of Unix socket names and (optionally) owner/permissions to serve,
* if the context is a server. If not absolute paths, the sockets are created
* in the default runtime directory.
*
* The props are copied directly to any client that connects trough this server
* socket and can be used to configure special permissions.
*
* Has the default value `[ { name = "CORENAME" }, { name = "CORENAME-manager" } ]`,
* where `CORENAME` is the name of the PipeWire core, usually `pipewire-0`.
*
@ -138,7 +141,16 @@ PW_LOG_TOPIC(mod_topic_connection, "conn." NAME);
*\code{.unparsed}
* context.modules = [
* { name = libpipewire-module-protocol-native,
* args = { sockets = [ { name = "pipewire-0" }, { name = "pipewire-0-manager" } ] } }
* args = {
* sockets = [
* { name = "pipewire-0" }
* { name = "pipewire-0-manager" }
* { name = "pipewire-1"
* props = { my.connection = "the other one" }
* }
* ]
* }
* }
* ]
*\endcode
*/
@ -1573,13 +1585,14 @@ static int create_servers(struct pw_protocol *this, struct pw_impl_core *core,
{
const char *sockets = args ? pw_properties_get(args, "sockets") : NULL;
struct spa_json it[3];
spa_autoptr(pw_properties) p = pw_properties_copy(props);
if (sockets == NULL) {
struct socket_info info = {0};
spa_autofree char *manager_name = NULL;
info.name = (char *)get_server_name(&props->dict);
if (add_server(this, core, &props->dict, &info) == NULL)
info.name = (char *)get_server_name(&p->dict);
if (add_server(this, core, &p->dict, &info) == NULL)
return -errno;
manager_name = spa_aprintf("%s-manager", info.name);
@ -1587,7 +1600,7 @@ static int create_servers(struct pw_protocol *this, struct pw_impl_core *core,
return -ENOMEM;
info.name = manager_name;
if (add_server(this, core, &props->dict, &info) == NULL)
if (add_server(this, core, &p->dict, &info) == NULL)
return -errno;
return 0;
@ -1607,6 +1620,9 @@ static int create_servers(struct pw_protocol *this, struct pw_impl_core *core,
info.uid = getuid();
info.gid = getgid();
pw_properties_clear(p);
pw_properties_copy(props);
while (spa_json_get_string(&it[2], key, sizeof(key)) > 0) {
const char *value;
int len;
@ -1669,13 +1685,18 @@ static int create_servers(struct pw_protocol *this, struct pw_impl_core *core,
goto error_invalid;
info.has_mode = true;
} else if (spa_streq(key, "props")) {
if (spa_json_is_container(value, len))
len = spa_json_container_len(&it[2], value, len);
pw_properties_update_string(p, value, len);
}
}
if (info.name == NULL)
goto error_invalid;
if (add_server(this, core, &props->dict, &info) == NULL)
if (add_server(this, core, &p->dict, &info) == NULL)
return -errno;
}