[PATCH BlueZ 1/2] emulator: Set the number of advertising sets

[Weihong Guan <weihong.guan@gmail.com>]

btdev reports MAX_EXT_ADV_SETS (3) in LE Read Number of Supported
Advertising Sets and allows that many sets. A controller may support a
single set (the command's range is 0x01 to 0xF0), and the kernel then
gives advertising instance 1 handle 0x00, the handle Global Advertising
uses too; bugs on that path don't show with three sets.

Add btdev_set_adv_sets() and hciemu_set_central_le_adv_sets() to report
and allow fewer sets, kept across HCI_Reset as a controller keeps its
capabilities.

Assisted-by: Claude:claude-opus-5.5
---
 emulator/btdev.c  | 18 ++++++++++++++++--
 emulator/btdev.h  |  2 ++
 emulator/hciemu.c | 14 ++++++++++++++
 emulator/hciemu.h |  2 ++
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 7a8d8a4..d7f9e5e 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -280,6 +280,8 @@ struct btdev {
 	uint16_t le_rl_timeout;
 
 	struct queue *le_ext_adv;
+	/* Number of advertising sets reported, kept across HCI_Reset */
+	uint8_t le_adv_sets;
 	struct queue *le_per_adv;
 	struct queue *le_big;
 
@@ -576,6 +578,17 @@ void btdev_set_rl_len(struct btdev *btdev, uint8_t len)
 	btdev->le_rl_len = len;
 }
 
+/* Set the number of advertising sets, 1 to MAX_EXT_ADV_SETS */
+bool btdev_set_adv_sets(struct btdev *btdev, uint8_t num)
+{
+	if (!num || num > MAX_EXT_ADV_SETS)
+		return false;
+
+	btdev->le_adv_sets = num;
+
+	return true;
+}
+
 static void conn_unlink(struct btdev_conn *conn1, struct btdev_conn *conn2)
 {
 	conn1->link = NULL;
@@ -5350,7 +5363,7 @@ static int cmd_set_ext_adv_params(struct btdev *dev, const void *data,
 						UINT_TO_PTR(cmd->handle));
 	if (!ext_adv) {
 		/* No more than maximum number */
-		if (queue_length(dev->le_ext_adv) >= MAX_EXT_ADV_SETS) {
+		if (queue_length(dev->le_ext_adv) >= dev->le_adv_sets) {
 			rsp.status = BT_HCI_ERR_MEM_CAPACITY_EXCEEDED;
 			cmd_complete(dev, BT_HCI_CMD_LE_SET_EXT_ADV_PARAMS,
 						&rsp, sizeof(rsp));
@@ -5707,7 +5720,7 @@ static int cmd_read_num_adv_sets(struct btdev *dev, const void *data,
 	memset(&rsp, 0, sizeof(rsp));
 
 	rsp.status = BT_HCI_ERR_SUCCESS;
-	rsp.num_of_sets = MAX_EXT_ADV_SETS;
+	rsp.num_of_sets = dev->le_adv_sets;
 	cmd_complete(dev, BT_HCI_CMD_LE_READ_NUM_SUPPORTED_ADV_SETS, &rsp,
 							sizeof(rsp));
 
@@ -8420,6 +8433,7 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id)
 
 	btdev->le_al_len = AL_SIZE;
 	btdev->le_rl_len = RL_SIZE;
+	btdev->le_adv_sets = MAX_EXT_ADV_SETS;
 	return btdev;
 }
 
diff --git a/emulator/btdev.h b/emulator/btdev.h
index aa04ca6..b40df29 100644
--- a/emulator/btdev.h
+++ b/emulator/btdev.h
@@ -95,6 +95,8 @@ void btdev_set_al_len(struct btdev *btdev, uint8_t len);
 
 void btdev_set_rl_len(struct btdev *btdev, uint8_t len);
 
+bool btdev_set_adv_sets(struct btdev *btdev, uint8_t num);
+
 void btdev_set_command_handler(struct btdev *btdev, btdev_command_func handler,
 							void *user_data);
 
diff --git a/emulator/hciemu.c b/emulator/hciemu.c
index 2f544f3..eb791fa 100644
--- a/emulator/hciemu.c
+++ b/emulator/hciemu.c
@@ -701,6 +701,20 @@ void hciemu_set_central_le_rl_len(struct hciemu *hciemu, uint8_t len)
 	btdev_set_rl_len(dev, len);
 }
 
+bool hciemu_set_central_le_adv_sets(struct hciemu *hciemu, uint8_t num)
+{
+	struct btdev *dev;
+
+	if (!hciemu || !hciemu->vhci)
+		return false;
+
+	dev = vhci_get_btdev(hciemu->vhci);
+	if (!dev)
+		return false;
+
+	return btdev_set_adv_sets(dev, num);
+}
+
 const uint8_t *hciemu_get_central_adv_addr(struct hciemu *hciemu,
 								uint8_t handle)
 {
diff --git a/emulator/hciemu.h b/emulator/hciemu.h
index cdf1ebe..7299763 100644
--- a/emulator/hciemu.h
+++ b/emulator/hciemu.h
@@ -80,6 +80,8 @@ void hciemu_set_central_le_al_len(struct hciemu *hciemu, uint8_t len);
 
 void hciemu_set_central_le_rl_len(struct hciemu *hciemu, uint8_t len);
 
+bool hciemu_set_central_le_adv_sets(struct hciemu *hciemu, uint8_t num);
+
 const uint8_t *hciemu_get_central_adv_addr(struct hciemu *hciemu,
 							uint8_t handle);
 
-- 
2.47.3