emulator: Add support to config the white and resolve list
PATCH v8 1/2 emulator: Add support to config the white and resolve list
From: Tedd Ho-Jeong An <[email protected]>
This patch adds interfaces to config the white list and resolve list in the btdev.
--- emulator/btdev.c | 41 +++++++++++++++++++++++++++++++---------- emulator/btdev.h | 4 ++++ emulator/hciemu.c | 16 ++++++++++++++++ emulator/hciemu.h | 4 ++++ 4 files changed, 55 insertions(+), 10 deletions(-)
emulator/btdev.c +31 -10
@@ -33,8 +33,8 @@#include "monitor/bt.h" #include "btdev.h" -#define WL_SIZE 16 -#define RL_SIZE 16 +#define WL_SIZE 3 +#define RL_SIZE 4#define CIS_SIZE 3#define has_bredr (btdev) (!((btdev)->features[4] & 0x20))
@@ -190,6 +190,10 @@ struct btdev { } __attribute__ ((packed)) le_cig;uint8_t le_iso_path[2 ]; +/* Real time length of WL array */ +uint8_t le_wl_len; +/* Real time length of RL array */ +uint8_t le_rl_len;struct btdev_wl le_wl[WL_SIZE ];struct btdev_rl le_rl[RL_SIZE ];uint8_t le_rl_enable;
@@ -456,6 +460,18 @@ static void rl_clear(struct btdev *dev)rl_reset (&dev->le_rl[i]); } +/* Set the real time length of WL array */ +void btdev_set_wl_len (struct btdev *btdev,uint8_t len) +{ + btdev->le_wl_len = len; +} + +/* Set the real time length of RL array */ +void btdev_set_rl_len (struct btdev *btdev,uint8_t len) +{ + btdev->le_rl_len = len; +} +static void btdev_reset (struct btdev *btdev) {/* FIXME: include here clearing of all states that should be
@@ -467,6 +483,9 @@ static void btdev_reset(struct btdev *btdev)wl_clear (btdev);rl_clear (btdev); + + btdev->le_wl_len =WL_SIZE ; + btdev->le_rl_len =RL_SIZE ; }static int cmd_reset (struct btdev *dev,const void *data,uint8_t len)
@@ -3495,7 +3514,7 @@ static int cmd_read_wl_size(struct btdev *dev, const void *data, uint8_t len)struct bt_hci_rsp_le_read_white_list_size rsp; rsp.status =BT_HCI_ERR_SUCCESS ; - rsp.size =WL_SIZE ; + rsp.size = dev->le_wl_len;cmd_complete (dev,BT_HCI_CMD_LE_READ_WHITE_LIST_SIZE , &rsp,sizeof (rsp));
@@ -3582,7 +3601,7 @@ static int cmd_add_wl(struct btdev *dev, const void *data, uint8_t len)if (cmd->addr_type >0x01 )return -EINVAL ; -for (i =0 ; i <WL_SIZE ; i++) { +for (i =0 ; i < dev->le_wl_len; i++) {struct btdev_wl *wl = &dev->le_wl[i];if (WL_ADDR_EQUAL (wl, cmd->addr_type, &cmd->addr)) {
@@ -3633,7 +3652,7 @@ static int cmd_remove_wl(struct btdev *dev, const void *data, uint8_t len)if (cmd->addr_type >0x01 )return -EINVAL ; -for (i =0 ; i <WL_SIZE ; i++) { +for (i =0 ; i < dev->le_wl_len; i++) {struct btdev_wl *wl = &dev->le_wl[i];ba2str (&wl->addr, addr);
@@ -3648,7 +3667,7 @@ static int cmd_remove_wl(struct btdev *dev, const void *data, uint8_t len) } } -if (i ==WL_SIZE ) +if (i == dev->le_wl_len)return -EINVAL ; status =BT_HCI_ERR_SUCCESS ;
@@ -3679,7 +3698,7 @@ static int cmd_add_rl(struct btdev *dev, const void *data, uint8_t len)if (cmd->addr_type >0x01 )return -EINVAL ; -for (i =0 ; i <RL_SIZE ; i++) { +for (i =0 ; i < dev->le_rl_len; i++) {struct btdev_rl *rl = &dev->le_rl[i];if (RL_ADDR_EQUAL (rl, cmd->addr_type, &cmd->addr)) {
@@ -3730,7 +3749,7 @@ static int cmd_remove_rl(struct btdev *dev, const void *data, uint8_t len)if (cmd->addr_type >0x01 )return -EINVAL ; -for (i =0 ; i <RL_SIZE ; i++) { +for (i =0 ; i < dev->le_rl_len; i++) {struct btdev_rl *rl = &dev->le_rl[i];if (RL_ADDR_EQUAL (rl, cmd->addr_type, &cmd->addr)) {
@@ -3739,7 +3758,7 @@ static int cmd_remove_rl(struct btdev *dev, const void *data, uint8_t len) } } -if (i ==RL_SIZE ) +if (i == dev->le_rl_len)return -EINVAL ; status =BT_HCI_ERR_SUCCESS ;
@@ -3777,7 +3796,7 @@ static int cmd_read_rl_size(struct btdev *dev, const void *data, uint8_t len)struct bt_hci_rsp_le_read_resolv_list_size rsp; rsp.status =BT_HCI_ERR_SUCCESS ; - rsp.size =RL_SIZE ; + rsp.size = dev->le_rl_len;cmd_complete (dev,BT_HCI_CMD_LE_READ_RESOLV_LIST_SIZE , &rsp,sizeof (rsp));
@@ -6166,6 +6185,8 @@ struct btdev *btdev_create(enum btdev_type type, uint16_t id) btdev->conns =queue_new (); btdev->le_ext_adv =queue_new (); + btdev->le_wl_len =WL_SIZE ; + btdev->le_rl_len =RL_SIZE ;return btdev; }
emulator/btdev.h +4 -0
@@ -80,6 +80,10 @@ uint8_t btdev_get_le_scan_enable(struct btdev *btdev);void btdev_set_le_states (struct btdev *btdev,const uint8_t *le_states); +void btdev_set_wl_len (struct btdev *btdev,uint8_t len); + +void btdev_set_rl_len (struct btdev *btdev,uint8_t len); +void btdev_set_command_handler (struct btdev *btdev,btdev_command_func handler,void *user_data);
emulator/hciemu.c +16 -0
@@ -580,6 +580,22 @@ void hciemu_set_master_le_states(struct hciemu *hciemu, const uint8_t *le_statesbtdev_set_le_states (hciemu->dev, le_states); } +void hciemu_set_master_le_wl_len (struct hciemu *hciemu,uint8_t len) +{ +if (!hciemu || !hciemu->dev) +return ; + +btdev_set_wl_len (hciemu->dev, len); +} + +void hciemu_set_master_le_rl_len (struct hciemu *hciemu,uint8_t len) +{ +if (!hciemu || !hciemu->dev) +return ; + +btdev_set_rl_len (hciemu->dev, len); +} +bool hciemu_add_master_post_command_hook (struct hciemu *hciemu,hciemu_command_func_t function,void *user_data) {
emulator/hciemu.h +4 -0
@@ -60,6 +60,10 @@ uint8_t hciemu_get_master_le_scan_enable(struct hciemu *hciemu);void hciemu_set_master_le_states (struct hciemu *hciemu,const uint8_t *le_states); +void hciemu_set_master_le_wl_len (struct hciemu *hciemu,uint8_t len); + +void hciemu_set_master_le_rl_len (struct hciemu *hciemu,uint8_t len); +typedef void (*hciemu_command_func_t )(uint16_t opcode,const void *data,uint8_t len,void *user_data);
Signature · 1 line
2.26.3
PATCH v8 2/2 tools/mgmt-tester: Add LL Privacy test cases
From: Tedd Ho-Jeong An <[email protected]>
This patch adds LL Privacy related test cases.
Multi Ext Advertising - Success 3 (Add 2 Advs) Multi Ext Advertising - Success 4 (Remove Adv) Multi Ext Advertising - Success 5 (Remove all) Multi Ext Advertising - Success 6 (Add w/o power on) Multi Ext Advertising - Fail (Add MAX)
LL Privacy - Add Device 1 (Add to WL)
LL Privacy - Add Device 2 (Add to RL)
LL Privacy - Add Device 3 (Enable RL)
LL Privacy - Add Device 4 (2 Devices to WL) LL Privacy - Add Device 5 (2 Devices to RL) LL Privacy - Add Device 6 (RL is full)
LL Privacy - Add Device 7 (WL is full)
LL Privacy - Add Device 8 (Disable Adv)
LL Privacy - Add Device 9 (Multi Adv)
LL Privacy - Add Device 10 (Multi Dev and Multi Adv)
LL Privacy - Remove Device 1 (Remove from WL) LL Privacy - Remove Device 2 (Remove from RL) LL Privacy - Remove Device 3 (Disable RL) LL Privacy - Remove Device 4 (Disable Adv) LL Privacy - Remove Device 5 (Multi Adv)
LL Privacy - Start Discovery 1 (Disable RL) LL Privacy - Start Discovery 2 (Disable RL)
--- emulator/btdev.c | 2 +- tools/mgmt-tester.c | 1668 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 1380 insertions(+), 290 deletions(-)
emulator/btdev.c +1 -1
@@ -4760,7 +4760,7 @@ static int cmd_remove_adv_set(struct btdev *dev, const void *data, UINT_TO_PTR(cmd->handle));if (!ext_adv) { status =BT_HCI_ERR_UNKNOWN_ADVERTISING_ID ; -cmd_complete (dev,BT_HCI_CMD_LE_SET_EXT_ADV_DATA , &status, +cmd_complete (dev,BT_HCI_CMD_LE_REMOVE_ADV_SET , &status,sizeof (status));return 0 ; }
tools/mgmt-tester.c +1379 -289
1,846 lines not on this page · raw message
Signature · 1 line
2.26.3
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=517985
---Test result---
Test Summary:
CheckPatch PASS 1.75 seconds GitLint PASS 0.24 seconds Prep - Setup ELL PASS 46.43 seconds Build - Prep PASS 0.10 seconds Build - Configure PASS 8.23 seconds Build - Make PASS 202.22 seconds Make Check PASS 9.28 seconds Make Distcheck PASS 240.82 seconds Build w/ext ELL - Configure PASS 8.37 seconds Build w/ext ELL - Make PASS 192.48 seconds
Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree
##############################
Test: Make Check - PASS
Desc: Run 'make check'
##############################
Test: Make Distcheck - PASS
Desc: Run distcheck to check the distribution
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration
---
Regards,
Linux Bluetooth