Hi Michał,
On Tuesday, 25 October 2016 10:53:28 CEST Michał Narajowski wrote:
> Test shortened and short names separately. Added few missing
> expect_hci_command params. Fixed a few typos.
> ---
> tools/mgmt-tester.c | 85
> +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 79
> insertions(+), 6 deletions(-)
>
> diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
> index 271df2b..d87d800 100644
> --- a/tools/mgmt-tester.c
> +++ b/tools/mgmt-tester.c
> @@ -1904,6 +1904,11 @@ static const struct mgmt_cp_set_local_name
> set_local_name_longer_cp = { .name = {'T', 'e', 's', 't', ' ', 'n', 'a',
> 'm', 'e', '1', '2', '3'}, };
>
> +static const struct mgmt_cp_set_local_name set_local_name_long_short_cp = {
> + .name = {'T', 'e', 's', 't', ' ', 'n', 'a', 'm', 'e', '1', '2', '3'},
> + .short_name = {'T', 'e', 's', 't'},
> +};
> +
> static const struct generic_data set_local_name_test_1 = {
> .send_opcode = MGMT_OP_SET_LOCAL_NAME,
> .send_param = set_local_name_param,
> @@ -6528,10 +6533,10 @@ static const struct generic_data
> add_advertising_name_fits_in_scrsp = { .expect_hci_len =
> sizeof(set_scan_rsp_data_name_fits_in_scrsp),
> };
>
> -static const uint8_t set_scan_rsp_data_short_name_fits[] = {
> +static const uint8_t set_scan_rsp_data_shortened_name_fits[] = {
> 0x0d, /* Scan rsp data len */
> 0x0c, /* Local name data len */
> - 0x08, /* Complete name */
> + 0x08, /* Short name */
> 0x54, 0x65, 0x73, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x31,
> /* "Test name1" */
> /* padding */
> @@ -6539,7 +6544,7 @@ static const uint8_t
> set_scan_rsp_data_short_name_fits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> 0x00, 0x00, 0x00,
> };
>
> -static const struct generic_data add_advertising_short_name_in_scrsp = {
> +static const struct generic_data add_advertising_shortened_name_in_scrsp =
> { .setup_settings = settings_powered_le,
> .setup_send_opcode = MGMT_OP_SET_LOCAL_NAME,
> .setup_send_param = &set_local_name_longer_cp,
> @@ -6551,6 +6556,34 @@ static const struct generic_data
> add_advertising_short_name_in_scrsp = { .expect_param =
> advertising_instance1_param,
> .expect_len = sizeof(advertising_instance1_param),
> .expect_hci_command = BT_HCI_CMD_LE_SET_SCAN_RSP_DATA,
> + .expect_hci_param = set_scan_rsp_data_shortened_name_fits,
> + .expect_hci_len = sizeof(set_scan_rsp_data_shortened_name_fits),
> +};
> +
> +static const uint8_t set_scan_rsp_data_short_name_fits[] = {
> + 0x07, /* Scan rsp data len */
> + 0x06, /* Local name data len */
> + 0x08, /* Short name */
> + 0x54, 0x65, 0x73, 0x74,
> + /* "Test*/
> + /* padding */
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00, 0x00,
> +};
> +
> +static const struct generic_data add_advertising_short_name_in_scrsp = {
> + .setup_settings = settings_powered_le,
> + .setup_send_opcode = MGMT_OP_SET_LOCAL_NAME,
> + .setup_send_param = &set_local_name_long_short_cp,
> + .setup_send_len = sizeof(set_local_name_long_short_cp),
> + .send_opcode = MGMT_OP_ADD_ADVERTISING,
> + .send_param = add_advertising_param_name,
> + .send_len = sizeof(add_advertising_param_name),
> + .expect_status = MGMT_STATUS_SUCCESS,
> + .expect_param = advertising_instance1_param,
> + .expect_len = sizeof(advertising_instance1_param),
> + .expect_hci_command = BT_HCI_CMD_LE_SET_SCAN_RSP_DATA,
> .expect_hci_param = set_scan_rsp_data_short_name_fits,
> .expect_hci_len = sizeof(set_scan_rsp_data_short_name_fits),
> };
> @@ -6568,6 +6601,19 @@ static const uint8_t
> add_advertising_param_name_data_ok[] = { 0x00, 0x00, 0x00, 0x00, 0x00,
> 0x00, 0x00, 0x00,
> };
>
> +static const uint8_t set_scan_rsp_data_param_name_data_ok[] = {
> + 0x1e, /* Scan rsp data len */
> + /* scan rsp data */
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x0b, /* Local name data len */
> + 0x09, /* Complete name */
> + 0x54, 0x65, 0x73, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x00,
> + /* "Test name" */
> + /* padding */
> + 0x00,
> +};
> +
> static const struct generic_data add_advertising_name_data_ok = {
> .setup_settings = settings_powered_le,
> .setup_send_opcode = MGMT_OP_SET_LOCAL_NAME,
> @@ -6579,6 +6625,9 @@ static const struct generic_data
> add_advertising_name_data_ok = { .expect_status = MGMT_STATUS_SUCCESS,
> .expect_param = advertising_instance1_param,
> .expect_len = sizeof(advertising_instance1_param),
> + .expect_hci_command = BT_HCI_CMD_LE_SET_SCAN_RSP_DATA,
> + .expect_hci_param = set_scan_rsp_data_param_name_data_ok,
> + .expect_hci_len = sizeof(set_scan_rsp_data_param_name_data_ok),
> };
>
> static const uint8_t add_advertising_param_name_data_inv[] = {
> @@ -6638,6 +6687,22 @@ static const struct setup_mgmt_cmd
> add_advertising_mgmt_cmd_arr[] = { }
> };
>
> +static const uint8_t set_scan_rsp_data_name_data_appear[] = {
> + 0x1e, /* Scan rsp data len */
> + 0x03, /* appearance len */
> + 0x19, /* EIR_APPEARANCE */
> + 0x54, 0x65, /* appearance value */
> + /* scan rsp data */
> + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
> + 0x00, 0x00, 0x00, 0x00,
> + 0x0b, /* Local name data len */
> + 0x09, /* Complete name */
> + 0x54, 0x65, 0x73, 0x74, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x00,
> + /* "Test name" */
> + /* padding */
> + 0x00,
> +};
> +
> static const struct generic_data add_advertising_name_data_appear = {
> .setup_settings = settings_powered_le,
> .setup_mgmt_cmd_arr = add_advertising_mgmt_cmd_arr,
> @@ -6647,6 +6712,9 @@ static const struct generic_data
> add_advertising_name_data_appear = { .expect_status = MGMT_STATUS_SUCCESS,
> .expect_param = advertising_instance1_param,
> .expect_len = sizeof(advertising_instance1_param),
> + .expect_hci_command = BT_HCI_CMD_LE_SET_SCAN_RSP_DATA,
> + .expect_hci_param = set_scan_rsp_data_name_data_appear,
> + .expect_hci_len = sizeof(set_scan_rsp_data_name_data_appear),
> };
>
> static const struct generic_data set_appearance_not_supported = {
> @@ -7909,10 +7977,15 @@ int main(int argc, char *argv[])
> setup_command_generic,
> test_command_generic);
>
> + test_bredrle("Add Advertising - Success (Shortened name)",
> + &add_advertising_shortened_name_in_scrsp,
> + setup_command_generic,
> + test_command_generic);
> +
> test_bredrle("Add Advertising - Success (Short name)",
> - &add_advertising_short_name_in_scrsp,
> - setup_command_generic,
> - test_command_generic);
> + &add_advertising_short_name_in_scrsp,
> + setup_command_generic,
> + test_command_generic);
>
> test_bredrle("Add Advertising - Success (Name + data)",
> &add_advertising_name_data_ok,
Applied, thanks.
--
pozdrawiam
Szymon Janc
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
