ExcludeAdapter configuration setting for input plugin
v3 cover ExcludeAdapter configuration setting for input plugin
As a bluez user I have run into cases where the input plugin can be problematic because it binds both HID PSMs on all bluetooth adapters. Simply disabling the plugin is not an ideal solution if you want to, for example, run an application that binds PSMs 17 and 19 on adapterA while using a bluetooth input device on adapterB. This proposed feature would allow users to determine which of their adapters can be engaged by the input plugin. Using the ExcludeAdapters key in input.conf a comma separated list of bdaddrs can be specified that the input plugin will not start a server on.
shwoseph (1):
ExcludeAdapter configuration setting for input profile
profiles/input/device.c | 22 ++++++++++++++++++++++ profiles/input/device.h | 4 ++++ profiles/input/input.conf | 4 ++++ profiles/input/manager.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-)
Signature · 1 line
2.32.0
PATCH v3 1/1 ExcludeAdapter configuration setting for input profile
--- profiles/input/device.c | 22 ++++++++++++++++++++++ profiles/input/device.h | 4 ++++ profiles/input/input.conf | 4 ++++ profiles/input/manager.c | 34 +++++++++++++++++++++++++++++++++- 4 files changed, 63 insertions(+), 1 deletion(-)
profiles/input/device.c +22 -0
@@ -82,6 +82,8 @@ struct input_device {static int idle_timeout =0 ;static bool uhid_enabled = false;static bool classic_bonded_only = false; +static char **exclude_adapters; +static gsize num_exclude_adapters;void input_set_idle_timeout (int timeout) {
@@ -103,6 +105,26 @@ bool input_get_classic_bonded_only(void)return classic_bonded_only; } +char **input_get_exclude_adapters (void ) +{ +return exclude_adapters; +} + +void input_set_exclude_adapters (char **adapters) +{ + exclude_adapters = adapters; +} + +gsize input_get_num_exclude_adapters (void ) +{ +return num_exclude_adapters; +} + +void input_set_num_exclude_adapters (gsize num) +{ + num_exclude_adapters = num; +} +static void input_device_enter_reconnect_mode (struct input_device *idev);static int connection_disconnect (struct input_device *idev,uint32_t flags);static int uhid_disconnect (struct input_device *idev);
profiles/input/device.h +4 -0
@@ -19,6 +19,10 @@ void input_enable_userspace_hid(bool state);void input_set_classic_bonded_only (bool state);bool input_get_classic_bonded_only (void );void input_set_auto_sec (bool state); +char **input_get_exclude_adapters (void ); +void input_set_exclude_adapters (char **address); +gsize input_get_num_exclude_adapters (void ); +void input_set_num_exclude_adapters (gsize address);int input_device_register (struct btd_service *service);void input_device_unregister (struct btd_service *service);
profiles/input/input.conf +4 -0
@@ -24,3 +24,7 @@ # Enables upgrades of security automatically if required. # Defaults to true to maximize device compatibility. #LEAutoSecurity=true + +# Exclude adapters +# Disables input plugin on adapters with specified bdaddrs +#ExcludeAdapters=00:00:00:00:00:00,00:00:00:00:00:01
profiles/input/manager.c +33 -1
@@ -32,7 +32,22 @@static int hid_server_probe (struct btd_profile *p,struct btd_adapter *adapter) { -return server_start (btd_adapter_get_address (adapter)); +const bdaddr_t *address; +char addr[18 ]; +char **exclude_adapters; +gsize num_exclude_adapters; + + address =btd_adapter_get_address (adapter); +ba2str (address, addr); + exclude_adapters =input_get_exclude_adapters (); + num_exclude_adapters =input_get_num_exclude_adapters (); + +for (gsize i =0 ; i < num_exclude_adapters; i++) { +if (strcmp (addr, exclude_adapters[i])) +return 0 ; + } + +return server_start (address); } static void hid_server_remove(struct btd_profile *p,
@@ -83,6 +98,9 @@ static int input_init(void) config =load_config_file (CONFIGDIR "/input.conf" );if (config) {int idle_timeout; +char *exclude_adapters_str; +char **exclude_adapters; +gsize num_exclude_adapters;gboolean uhid_enabled, classic_bonded_only, auto_sec; idle_timeout = g_key_file_get_integer(config, "General",
@@ -121,6 +139,20 @@ static int input_init(void) }else g_clear_error (&err); +g_key_file_set_list_separator (config,',' ); + + exclude_adapters_str =g_key_file_get_string (config,"General" , +"ExcludeAdapters" , &err); + exclude_adapters =g_key_file_get_string_list (config,"General" , +"ExcludeAdapters" , &num_exclude_adapters, &err); + +if (!err) { +DBG ("input.conf: ExcludeAdapters=%s" , + exclude_adapters_str); +input_set_exclude_adapters (exclude_adapters); +input_set_num_exclude_adapters (num_exclude_adapters); + }else +g_clear_error (&err); }btd_profile_register (&input_profile);
Signature · 1 line
2.32.0
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=658206
---Test result---
Test Summary:
CheckPatch PASS 0.74 seconds GitLint PASS 0.43 seconds Prep - Setup ELL PASS 29.96 seconds Build - Prep PASS 0.60 seconds Build - Configure PASS 9.38 seconds Build - Make PASS 890.21 seconds Make Check PASS 12.01 seconds Make Check w/Valgrind PASS 312.26 seconds Make Distcheck PASS 253.84 seconds Build w/ext ELL - Configure PASS 9.34 seconds Build w/ext ELL - Make PASS 89.40 seconds Incremental Build w/ patches PASS 0.00 seconds Scan Build PASS 524.20 seconds
---
Regards,
Linux Bluetooth