* [PATCH BlueZ 1/2] main.conf: Introduce MaxControllers
@ 2022-02-17 23:39 Luiz Augusto von Dentz
2022-02-17 23:39 ` [PATCH BlueZ 2/2] adapter: Fix allowing multiple adapters with the same address Luiz Augusto von Dentz
2022-02-18 3:20 ` [BlueZ,1/2] main.conf: Introduce MaxControllers bluez.test.bot
0 siblings, 2 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2022-02-17 23:39 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This introduces MaxControllers which can be used to limit the number of
adapters exposed in the system.
---
src/adapter.c | 7 +++++++
src/btd.h | 1 +
src/main.c | 9 +++++++++
src/main.conf | 4 ++++
4 files changed, 21 insertions(+)
diff --git a/src/adapter.c b/src/adapter.c
index 2071cf8db..1551011a8 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -10078,6 +10078,13 @@ static void index_added(uint16_t index, uint16_t length, const void *param,
return;
}
+ /* Check if at maximum adapters allowed in the system then ignore the
+ * adapter.
+ */
+ if (btd_opts.max_adapters &&
+ btd_opts.max_adapters == g_slist_length(adapters))
+ return;
+
reset_adv_monitors(index);
adapter = btd_adapter_new(index);
diff --git a/src/btd.h b/src/btd.h
index a805a40d7..d13646889 100644
--- a/src/btd.h
+++ b/src/btd.h
@@ -121,6 +121,7 @@ struct btd_opts {
uint16_t did_version;
bt_mode_t mode;
+ uint16_t max_adapters;
bt_gatt_cache_t gatt_cache;
uint16_t gatt_mtu;
uint8_t gatt_channels;
diff --git a/src/main.c b/src/main.c
index 8cc2dfca6..bf9d398e4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -77,6 +77,7 @@ static const char *supported_options[] = {
"NameResolving",
"DebugKeys",
"ControllerMode",
+ "MaxControllers"
"MultiProfile",
"FastConnectable",
"Privacy",
@@ -779,6 +780,14 @@ static void parse_config(GKeyFile *config)
g_free(str);
}
+ val = g_key_file_get_integer(config, "General", "MaxControllers", &err);
+ if (err) {
+ g_clear_error(&err);
+ } else {
+ DBG("MaxControllers=%d", val);
+ btd_opts.max_adapters = val;
+ }
+
str = g_key_file_get_string(config, "General", "MultiProfile", &err);
if (err) {
g_clear_error(&err);
diff --git a/src/main.conf b/src/main.conf
index 49b9e6755..401796235 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -51,6 +51,10 @@
# Possible values: "dual", "bredr", "le"
#ControllerMode = dual
+# Maximum number of controllers allowed to be exposed to the system.
+# Default=0 (unlimited)
+#MaxControllers=0
+
# Enables Multi Profile Specification support. This allows to specify if
# system supports only Multiple Profiles Single Device (MPSD) configuration
# or both Multiple Profiles Single Device (MPSD) and Multiple Profiles Multiple
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH BlueZ 2/2] adapter: Fix allowing multiple adapters with the same address
2022-02-17 23:39 [PATCH BlueZ 1/2] main.conf: Introduce MaxControllers Luiz Augusto von Dentz
@ 2022-02-17 23:39 ` Luiz Augusto von Dentz
2022-02-18 3:20 ` [BlueZ,1/2] main.conf: Introduce MaxControllers bluez.test.bot
1 sibling, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2022-02-17 23:39 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
The bdaddr of an adapter is used for its unique storage path so having
multiple adapters with the same address would likely cause problems
with its storage as they would be shared.
---
src/adapter.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/adapter.c b/src/adapter.c
index 1551011a8..97ce26f8e 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -9807,6 +9807,16 @@ static void read_info_complete(uint8_t status, uint16_t length,
goto failed;
}
} else {
+ struct btd_adapter *tmp;
+
+ tmp = adapter_find(&rp->bdaddr);
+ if (tmp) {
+ btd_error(adapter->dev_id,
+ "Bluetooth address for index %u match index %u",
+ adapter->dev_id, tmp->dev_id);
+ goto failed;
+ }
+
bacpy(&adapter->bdaddr, &rp->bdaddr);
if (!(adapter->supported_settings & MGMT_SETTING_LE))
adapter->bdaddr_type = BDADDR_BREDR;
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [BlueZ,1/2] main.conf: Introduce MaxControllers
2022-02-17 23:39 [PATCH BlueZ 1/2] main.conf: Introduce MaxControllers Luiz Augusto von Dentz
2022-02-17 23:39 ` [PATCH BlueZ 2/2] adapter: Fix allowing multiple adapters with the same address Luiz Augusto von Dentz
@ 2022-02-18 3:20 ` bluez.test.bot
2022-02-18 21:22 ` Luiz Augusto von Dentz
1 sibling, 1 reply; 4+ messages in thread
From: bluez.test.bot @ 2022-02-18 3:20 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]
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=615589
---Test result---
Test Summary:
CheckPatch PASS 3.20 seconds
GitLint PASS 2.11 seconds
Prep - Setup ELL PASS 51.36 seconds
Build - Prep PASS 0.78 seconds
Build - Configure PASS 10.27 seconds
Build - Make PASS 1447.42 seconds
Make Check PASS 12.29 seconds
Make Check w/Valgrind PASS 524.58 seconds
Make Distcheck PASS 273.84 seconds
Build w/ext ELL - Configure PASS 10.39 seconds
Build w/ext ELL - Make PASS 1438.64 seconds
Incremental Build with patchesPASS 2933.71 seconds
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [BlueZ,1/2] main.conf: Introduce MaxControllers
2022-02-18 3:20 ` [BlueZ,1/2] main.conf: Introduce MaxControllers bluez.test.bot
@ 2022-02-18 21:22 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2022-02-18 21:22 UTC (permalink / raw)
To: linux-bluetooth
Hi,
On Thu, Feb 17, 2022 at 7:20 PM <bluez.test.bot@gmail.com> wrote:
>
> 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=615589
>
> ---Test result---
>
> Test Summary:
> CheckPatch PASS 3.20 seconds
> GitLint PASS 2.11 seconds
> Prep - Setup ELL PASS 51.36 seconds
> Build - Prep PASS 0.78 seconds
> Build - Configure PASS 10.27 seconds
> Build - Make PASS 1447.42 seconds
> Make Check PASS 12.29 seconds
> Make Check w/Valgrind PASS 524.58 seconds
> Make Distcheck PASS 273.84 seconds
> Build w/ext ELL - Configure PASS 10.39 seconds
> Build w/ext ELL - Make PASS 1438.64 seconds
> Incremental Build with patchesPASS 2933.71 seconds
>
>
>
> ---
> Regards,
> Linux Bluetooth
>
Pushed.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-02-18 21:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-17 23:39 [PATCH BlueZ 1/2] main.conf: Introduce MaxControllers Luiz Augusto von Dentz
2022-02-17 23:39 ` [PATCH BlueZ 2/2] adapter: Fix allowing multiple adapters with the same address Luiz Augusto von Dentz
2022-02-18 3:20 ` [BlueZ,1/2] main.conf: Introduce MaxControllers bluez.test.bot
2022-02-18 21:22 ` Luiz Augusto von Dentz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).