mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: add jack.other-connect-mode property

Browse source 
Add a new property that controls how connections between other ports are
handled. This can be used to block jack apps from connecting or
disconnecting port they don't own.
This commit is contained in:
Wim Taymans 2024-02-14 15:09:55 +01:00
parent 2807a1eafd
commit a9c0eb993e
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pipewire-jack/src/pipewire-jack.c
View file

@ -75,6 +75,10 @@ PW_LOG_TOPIC_STATIC(jack_log_topic, "jack");
#define SELF_CONNECT_FAIL_ALL -2 #define SELF_CONNECT_FAIL_ALL -2
#define SELF_CONNECT_IGNORE_ALL 2 #define SELF_CONNECT_IGNORE_ALL 2
#define OTHER_CONNECT_ALLOW 1
#define OTHER_CONNECT_FAIL -1
#define OTHER_CONNECT_IGNORE 0
#define NOTIFY_BUFFER_SIZE (1u<<13) #define NOTIFY_BUFFER_SIZE (1u<<13)
#define NOTIFY_BUFFER_MASK (NOTIFY_BUFFER_SIZE-1) #define NOTIFY_BUFFER_MASK (NOTIFY_BUFFER_SIZE-1)
@ -438,6 +442,7 @@ struct client {
unsigned int locked_process:1; unsigned int locked_process:1;
unsigned int default_as_system:1; unsigned int default_as_system:1;
int self_connect_mode; int self_connect_mode;
int other_connect_mode;
int rt_max; int rt_max;
unsigned int fix_midi_events:1; unsigned int fix_midi_events:1;
unsigned int global_buffer_size:1; unsigned int global_buffer_size:1;
@ -4039,6 +4044,14 @@ jack_client_t * jack_client_open (const char *client_name,
else if (spa_streq(str, "ignore-all")) else if (spa_streq(str, "ignore-all"))
client->self_connect_mode = SELF_CONNECT_IGNORE_ALL; client->self_connect_mode = SELF_CONNECT_IGNORE_ALL;
} }
client->other_connect_mode = OTHER_CONNECT_ALLOW;
if ((str = pw_properties_get(client->props, "jack.other-connect-mode")) != NULL) {
if (spa_streq(str, "fail"))
client->other_connect_mode = OTHER_CONNECT_FAIL;
else if (spa_streq(str, "ignore"))
client->other_connect_mode = OTHER_CONNECT_IGNORE;
}
client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX); client->rt_max = pw_properties_get_int32(client->props, "rt.prio", DEFAULT_RT_MAX);
if (status) if (status)
@ -5836,14 +5849,17 @@ static int check_connect(struct client *c, struct object *src, struct object *ds
{ {
int src_self, dst_self, sum; int src_self, dst_self, sum;
if (c->self_connect_mode == SELF_CONNECT_ALLOW)
return 1;
src_self = src->port.node_id == c->node_id ? 1 : 0; src_self = src->port.node_id == c->node_id ? 1 : 0;
dst_self = dst->port.node_id == c->node_id ? 1 : 0; dst_self = dst->port.node_id == c->node_id ? 1 : 0;
sum = src_self + dst_self; sum = src_self + dst_self;
/* check for no self connection first */
pw_log_info("sum %d %d", sum, c->self_connect_mode);
/* check for other connection first */
if (sum == 0) if (sum == 0)
return c->other_connect_mode;
if (c->self_connect_mode == SELF_CONNECT_ALLOW)
return 1; return 1;
/* internal connection */ /* internal connection */

5
src/daemon/jack.conf.in
View file

@ -83,6 +83,11 @@ jack.properties = {
# fail-all: Fail all self connect requests # fail-all: Fail all self connect requests
# ignore-all: Ignore all self connect requests # ignore-all: Ignore all self connect requests
#jack.self-connect-mode = allow #jack.self-connect-mode = allow
#
# allow: Allow connect request of other ports
# fail: Fail connect requests of other ports
# ignore: Ignore connect requests of other ports
#jack.other-connect-mode = allow
#jack.locked-process = true #jack.locked-process = true
#jack.default-as-system = false #jack.default-as-system = false
#jack.fix-midi-events = true #jack.fix-midi-events = true