From patchwork Wed May 26 00:20:21 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: 12280375 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 0C115C47087 for ; Wed, 26 May 2021 00:20:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C4791613D6 for ; Wed, 26 May 2021 00:20:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232307AbhEZAV6 (ORCPT ); Tue, 25 May 2021 20:21:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229595AbhEZAV5 (ORCPT ); Tue, 25 May 2021 20:21:57 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D2EAC061574 for ; Tue, 25 May 2021 17:20:26 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id ne24-20020a17090b3758b029015f2dafecb0so12968706pjb.4 for ; Tue, 25 May 2021 17:20:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=S5qSqx3TwuZ8VsmUQSyplqhBBlTtHbqLkNIGiOXodxw=; b=D6JtIY3HzFs1Ylz7k7P5V0Y6pFaLQmooMjp1YgNl2t84SRhv0mgB66yD9FmevIuYBb YJhzUiLvE2RKVsWYIVLDrLRhIrEvIJxbXcbFvhfQ3ThBJO/FRrHzcQsUoqmQUdYRwE1Q V37ztJbpL5gSh9yYTQu/Ubb6tiUhxUQRmnqyb5zIEXl97VvqzmR6bFHDBU9+RjlnN5Nc viDcGv98hLBcJOTZpxTxTzky62++YZvptijH/52AOGagkhso1o0jcnfV/bBFEJ6IPLMk 4EnNF+OWT4FCKOg/SHjKnufrsZX2GBxpLck02CjDEkECOy7NpHKtYnt4jzRrkvWxwVzx uK9A== 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:mime-version :content-transfer-encoding; bh=S5qSqx3TwuZ8VsmUQSyplqhBBlTtHbqLkNIGiOXodxw=; b=q8D/1nRknD8NoGFvZ3AfbKZQj2/kcjff7P2LdgMtt31+ypWnouhFwF1T/TW/V+t5MK 1Hnse49c98UA93ybt84yCAYUHbBOm4WdHdFnH3kuAfINww9y39kW55AoswigZqf2I50Q 3MVtelFDq+1ix25EcAH6EPOwTeFGTVg8LjAq3KmcbPHE01TedXi4O7YMM40+zJRLkmkh 4yZAu23xMbN3mg5PKICeWt2tYyzg+mPJvN66uK7fJBoTcM7W2c8rOZ90kmw7jnYekn10 ZatFqwGG8/qheZHNFPUq2uZBl+7klr6WZC+7xIukA8QGrmRbZ1+7jGvwyazTIbAjQdzD 2msA== X-Gm-Message-State: AOAM532uz0DOHqGNWQTEu30s/RRFLE7KSyPMsVPv39w+0p+KTI8WStZk MTB3x+1dWCtzJZ9lU+NE1sjNQeADOesADQ== X-Google-Smtp-Source: ABdhPJxP5vU4iAKhgk5lDWvhtonOdNLJe6tuY9LU4dgZAzWyAdazrpTcIzIEtf9dKFm/Xey9sRyZYA== X-Received: by 2002:a17:90b:3615:: with SMTP id ml21mr34038280pjb.194.1621988425364; Tue, 25 May 2021 17:20:25 -0700 (PDT) Received: from han1-mobl3.hsd1.or.comcast.net ([2601:1c0:6a01:d830::e853]) by smtp.gmail.com with ESMTPSA id t19sm14305726pfq.116.2021.05.25.17.20.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 17:20:24 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH 1/4] tools/btmgmt: Add device flags commands Date: Tue, 25 May 2021 17:20:21 -0700 Message-Id: <20210526002024.412237-1-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Tedd Ho-Jeong An This patch adds commands for get/set device flags mgmt ops. Usage: get-flags [-t type]
-t type Address Type 0 BR/EDR 1 LE Public 2 LE Random set-flags [-f flags] [-t type]
-t type Address Type 0 BR/EDR 1 LE Public 2 LE Random -f flags Device flag. 1 Remote Wake Enable --- tools/btmgmt.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index bf3b460d0..a6ac026dc 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -1000,6 +1000,24 @@ static void advertising_removed(uint16_t index, uint16_t len, print("hci%u advertising_removed: instance %u", index, ev->instance); } +static void flags_changed(uint16_t index, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_ev_device_flags_changed *ev = param; + char addr[18]; + + if (len < sizeof(*ev)) { + error("Too small (%u bytes) %s event", len, __func__); + return; + } + + ba2str(&ev->addr.bdaddr, addr); + print("hci%u device_flags_changed: %s (%s)", index, addr, + typestr(ev->addr.type)); + print(" supp: 0x%08x curr: 0x%08x", + ev->supported_flags, ev->current_flags); +} + static void advmon_added(uint16_t index, uint16_t len, const void *param, void *user_data) { @@ -2110,6 +2128,156 @@ static void cmd_auto_power(int argc, char **argv) } } +static void get_flags_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_rp_get_device_flags *rp = param; + + if (status != 0) { + error("Get device flags failed with status 0x%02x (%s)", + status, mgmt_errstr(status)); + bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + print("Supported Flags: 0x%08x", rp->supported_flags); + print("Current Flags: 0x%08x", rp->current_flags); + bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static struct option get_flags_options[] = { + { "help", 0, 0, 'h' }, + { "type", 1, 0, 't' }, + { 0, 0, 0, 0 } +}; + +static void cmd_get_flags(int argc, char **argv) +{ + struct mgmt_cp_get_device_flags cp; + uint8_t type = BDADDR_BREDR; + char addr[18]; + int opt; + uint16_t index; + + while ((opt = getopt_long(argc, argv, "+t:h", get_flags_options, + NULL)) != -1) { + switch (opt) { + case 't': + type = strtol(optarg, NULL, 0); + break; + case 'h': + bt_shell_usage(); + optind = 0; + return bt_shell_noninteractive_quit(EXIT_SUCCESS); + default: + bt_shell_usage(); + optind = 0; + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + } + + argc -= optind; + argv += optind; + optind = 0; + + if (argc < 1) { + bt_shell_usage(); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + memset(&cp, 0, sizeof(cp)); + str2ba(argv[0], &cp.addr.bdaddr); + cp.addr.type = type; + + ba2str(&cp.addr.bdaddr, addr); + print("Get device flag of %s (%s)", addr, typestr(cp.addr.type)); + + if (mgmt_send(mgmt, MGMT_OP_GET_DEVICE_FLAGS, index, sizeof(cp), &cp, + get_flags_rsp, NULL, NULL) == 0) { + error("Unable to send Get Device Flags command"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + +static void set_flags_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + if (status != 0) { + error("Set device flags failed with status 0x%02x (%s)", + status, mgmt_errstr(status)); + bt_shell_noninteractive_quit(EXIT_FAILURE); + } + bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static struct option set_flags_options[] = { + { "help", 0, 0, 'h' }, + { "type", 1, 0, 't' }, + { "flags", 1, 0, 'f' }, + { 0, 0, 0, 0 } +}; + +static void cmd_set_flags(int argc, char **argv) +{ + struct mgmt_cp_set_device_flags cp; + uint8_t type = BDADDR_BREDR; + uint32_t flags = 0; + char addr[18]; + int opt; + uint16_t index; + + while ((opt = getopt_long(argc, argv, "+f:t:h", set_flags_options, + NULL)) != -1) { + switch (opt) { + case 'f': + flags = strtol(optarg, NULL, 0); + break; + case 't': + type = strtol(optarg, NULL, 0); + break; + case 'h': + bt_shell_usage(); + optind = 0; + return bt_shell_noninteractive_quit(EXIT_SUCCESS); + default: + bt_shell_usage(); + optind = 0; + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + } + + argc -= optind; + argv += optind; + optind = 0; + + if (argc < 1) { + bt_shell_usage(); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + memset(&cp, 0, sizeof(cp)); + str2ba(argv[0], &cp.addr.bdaddr); + cp.addr.type = type; + cp.current_flags = flags; + + ba2str(&cp.addr.bdaddr, addr); + print("Set device flag of %s (%s)", addr, typestr(cp.addr.type)); + + if (mgmt_send(mgmt, MGMT_OP_SET_DEVICE_FLAGS, index, sizeof(cp), &cp, + set_flags_rsp, NULL, NULL) == 0) { + error("Unable to send Set Device Flags command"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + +} + /* Wrapper to get the index and opcode to the response callback */ struct command_data { uint16_t id; @@ -5197,6 +5365,8 @@ static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index) advertising_added, NULL, NULL); mgmt_register(mgmt, MGMT_EV_ADVERTISING_REMOVED, index, advertising_removed, NULL, NULL); + mgmt_register(mgmt, MGMT_EV_DEVICE_FLAGS_CHANGED, index, + flags_changed, NULL, NULL); mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_ADDED, index, advmon_added, NULL, NULL); mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_REMOVED, index, advmon_removed, @@ -5381,6 +5551,10 @@ static const struct bt_shell_menu main_menu = { cmd_read_sysconfig, "Read System Configuration" }, { "set-sysconfig", "<-v|-h> [options...]", cmd_set_sysconfig, "Set System Configuration" }, + { "get-flags", "[-t type]
", + cmd_get_flags, "Get device flags" }, + { "set-flags", "[-f flags] [-t type]
", + cmd_set_flags, "Set device flags" }, {} }, }; From patchwork Wed May 26 00:20:22 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: 12280377 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.7 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,URIBL_BLOCKED,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 0AB10C4707F for ; Wed, 26 May 2021 00:20:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C63656140F for ; Wed, 26 May 2021 00:20:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232324AbhEZAV6 (ORCPT ); Tue, 25 May 2021 20:21:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232298AbhEZAV5 (ORCPT ); Tue, 25 May 2021 20:21:57 -0400 Received: from mail-pf1-x42f.google.com (mail-pf1-x42f.google.com [IPv6:2607:f8b0:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A881FC061756 for ; Tue, 25 May 2021 17:20:26 -0700 (PDT) Received: by mail-pf1-x42f.google.com with SMTP id x188so24895762pfd.7 for ; Tue, 25 May 2021 17:20:26 -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=H2zwyia3p7d2uxe0ZBO4miRasBmJH8+968BsSYNruX4=; b=s/5qdEWP22e4gj/VUTNg34dzJKmTThSZ7TzvYxhi6PPL952yOpWnIvWW9EP4KmvVGP QC6bdmH38hisY4cL97WyB3JmGpQYgZZa681n4g85iF5A5GgeWzceHVanfvDzWafgHwky sCxH8eROwM3i0RdEIxJ02qQAzLebIdZUj4aP7FqcJWaXWULizoyTOY0svulYKQGKI8Nz Pd62bxciJgarc5R8h33wE/kX4oaFVfnaiGz3ZYpHdrztj4BF+EZ1AiU03N7DqXEd0NNE vMAdn+FA/Bi9EFIl1yQ0+owMj4ZaictAhDlYC+jUJeajjs12NTT1EZQj746rBZ1arkYd X9lQ== 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=H2zwyia3p7d2uxe0ZBO4miRasBmJH8+968BsSYNruX4=; b=qnAxfjo8DwnjE1H8AbiSw3HUf0rili6f7MBMGu6e0PSEyaPtW8M3D27dvyrBI+MjZr yQMaxCaUiI/Mk5o8huE7CdtE9EaVqRpfY+DQ6zYWtx/XNUmZZt5OBHVpl+39yPDkkGaV 2DOvrrPTKvKFBKOhlJxi/v9H4mc0BkfTVcV//yx3wIZkbANI7cwP/D6BWQ65iWGFDdQu Hm5+7g4zA49j8LX8omV2rHzDb2/11domKTW/vc1zvm28pe9hxAj1sRCvHyxoyZqAGsQu UY/y2Vp6RzlOtJmBxunvacWU/xo3Q/k5qHlFj5JjaaGV0Zv77R0i60pM1Kgs2LLBfnq9 HpNg== X-Gm-Message-State: AOAM531PRe2JCMXXqyk5CrulzqTaiJn3fUWC+QUMLRUn0Cg6JkBAHGdM 2ytd23GMJ9QAVd/v457oy9THFjZZ2jfCTA== X-Google-Smtp-Source: ABdhPJwVedJunCKLH0g9GcDyWJPOvEvYemWSBFGdsXhc8mIwpnSJ/m+BwBpe2RydKPpe3OLHGUKjuQ== X-Received: by 2002:a62:1796:0:b029:2d5:91b4:642d with SMTP id 144-20020a6217960000b02902d591b4642dmr32069304pfx.7.1621988425923; Tue, 25 May 2021 17:20:25 -0700 (PDT) Received: from han1-mobl3.hsd1.or.comcast.net ([2601:1c0:6a01:d830::e853]) by smtp.gmail.com with ESMTPSA id t19sm14305726pfq.116.2021.05.25.17.20.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 17:20:25 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH 2/4] lib: Align mgmt header with document Date: Tue, 25 May 2021 17:20:22 -0700 Message-Id: <20210526002024.412237-2-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526002024.412237-1-hj.tedd.an@gmail.com> References: <20210526002024.412237-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 updates the mgmt header to align with the mgmt api document (doc/mgmt-api.txt) --- lib/mgmt.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/mgmt.h b/lib/mgmt.h index a85f891c5..0a6349321 100644 --- a/lib/mgmt.h +++ b/lib/mgmt.h @@ -1087,11 +1087,13 @@ static const char *mgmt_op[] = { "Set PHY Configuration", "Set Blocked Keys", "Set Wideband Speech", - "Read Security Information", /* 0x0048 */ + "Read Controller Capabilities Information", /* 0x0048 */ "Read Experimental Features Information", "Set Experimental Feature", "Read Default System Configuration", "Set Default System Configuration", + "Read Default Runtime Configuration", + "Set Default Runtime Configuration", "Get Device Flags", "Set Device Flags", /* 0x0050 */ "Read Advertisement Monitor Features", @@ -1143,6 +1145,8 @@ static const char *mgmt_ev[] = { "Extended Controller Information Changed", "PHY Configuration Changed", "Experimental Feature Changed", + "Default System Configuration Changed", /* 0x0028 */ + "Default Runtime Configuration Changed", "Device Flags Changed", "Advertisement Monitor Added", /* 0x002b */ "Advertisement Monitor Removed", @@ -1172,6 +1176,7 @@ static const char *mgmt_status[] = { "Blocked through rfkill", "Already Paired", "Permission Denied", + "Connection Not Established", }; #ifndef NELEM From patchwork Wed May 26 00:20:23 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: 12280379 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 2A6A6C4708A for ; Wed, 26 May 2021 00:20:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08AAC6140B for ; Wed, 26 May 2021 00:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232342AbhEZAWA (ORCPT ); Tue, 25 May 2021 20:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232320AbhEZAV6 (ORCPT ); Tue, 25 May 2021 20:21:58 -0400 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5966AC06175F for ; Tue, 25 May 2021 17:20:27 -0700 (PDT) Received: by mail-pf1-x431.google.com with SMTP id e17so14295634pfl.5 for ; Tue, 25 May 2021 17:20:27 -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=tuQ9nKR0cuSGFqJeNxh6e/A49jphmCAZQX2vjqtzuuA=; b=jI+7vIyNOaQc8vv06ucqiOXO34wZA/0HIZF0J/aqwjrz49CNrEKkwEc8eHCFPed1M7 95NyBFbDUtJNriLKuMnJYeYUBw9E9HzvrdY4fts0u79YUExhYaZ/PP4mcb72FpFjz7fd cfzgQulcNLF+90m1B7KueDtJimgucJQDpLkVNAiPdDhmuvJDfV8jE8vN/ri06NACs5QX GDetsvYGApRFbGX8nvk/zG8lW1cgtEOnT1woyhve/gjqa1xIVnEfCyi/25gmhi01jY+4 /WvGG8IEyCS647xDF9sbWoCMHBLWsAiLAeiw2nV1Ru99kRkV07MUXawbaLCBJCSZNqzl F3AA== 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=tuQ9nKR0cuSGFqJeNxh6e/A49jphmCAZQX2vjqtzuuA=; b=LqvtTq+aar/UmUCa9of1RYtJuhL7m+VpKwnfuHyCFjzZEmArCgR43N7tofPXqHfKAm KmqcISkiAPlVE5GnDiF4IazkJWR8SEFngBFkOo7u2bvyAXY/MXc5fowTPQ8pm9lqmFr+ rCmgrf38QYbQM2u80XUyGyy5SUZD1Uh5zTjl+HYzM76qv1aQdWuAtentqMu3OXHRb0MU 0yePMdctP4AODTnSnJI+O3L5bhrOGk7DZsHYIFE2QIig/efqml8lCm0f77KECsAhuhaG 5xQvnPP2I0C+6MLe1QKMfkmBfFsn6/QjhcMaKUy2H70/H4nR7mw8I3ZvQGTajAAegHfy E81w== X-Gm-Message-State: AOAM531iAlvxmowLryoLQuY6Fe9IvjZRvQBvrctK2Q4PHC6zXE2AQWyb zPVaoAvhaIGAaC41s6ddYigyqfQSVFxweQ== X-Google-Smtp-Source: ABdhPJxDVbkwuRTSfRpd0bbRDG4aURGKU9OvXgR3HWzZ0gYfXEau19dh4pnh72dZi3fmwPN01uHyUg== X-Received: by 2002:aa7:961a:0:b029:2e1:b984:7edf with SMTP id q26-20020aa7961a0000b02902e1b9847edfmr31149899pfg.34.1621988426700; Tue, 25 May 2021 17:20:26 -0700 (PDT) Received: from han1-mobl3.hsd1.or.comcast.net ([2601:1c0:6a01:d830::e853]) by smtp.gmail.com with ESMTPSA id t19sm14305726pfq.116.2021.05.25.17.20.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 17:20:26 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH 3/4] tools/mgmt-tester: Print hexdump if mgmt event parameters not match Date: Tue, 25 May 2021 17:20:23 -0700 Message-Id: <20210526002024.412237-3-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526002024.412237-1-hj.tedd.an@gmail.com> References: <20210526002024.412237-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 displays the hexdump of expected and received mgmt event parameters. --- tools/mgmt-tester.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index c9de770c1..767e010a6 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -6780,6 +6780,9 @@ static bool verify_alt_ev(const void *param, uint16_t length) if (test->expect_alt_ev_param && memcmp(test->expect_alt_ev_param, param, length)) { tester_warn("Event parameters do not match"); + util_hexdump('>', param, length, print_debug, ""); + util_hexdump('!', test->expect_alt_ev_param, length, + print_debug, ""); return false; } From patchwork Wed May 26 00:20:24 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: 12280381 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 3A414C4708B for ; Wed, 26 May 2021 00:20:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 19C436142C for ; Wed, 26 May 2021 00:20:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232333AbhEZAV7 (ORCPT ); Tue, 25 May 2021 20:21:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39490 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232310AbhEZAV6 (ORCPT ); Tue, 25 May 2021 20:21:58 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 072E7C061574 for ; Tue, 25 May 2021 17:20:28 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id j12so24094805pgh.7 for ; Tue, 25 May 2021 17:20:28 -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=V9FyyF9jdSeK5S3rBQkL/uwGCuTX2AyYnA3Dlag4pLU=; b=o0hQdpviZ+/D9Iy9GBB1+G24XY8SIu+HGzr+Z7GJHfpTtcRzQ4tlIT3rvCNhamykPM RUeSju/8N2rl+Ji7TyFK7Q4SwvrHPipy6e9fhOE2FspzKRQPqsdqxiJ8z62+GH2SxYwG yqBLk8R0bAudMEXTdzIpwieVRir6y0x1CC+DkCRSFkRXEs2vsfpAnet8ZtWi7BSFHlU8 rFgauesUO+x+XYZhiQKi5N/QnshjpD9nVW5MENnoFffWH/AHVeRbCvdKY2vFuxHH/jFM 94ySlgqh0a6D5UtGrUhxr86JCuxMfMGK6iqEirzEIniPb/B4gVXkHBN3S/L4YzivpYEK Iraw== 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=V9FyyF9jdSeK5S3rBQkL/uwGCuTX2AyYnA3Dlag4pLU=; b=hGrEjk1dTCy6HKCy+K9ThRvPKKhEXo9+exh6w+xItccOkmHTgSorD7uiJ5ZDNSviAk iShVB2ofP/enbdkrDQFMX8GKM44nvwWl5R1uEc58AEoksjOFGJ5NCMJV8+wkfmhQLwm+ HlgmTCiesdlvs7U2O791sVBOg2qjcNPgIBhA6+eIxGJ5kvaBlaXgz4TbZF6DCMCviLhb TdhcuwGsWMOLFqtwOHMLkUeYtiLxKDr1XLYiPEoC0Z08zoxLMcEhM+9Y3NVjKJ0aW3Kq wRA27FPttNBONoRt+dlkSB4Op1pSCQ0zJVc0YqCUgCGrCJFP7BQGDKEiH4rUIYXPwPqB UKBQ== X-Gm-Message-State: AOAM5325UUl1CJ7fQNS48trnz66GabjyL5unS3QUxGJb2o2FUFjIhYaY GohbdGayhoeYON/h2vgPoQdRcphtAiCNnQ== X-Google-Smtp-Source: ABdhPJxWUhokg6NARyG6GG+1cO3yEecMGVm8/1RsW7Al8RK+kXBmXRJuhU8R1nO9G2V5N4WONwOV4g== X-Received: by 2002:a65:5248:: with SMTP id q8mr21625101pgp.176.1621988427345; Tue, 25 May 2021 17:20:27 -0700 (PDT) Received: from han1-mobl3.hsd1.or.comcast.net ([2601:1c0:6a01:d830::e853]) by smtp.gmail.com with ESMTPSA id t19sm14305726pfq.116.2021.05.25.17.20.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 May 2021 17:20:26 -0700 (PDT) From: Tedd Ho-Jeong An To: linux-bluetooth@vger.kernel.org Subject: [BlueZ PATCH 4/4] tools/mgmt-tester: Add test cases for get/set device flags Date: Tue, 25 May 2021 17:20:24 -0700 Message-Id: <20210526002024.412237-4-hj.tedd.an@gmail.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210526002024.412237-1-hj.tedd.an@gmail.com> References: <20210526002024.412237-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 get/set device flags commands. --- tools/mgmt-tester.c | 182 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 182 insertions(+) diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 767e010a6..4550d6e9c 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -8990,6 +8990,140 @@ static void setup_phy_configuration(const void *test_data) NULL, NULL); } +static const uint8_t get_dev_flags_param[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ +}; + +static const uint8_t get_dev_flags_rsp_param[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ + 0x01, 0x00, 0x00, 0x00, /* Supported Flages */ + 0x00, 0x00, 0x00, 0x00, /* Current Flages */ +}; + +static const struct generic_data get_dev_flags_success = { + .send_opcode = MGMT_OP_GET_DEVICE_FLAGS, + .send_param = get_dev_flags_param, + .send_len = sizeof(get_dev_flags_param), + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = get_dev_flags_rsp_param, + .expect_len = sizeof(get_dev_flags_rsp_param), +}; + +static const uint8_t get_dev_flags_param_fail_1[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ +}; + +static const struct generic_data get_dev_flags_fail_1 = { + .send_opcode = MGMT_OP_GET_DEVICE_FLAGS, + .send_param = get_dev_flags_param_fail_1, + .send_len = sizeof(get_dev_flags_param_fail_1), + .expect_status = MGMT_STATUS_INVALID_PARAMS, +}; + +static void setup_get_dev_flags(const void *test_data) +{ + struct test_data *data = tester_get_data(); + unsigned char param[] = { 0x01 }; + const unsigned char *add_param; + size_t add_param_len; + + tester_print("Powering on controller (with added device)"); + + if (data->hciemu_type == HCIEMU_TYPE_LE) { + add_param = add_device_success_param_2; + add_param_len = sizeof(add_device_success_param_2); + } else { + add_param = add_device_success_param_1; + add_param_len = sizeof(add_device_success_param_1); + } + + mgmt_send(data->mgmt, MGMT_OP_ADD_DEVICE, data->mgmt_index, + add_param_len, add_param, NULL, 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 set_dev_flags_param[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ + 0x01, 0x00, 0x00, 0x00, /* Current Flages */ +}; + +static const uint8_t set_dev_flags_rsp_param[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ +}; + +static const uint8_t dev_flags_changed_param[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ + 0x01, 0x00, 0x00, 0x00, /* Supported Flages */ + 0x01, 0x00, 0x00, 0x00, /* Current Flages */ +}; + +static const struct generic_data set_dev_flags_success = { + .send_opcode = MGMT_OP_SET_DEVICE_FLAGS, + .send_param = set_dev_flags_param, + .send_len = sizeof(set_dev_flags_param), + .expect_status = MGMT_STATUS_SUCCESS, + .expect_param = set_dev_flags_rsp_param, + .expect_len = sizeof(set_dev_flags_rsp_param), + .expect_alt_ev = MGMT_EV_DEVICE_FLAGS_CHANGED, + .expect_alt_ev_param = dev_flags_changed_param, + .expect_alt_ev_len = sizeof(dev_flags_changed_param), +}; + +static const uint8_t set_dev_flags_param_fail_1[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ +}; + +static const struct generic_data set_dev_flags_fail_1 = { + .send_opcode = MGMT_OP_SET_DEVICE_FLAGS, + .send_param = set_dev_flags_param_fail_1, + .send_len = sizeof(set_dev_flags_param_fail_1), + .expect_status = MGMT_STATUS_INVALID_PARAMS, +}; + +static const uint8_t set_dev_flags_param_fail_2[] = { + 0x12, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ + 0x03, 0x00, 0x00, 0x00, /* Current Flages */ +}; + +static const struct generic_data set_dev_flags_fail_2 = { + .send_opcode = MGMT_OP_SET_DEVICE_FLAGS, + .send_param = set_dev_flags_param_fail_2, + .send_len = sizeof(set_dev_flags_param_fail_2), + .expect_status = MGMT_STATUS_INVALID_PARAMS, + .expect_param = set_dev_flags_rsp_param, + .expect_len = sizeof(set_dev_flags_rsp_param), +}; + +static const uint8_t set_dev_flags_param_fail_3[] = { + 0x11, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ + 0x01, 0x00, 0x00, 0x00, /* Current Flages */ +}; + +static const uint8_t set_dev_flags_rsp_param_fail_3[] = { + 0x11, 0x34, 0x56, 0x78, 0x9a, 0xbc, /* Address */ + 0x00, /* Type */ +}; + +static const struct generic_data set_dev_flags_fail_3 = { + .send_opcode = MGMT_OP_SET_DEVICE_FLAGS, + .send_param = set_dev_flags_param_fail_3, + .send_len = sizeof(set_dev_flags_param_fail_3), + .expect_status = MGMT_STATUS_INVALID_PARAMS, + .expect_param = set_dev_flags_rsp_param_fail_3, + .expect_len = sizeof(set_dev_flags_rsp_param_fail_3), +}; + static bool power_off(uint16_t index) { int sk, err; @@ -11010,5 +11144,53 @@ int main(int argc, char *argv[]) NULL, test_command_generic); + /* MGMT_OP_GET_DEVICE_FLAGS + * Success + */ + test_bredrle50("Get Device Flags - Success", + &get_dev_flags_success, + setup_get_dev_flags, + test_command_generic); + + /* MGMT_OP_GET_DEVICE_FLAGS + * Fail - Invalid parameter + */ + test_bredrle50("Get Device Flags - Invalid Parameter", + &get_dev_flags_fail_1, + setup_get_dev_flags, + test_command_generic); + + /* MGMT_OP_SET_DEVICE_FLAGS + * Success + */ + test_bredrle50("Set Device Flags - Success", + &set_dev_flags_success, + setup_get_dev_flags, + test_command_generic); + + /* MGMT_OP_SET_DEVICE_FLAGS + * Invalid Parameter - Missing parameter + */ + test_bredrle50("Set Device Flags - Invalid Parameter 1", + &set_dev_flags_fail_1, + setup_get_dev_flags, + test_command_generic); + + /* MGMT_OP_SET_DEVICE_FLAGS + * Invalid Parameter - Not supported value + */ + test_bredrle50("Set Device Flags - Invalid Parameter 2", + &set_dev_flags_fail_2, + setup_get_dev_flags, + test_command_generic); + + /* MGMT_OP_SET_DEVICE_FLAGS + * Device not exist + */ + test_bredrle50("Set Device Flags - Device not found", + &set_dev_flags_fail_3, + setup_get_dev_flags, + test_command_generic); + return tester_run(); }