@@ -2066,6 +2066,21 @@ static const struct generic_data start_discovery_valid_param_power_off_1 = {
.expect_len = sizeof(start_discovery_bredrle_param),
};
+static const char set_resolv_off_param[] = { 0x00 };
+static const char set_resolv_on_param[] = { 0x01 };
+
+static const struct generic_data start_discovery_ll_privacy_disable_resolv = {
+ .send_opcode = MGMT_OP_START_DISCOVERY,
+ .send_param = start_discovery_le_param,
+ .send_len = sizeof(start_discovery_le_param),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_param = start_discovery_le_param,
+ .expect_len = sizeof(start_discovery_le_param),
+ .expect_hci_command = BT_HCI_CMD_LE_SET_RESOLV_ENABLE,
+ .expect_hci_param = set_resolv_off_param,
+ .expect_hci_len = sizeof(set_resolv_off_param),
+};
+
static const char stop_discovery_bredrle_param[] = { 0x07 };
static const char stop_discovery_bredrle_invalid_param[] = { 0x06 };
static const char stop_discovery_valid_hci[] = { 0x00, 0x00 };
@@ -4049,7 +4064,7 @@ static const struct generic_data add_device_success_1 = {
static const uint8_t add_device_success_param_2[] = {
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc,
0x01,
- 0x00,
+ 0x02,
};
static const uint8_t add_device_rsp_le[] = {
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc,
@@ -4117,6 +4132,65 @@ static const struct generic_data add_device_success_5 = {
.expect_hci_len = sizeof(le_scan_enable),
};
+static const uint8_t le_add_to_white_list_param[] = {
+ 0x00, /* Type */
+ 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */
+};
+static const struct generic_data add_device_success_6 = {
+ .setup_settings = settings_powered_le,
+ .send_opcode = MGMT_OP_ADD_DEVICE,
+ .send_param = add_device_success_param_2,
+ .send_len = sizeof(add_device_success_param_2),
+ .expect_param = add_device_rsp_le,
+ .expect_len = sizeof(add_device_rsp_le),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_alt_ev = MGMT_EV_DEVICE_ADDED,
+ .expect_alt_ev_param = add_device_success_param_2,
+ .expect_alt_ev_len = sizeof(add_device_success_param_2),
+ .expect_hci_command = BT_HCI_CMD_LE_ADD_TO_WHITE_LIST,
+ .expect_hci_param = le_add_to_white_list_param,
+ .expect_hci_len = sizeof(le_add_to_white_list_param),
+};
+
+static const uint8_t le_add_to_resolv_list_param[] = {
+ 0x00, /* Type */
+ 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, /* Peer IRK */
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, /* Local IRK */
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+};
+
+static const struct generic_data add_device_success_7 = {
+ .send_opcode = MGMT_OP_ADD_DEVICE,
+ .send_param = add_device_success_param_2,
+ .send_len = sizeof(add_device_success_param_2),
+ .expect_param = add_device_rsp_le,
+ .expect_len = sizeof(add_device_rsp_le),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_alt_ev = MGMT_EV_DEVICE_ADDED,
+ .expect_alt_ev_param = add_device_success_param_2,
+ .expect_alt_ev_len = sizeof(add_device_success_param_2),
+ .expect_hci_command = BT_HCI_CMD_LE_ADD_TO_RESOLV_LIST,
+ .expect_hci_param = le_add_to_resolv_list_param,
+ .expect_hci_len = sizeof(le_add_to_resolv_list_param),
+};
+
+static const struct generic_data add_device_success_8 = {
+ .send_opcode = MGMT_OP_ADD_DEVICE,
+ .send_param = add_device_success_param_2,
+ .send_len = sizeof(add_device_success_param_2),
+ .expect_param = add_device_rsp_le,
+ .expect_len = sizeof(add_device_rsp_le),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_alt_ev = MGMT_EV_DEVICE_ADDED,
+ .expect_alt_ev_param = add_device_success_param_2,
+ .expect_alt_ev_len = sizeof(add_device_success_param_2),
+ .expect_hci_command = BT_HCI_CMD_LE_SET_RESOLV_ENABLE,
+ .expect_hci_param = set_resolv_on_param,
+ .expect_hci_len = sizeof(set_resolv_on_param),
+};
+
static const uint8_t remove_device_nval_1[] = {
0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc,
0xff,
@@ -4225,6 +4299,47 @@ static const struct generic_data remove_device_success_5 = {
.expect_alt_ev_len = sizeof(remove_device_param_2),
};
+static const uint8_t remove_device_param_all[7] = { 0x00 };
+
+static const struct generic_data remove_device_success_6 = {
+ .send_opcode = MGMT_OP_REMOVE_DEVICE,
+ .send_param = remove_device_param_all,
+ .send_len = sizeof(remove_device_param_all),
+ .expect_param = remove_device_param_all,
+ .expect_len = sizeof(remove_device_param_all),
+ .expect_status = MGMT_STATUS_SUCCESS,
+};
+
+static const struct generic_data remove_device_success_7 = {
+ .send_opcode = MGMT_OP_REMOVE_DEVICE,
+ .send_param = remove_device_param_2,
+ .send_len = sizeof(remove_device_param_2),
+ .expect_param = remove_device_param_2,
+ .expect_len = sizeof(remove_device_param_2),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_hci_command = BT_HCI_CMD_LE_REMOVE_FROM_WHITE_LIST,
+ .expect_hci_param = le_add_to_white_list_param,
+ .expect_hci_len = sizeof(le_add_to_white_list_param),
+ .expect_alt_ev = MGMT_EV_DEVICE_REMOVED,
+ .expect_alt_ev_param = remove_device_param_2,
+ .expect_alt_ev_len = sizeof(remove_device_param_2),
+};
+
+static const struct generic_data remove_device_success_8 = {
+ .send_opcode = MGMT_OP_REMOVE_DEVICE,
+ .send_param = remove_device_param_2,
+ .send_len = sizeof(remove_device_param_2),
+ .expect_param = remove_device_param_2,
+ .expect_len = sizeof(remove_device_param_2),
+ .expect_status = MGMT_STATUS_SUCCESS,
+ .expect_hci_command = BT_HCI_CMD_LE_REMOVE_FROM_RESOLV_LIST,
+ .expect_hci_param = le_add_to_white_list_param,
+ .expect_hci_len = sizeof(le_add_to_white_list_param),
+ .expect_alt_ev = MGMT_EV_DEVICE_REMOVED,
+ .expect_alt_ev_param = remove_device_param_2,
+ .expect_alt_ev_len = sizeof(remove_device_param_2),
+};
+
static const struct generic_data read_adv_features_invalid_param_test = {
.send_opcode = MGMT_OP_READ_ADV_FEATURES,
.send_param = dummy_data,
@@ -6870,7 +6985,7 @@ static void command_setup_hci_callback(uint16_t opcode, const void *param,
return;
if (length != setup_expect_hci_len) {
- tester_warn("Invalid parameter size for HCI command");
+ tester_warn("Invalid parameter size for HCI command (%d)", length);
tester_test_failed();
return;
}
@@ -6903,7 +7018,7 @@ static void command_hci_callback(uint16_t opcode, const void *param,
expect_hci_param = test->expect_hci_func(&expect_hci_len);
if (length != expect_hci_len) {
- tester_warn("Invalid parameter size for HCI command");
+ tester_warn("Invalid parameter size for HCI command (%d)", length);
tester_test_failed();
return;
}
@@ -9218,6 +9333,201 @@ static const struct generic_data set_exp_feat_unknown = {
.expect_status = MGMT_STATUS_NOT_SUPPORTED,
};
+static const char load_irks_params[] = { 0x01, 0x00,
+ 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, 0x01,
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88,
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88 };
+
+
+static void setup_load_irks_callback(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+{
+ if (status != MGMT_STATUS_SUCCESS) {
+ tester_setup_failed();
+ return;
+ }
+
+ tester_print("Load IRK completed");
+}
+
+static void setup_exp_feat_callback(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+{
+ if (status != MGMT_STATUS_SUCCESS) {
+ tester_setup_failed();
+ return;
+ }
+
+ tester_print("LL Privacy Exp feature is enabled");
+}
+
+static void setup_ll_privacy(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+ unsigned char param[] = { 0x01 };
+ const uint8_t *ext_feat_param;
+ size_t ext_feat_len;
+ const char *irk_param;
+ size_t irk_len;
+ unsigned char privacy_param[] = { 0x01,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
+
+ tester_print("Enabling LL Privacy feature");
+
+ ext_feat_param = set_exp_feat_param_ll_privacy;
+ ext_feat_len = sizeof(set_exp_feat_param_ll_privacy);
+
+ irk_param = load_irks_params;
+ irk_len = sizeof(load_irks_params);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_LE, data->mgmt_index,
+ sizeof(param), ¶m,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_PRIVACY, data->mgmt_index,
+ sizeof(privacy_param), privacy_param,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_LOAD_IRKS, data->mgmt_index,
+ irk_len, irk_param,
+ setup_load_irks_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE , data->mgmt_index,
+ ext_feat_len, ext_feat_param,
+ setup_exp_feat_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index,
+ sizeof(param), param,
+ setup_powered_callback, NULL, NULL);
+
+}
+
+static void setup_add_device_callback(uint8_t status, uint16_t length,
+ const void *param, void *user_data)
+{
+ if (status != MGMT_STATUS_SUCCESS) {
+ tester_setup_failed();
+ return;
+ }
+
+ tester_print("New Device is Added");
+}
+
+static void setup_ll_privacy_device(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+ unsigned char param[] = { 0x01 };
+ const uint8_t *ext_feat_param;
+ size_t ext_feat_len;
+ const char *irk_param;
+ size_t irk_len;
+ const uint8_t *dev_param;
+ size_t dev_len;
+ unsigned char privacy_param[] = { 0x01,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
+
+ tester_print("Enabling LL Privacy feature");
+
+ ext_feat_param = set_exp_feat_param_ll_privacy;
+ ext_feat_len = sizeof(set_exp_feat_param_ll_privacy);
+
+ irk_param = load_irks_params;
+ irk_len = sizeof(load_irks_params);
+
+ dev_param = add_device_success_param_2;
+ dev_len = sizeof(add_device_success_param_2);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_LE, data->mgmt_index,
+ sizeof(param), ¶m,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_PRIVACY, data->mgmt_index,
+ sizeof(privacy_param), privacy_param,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_LOAD_IRKS, data->mgmt_index,
+ irk_len, irk_param,
+ setup_load_irks_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE , data->mgmt_index,
+ ext_feat_len, ext_feat_param,
+ setup_exp_feat_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_ADD_DEVICE, data->mgmt_index,
+ dev_len, dev_param,
+ setup_add_device_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index,
+ sizeof(param), param,
+ setup_powered_callback, NULL, NULL);
+}
+
+static const uint8_t add_device_success_param_4[] = {
+ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66,
+ 0x01,
+ 0x02,
+};
+
+/* Enable LL Privacy and Add 2 devices */
+static void setup_ll_privacy_device2(const void *test_data)
+{
+ struct test_data *data = tester_get_data();
+ unsigned char param[] = { 0x01 };
+ const uint8_t *ext_feat_param;
+ size_t ext_feat_len;
+ const char *irk_param;
+ size_t irk_len;
+ const uint8_t *dev_param, *dev2_param;
+ size_t dev_len, dev2_len;
+ unsigned char privacy_param[] = { 0x01,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
+ 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08 };
+
+ tester_print("Enabling LL Privacy feature");
+
+ ext_feat_param = set_exp_feat_param_ll_privacy;
+ ext_feat_len = sizeof(set_exp_feat_param_ll_privacy);
+
+ irk_param = load_irks_params;
+ irk_len = sizeof(load_irks_params);
+
+ dev_param = add_device_success_param_2;
+ dev_len = sizeof(add_device_success_param_2);
+
+ dev2_param = add_device_success_param_4;
+ dev2_len = sizeof(add_device_success_param_4);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_LE, data->mgmt_index,
+ sizeof(param), ¶m,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_PRIVACY, data->mgmt_index,
+ sizeof(privacy_param), privacy_param,
+ NULL, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_LOAD_IRKS, data->mgmt_index,
+ irk_len, irk_param,
+ setup_load_irks_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_EXP_FEATURE , data->mgmt_index,
+ ext_feat_len, ext_feat_param,
+ setup_exp_feat_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_ADD_DEVICE, data->mgmt_index,
+ dev_len, dev_param,
+ setup_add_device_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_ADD_DEVICE, data->mgmt_index,
+ dev2_len, dev2_param,
+ setup_add_device_callback, NULL, NULL);
+
+ mgmt_send(data->mgmt, MGMT_OP_SET_POWERED, data->mgmt_index,
+ sizeof(param), param,
+ setup_powered_callback, NULL, NULL);
+}
+
static bool power_off(uint16_t index)
{
int sk, err;
@@ -10090,6 +10400,13 @@ int main(int argc, char *argv[])
test_bredrle("Start Discovery - Power Off 1",
&start_discovery_valid_param_power_off_1,
NULL, test_command_generic);
+ /* MGMT_OP_START_DISCOVERY
+ * Check if the resolving list is disabled before the scan parameter is
+ * changed.
+ */
+ test_bredrle50("Start Discovery - Disable Resolve List",
+ &start_discovery_ll_privacy_disable_resolv,
+ setup_ll_privacy_device, test_command_generic);
test_bredrle("Stop Discovery - Success 1",
&stop_discovery_success_test_1,
@@ -10489,6 +10806,26 @@ int main(int argc, char *argv[])
test_bredrle("Add Device - Success 5",
&add_device_success_5,
NULL, test_command_generic);
+ /* MGMT_OP_ADD_DEVICE
+ * Add device and check the device is added to the whitelist
+ */
+ test_bredrle50("Add Device - Success 6 - Add to whitelist",
+ &add_device_success_6,
+ NULL, test_command_generic);
+ /* MGMT_OP_ADD_DEVICE
+ * Add device and check the device is added to the resolve list
+ * when the LL Privacy is enabled
+ */
+ test_bredrle50("Add Device - Success 7 - Add to resolv list",
+ &add_device_success_7,
+ setup_ll_privacy, test_command_generic);
+ /* MGMT_OP_ADD_DEVICE
+ * Add device and check the Resolving List is enabled for the device
+ * when the LL Privacy is enabled
+ */
+ test_bredrle50("Add Device - Success 8 - Enable resolv list",
+ &add_device_success_8,
+ setup_ll_privacy, test_command_generic);
test_bredrle("Remove Device - Invalid Params 1",
&remove_device_fail_1,
@@ -10514,6 +10851,23 @@ int main(int argc, char *argv[])
test_le("Remove Device - Success 5",
&remove_device_success_5,
setup_add_device, test_remove_device);
+ test_le("Remove Device - Success 6 - All Devices",
+ &remove_device_success_6,
+ setup_add_device, test_remove_device);
+ /* MGMT_OP_REMOVE_DEVICE
+ * Remove the device and check the device is removed from the whilte
+ * list as well.
+ */
+ test_bredrle50("Remove Device - Success 7 - Remove from whitelist",
+ &remove_device_success_7,
+ setup_ll_privacy_device2, test_command_generic);
+ /* MGMT_OP_REMOVE_DEVICE
+ * Remove the device and check the device is removed from the resolving
+ * list as well when the LL Privacy is enabled.
+ */
+ test_bredrle50("Remove Device - Success 8 - Remove from resolv list",
+ &remove_device_success_8,
+ setup_ll_privacy_device2, test_command_generic);
test_bredrle("Read Advertising Features - Invalid parameters",
&read_adv_features_invalid_param_test,
From: Tedd Ho-Jeong An <tedd.an@intel.com> This patch adds test cases for checking the whitelist and resolving list HCI commands when the LL Privacy feature is enabled. --- tools/mgmt-tester.c | 360 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 357 insertions(+), 3 deletions(-)