From patchwork Tue Jun 1 20:49:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 451497 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30090C4708F for ; Tue, 1 Jun 2021 20:49:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1536E61360 for ; Tue, 1 Jun 2021 20:49:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234827AbhFAUvE (ORCPT ); Tue, 1 Jun 2021 16:51:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234698AbhFAUvD (ORCPT ); Tue, 1 Jun 2021 16:51:03 -0400 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3F5BC06174A for ; Tue, 1 Jun 2021 13:49:21 -0700 (PDT) Received: by mail-pj1-x102f.google.com with SMTP id o17-20020a17090a9f91b029015cef5b3c50so2149610pjp.4 for ; Tue, 01 Jun 2021 13:49:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=1EWCPV4DBX0R9NeNAi6mS30JMox8jCDnYHn9+qJ9crE=; b=kijAzY5pngM3GFhLby4316+hdRQIi5WdR0kujvvmkTi8uZc6Pfp8EObKLqoiJm3mEZ k/TmFO2UJW+Q2w5Fzqz3QMDxonn4hliEau3mX4hAi0ozwdYygG6HA+r7MAhUj7JrXkGr 2QyAIQTA1Vv1Dt6zRRF0Qqt0isZ8B9189Ql4Q6juRC4p0l8g8kt3HpFox2ptAsSXUlqo sOOAy3sNQ6JsaMYWiI1SJ33vRjTvjZJ8EIcHsG2Vbn4b0vXvgLn/R26KqzBbw4dTgwSG QSf+MT+g9GXe9/U93BdcIoh1ZXhuE7L7JdMZWNtr1pVs5K0HIJ55GRlDyUU6uwZiQ4ZZ TSLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1EWCPV4DBX0R9NeNAi6mS30JMox8jCDnYHn9+qJ9crE=; b=ATF+cvqJimdb2p4WUnJRITz40mflXvQuIgpzU7XrMJfNFGR5zlAxLhS3dFOrRycHUc VzYPVel2VfAe7Pr/zZIrDtrrdcJ31vApacjT56xZl0RUlg/zYy5NdLrRca66DJm0/6hY 3TD3kViyBYoS7nLWY4iukZ1jP3yWbaKYMb7Y51F2He3SWA92/Cts8CQr3a/sRfo48Hk8 e8GhmXyAxHv8ID0I3ATztltq0HvzILFulibDeuiLS4AK1wtNzWyzF9l3v5h0RMbE0tvg ePCHS6xDANevRft8p1P9J+8umMIsRWndzuDu7rxTT66LkeBaInmYnY1K3ZPjjeuz+TBZ m4Sw== X-Gm-Message-State: AOAM5318X/C3KMPQQATFDNgHh/0WE/QkGbL3GUq/+3d3QWobCpaQrONt SmKOSdlsCjbGBXGf3hoBOMbGQ2RYplI= X-Google-Smtp-Source: ABdhPJzCE6vrtJkkHu88SrKigSqGTFRsJurSSt5JA6zKs1H4s7aPkh5z0MQxMnXREGnvUd944D3V0g== X-Received: by 2002:a17:90b:4d11:: with SMTP id mw17mr1741713pjb.229.1622580561300; Tue, 01 Jun 2021 13:49:21 -0700 (PDT) Received: from han1-mobl3.intel.com ([2601:1c0:6a01:d830::512a]) by smtp.gmail.com with ESMTPSA id t20sm11435396pjs.11.2021.06.01.13.49.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 13:49:21 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH V2 2/3] tools/mgmt-tester: Add tests for experimental feature command Date: Tue, 1 Jun 2021 13:49:17 -0700 Message-Id: <20210601204918.903327-2-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210601204918.903327-1-hj.tedd.an@gmail.com> References: <20210601204918.903327-1-hj.tedd.an@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An This patch adds test cases for Read/Set Experimenal Feature commands. --- tools/mgmt-tester.c | 137 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 4550d6e9c..c0faf6efc 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -9124,6 +9124,100 @@ static const struct generic_data set_dev_flags_fail_3 = { .expect_len = sizeof(set_dev_flags_rsp_param_fail_3), }; +static const uint8_t read_exp_feat_param_success[] = { + 0x02, 0x00, /* Feature Count */ + 0xd6, 0x49, 0xb0, 0xd1, 0x28, 0xeb, /* UUID - Simultaneous */ + 0x27, 0x92, 0x96, 0x46, 0xc0, 0x42, /* Central Peripheral */ + 0xb5, 0x10, 0x1b, 0x67, + 0x00, 0x00, 0x00, 0x00, /* Flags */ + 0x04, 0x00, 0x13, 0xac, 0x42, 0x02, /* UUID - LL Privacy */ + 0xde, 0xb3, 0xea, 0x11, 0x73, 0xc2, + 0x48, 0xa1, 0xc0, 0x15, + 0x02, 0x00, 0x00, 0x00, /* Flags */ +}; + +static const struct generic_data read_exp_feat_success = { + .send_opcode = MGMT_OP_READ_EXP_FEATURES_INFO, + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = read_exp_feat_param_success, + .expect_len = sizeof(read_exp_feat_param_success), +}; + +static uint16_t settings_powered_le_privacy[] = { MGMT_OP_SET_LE, + MGMT_OP_SET_PRIVACY, + MGMT_OP_SET_POWERED, 0 }; + +static const uint8_t set_exp_feat_param_ll_privacy[] = { + 0x04, 0x00, 0x13, 0xac, 0x42, 0x02, /* UUID - LL Privacy */ + 0xde, 0xb3, 0xea, 0x11, 0x73, 0xc2, + 0x48, 0xa1, 0xc0, 0x15, + 0x01, /* Action - enable */ +}; + +static const uint8_t set_exp_feat_rsp_param_ll_privacy[] = { + 0x04, 0x00, 0x13, 0xac, 0x42, 0x02, /* UUID - LL Privacy */ + 0xde, 0xb3, 0xea, 0x11, 0x73, 0xc2, + 0x48, 0xa1, 0xc0, 0x15, + 0x03, 0x00, 0x00, 0x00, /* Action - enable */ +}; + +static const struct generic_data set_exp_feat_enable_ll_privacy = { + .send_opcode = MGMT_OP_SET_EXP_FEATURE, + .send_param = set_exp_feat_param_ll_privacy, + .send_len = sizeof(set_exp_feat_param_ll_privacy), + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = set_exp_feat_rsp_param_ll_privacy, + .expect_len = sizeof(set_exp_feat_rsp_param_ll_privacy), +}; + +static const uint8_t set_exp_feat_param_disable[17] = { 0x00 }; +static const uint8_t set_exp_feat_rsp_param_disable[20] = { 0x00 }; + +static const struct generic_data set_exp_feat_disable = { + .send_opcode = MGMT_OP_SET_EXP_FEATURE, + .send_param = set_exp_feat_param_disable, + .send_len = sizeof(set_exp_feat_param_disable), + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = set_exp_feat_rsp_param_disable, + .expect_len = sizeof(set_exp_feat_rsp_param_disable), +}; + +static const struct generic_data set_exp_feat_rejected = { + .setup_settings = settings_powered_le_privacy, + .send_opcode = MGMT_OP_SET_EXP_FEATURE, + .send_param = set_exp_feat_param_ll_privacy, + .send_len = sizeof(set_exp_feat_param_ll_privacy), + .expect_status = MGMT_STATUS_REJECTED, +}; + +static const uint8_t set_exp_feat_param_invalid[] = { + 0x04, 0x00, 0x13, 0xac, 0x42, 0x02, /* UUID - LL Privacy */ + 0xde, 0xb3, 0xea, 0x11, 0x73, 0xc2, + 0x48, 0xa1, 0xc0, 0x15, + 0xff, /* Action - invalid */ +}; + +static const struct generic_data set_exp_feat_invalid = { + .send_opcode = MGMT_OP_SET_EXP_FEATURE, + .send_param = set_exp_feat_param_invalid, + .send_len = sizeof(set_exp_feat_param_invalid), + .expect_status = MGMT_STATUS_INVALID_PARAMS, +}; + +static const uint8_t set_exp_feat_param_unknown[] = { + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* UUID - Unknown */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, + 0x01, /* Action - enable */ +}; + +static const struct generic_data set_exp_feat_unknown = { + .send_opcode = MGMT_OP_SET_EXP_FEATURE, + .send_param = set_exp_feat_param_unknown, + .send_len = sizeof(set_exp_feat_param_unknown), + .expect_status = MGMT_STATUS_NOT_SUPPORTED, +}; + static bool power_off(uint16_t index) { int sk, err; @@ -11192,5 +11286,48 @@ int main(int argc, char *argv[]) setup_get_dev_flags, test_command_generic); + /* MGMT_OP_READ_EXP_FEATURE + * Read Experimental features - success + */ + test_bredrle50("Read Exp Feature - Success", + &read_exp_feat_success, + NULL, test_command_generic); + /* MGMT_OP_SET_EXP_FEATURE + * Enable LL Privacy + */ + test_bredrle50("Set Exp Feature - Enable LL Privacy", + &set_exp_feat_enable_ll_privacy, + NULL, test_command_generic); + + /* MGMT_OP_SET_EXP_FEATURE + * Disable all features by sending zero UUID + */ + test_bredrle50("Set Exp Feature - Disable all", + &set_exp_feat_disable, + NULL, test_command_generic); + + /* MGMT_OP_SET_EXP_FEATURE + * Rejected - If the power is on, the command should be rejected + */ + test_bredrle50("Set Exp Feature - Rejected", + &set_exp_feat_rejected, + NULL, test_command_generic); + + /* MGMT_OP_SET_EXP_FEATURE + * Invalid parameter + */ + test_bredrle50("Set Exp Feature - Invalid params", + &set_exp_feat_invalid, + NULL, test_command_generic); + + + /* MGMT_OP_SET_EXP_FEATURE + * Not Supported UUID + */ + test_bredrle50("Set Exp Feature - Unknown feature", + &set_exp_feat_unknown, + NULL, test_command_generic); + + return tester_run(); } From patchwork Tue Jun 1 20:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tedd Ho-Jeong An X-Patchwork-Id: 451496 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 432C7C47093 for ; Tue, 1 Jun 2021 20:49:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A8AA613C0 for ; Tue, 1 Jun 2021 20:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234888AbhFAUvF (ORCPT ); Tue, 1 Jun 2021 16:51:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55956 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234756AbhFAUvE (ORCPT ); Tue, 1 Jun 2021 16:51:04 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E68D1C061574 for ; Tue, 1 Jun 2021 13:49:22 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id ei4so387684pjb.3 for ; Tue, 01 Jun 2021 13:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vG3vlKmnr85VS2IKa47yr3CjfMXuxaqTsrb/TU8AJDM=; b=GWV85gIT5cifb8n/ddRKI2R0a40hqDYEL9MuLPHLFF7oR8BUHhptaaTYqWgcOxo1FC 5L72LfiImX85f4ujuTwkblabgs/A1DSzKua8gKrqcCgUJYLRSHh0WOk2nIQKZDecvKqe MgWIIjnXCCGLXH7nZQP5z138XcX3/KHT0NsKQ9ojIZCRZKlooTN0T3cf49xXS0RZtlP4 wG2rkPkn9RGz+pS2zHcMTR/OlmhUdVVw3IAruZx40jubrCVXyxfISCZdM/yvsfsCDSNo rFdszuHDwBsWc6/93MaYAl2deyET7qF2rAcuztzTR8XcX9iheRl+uEgW+Cx5xJsoCTjX FmXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vG3vlKmnr85VS2IKa47yr3CjfMXuxaqTsrb/TU8AJDM=; b=LWJrjzUvOw2hLBhaFUllT+KCjhdsNb5xL0Mn2mkSlM+xwPzqd/1zT7AGhQqhxYyuSZ ErOLPFGdoZm2xSlW6UhC95/OYLMgQJ1YfgBx9EbTMa89yK/XFJ6uXKR4VxJzfzJiUFzz w9fuvPDRXi6mkRG0ZDv4M5+Q/CWZDO/ja0lyzJlKesz5h36ERYgRsVz7SwfS+YYawRR/ D16CMqLk8PadfwommR8ECmCgO/c8Rw5Uia9F3NEorZR4pA9JdRDFDhR1qZdGOZ5xA49M zhrZYD/n6j9uk88CaC9UANJ+BMxGYmXhevS0u32X7DYgVVwyihwGk+bbzCqsAWTCLZsC aeQw== X-Gm-Message-State: AOAM5310h0cpwvRdiPiPgu0sxX7DnGBG1wM9GvZ+MI6hMDR8u+Vkf/2O 1hNTeVBhCmrtW+MMyaJxpbXEkiFEhV0= X-Google-Smtp-Source: ABdhPJzXajz8vj4UfsUYeR0fUGeU+bNoBZThHOSO1HGFAFZvHgnM4N7DI9Zssd7sNYcH+Sy7RUETfg== X-Received: by 2002:a17:90b:f98:: with SMTP id ft24mr1745575pjb.184.1622580562245; Tue, 01 Jun 2021 13:49:22 -0700 (PDT) Received: from han1-mobl3.intel.com ([2601:1c0:6a01:d830::512a]) by smtp.gmail.com with ESMTPSA id t20sm11435396pjs.11.2021.06.01.13.49.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 13:49:21 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH V2 3/3] tools/mgmt-tester: Add tests for whitelist and resolving list Date: Tue, 1 Jun 2021 13:49:18 -0700 Message-Id: <20210601204918.903327-3-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210601204918.903327-1-hj.tedd.an@gmail.com> References: <20210601204918.903327-1-hj.tedd.an@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An 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 | 363 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 363 insertions(+) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index c0faf6efc..02525c905 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -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 }; @@ -4117,6 +4132,71 @@ static const struct generic_data add_device_success_5 = { .expect_hci_len = sizeof(le_scan_enable), }; +static const uint8_t add_device_success_param_6[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, + 0x01, + 0x02, +}; + +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_6, + .send_len = sizeof(add_device_success_param_6), + .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_6, + .expect_alt_ev_len = sizeof(add_device_success_param_6), + .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_6, + .send_len = sizeof(add_device_success_param_6), + .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_6, + .expect_alt_ev_len = sizeof(add_device_success_param_6), + .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_6, + .send_len = sizeof(add_device_success_param_6), + .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_6, + .expect_alt_ev_len = sizeof(add_device_success_param_6), + .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 +4305,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, @@ -9218,6 +9339,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_6; + dev_len = sizeof(add_device_success_param_6); + + 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_6; + dev_len = sizeof(add_device_success_param_6); + + 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 +10406,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 +10812,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 +10857,26 @@ int main(int argc, char *argv[]) test_le("Remove Device - Success 5", &remove_device_success_5, setup_add_device, test_remove_device); + /* MGMT_OP_REMOVE_DEVICE + * Remove all devices + */ + test_bredrle50("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,