From patchwork Fri Jan 15 11:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 363923 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=-21.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 F3342C433DB for ; Fri, 15 Jan 2021 11:52:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC2D723730 for ; Fri, 15 Jan 2021 11:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbhAOLwZ (ORCPT ); Fri, 15 Jan 2021 06:52:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725880AbhAOLwY (ORCPT ); Fri, 15 Jan 2021 06:52:24 -0500 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5606BC061793 for ; Fri, 15 Jan 2021 03:51:44 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id r185so5924974ybf.9 for ; Fri, 15 Jan 2021 03:51:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=XSwZnH2kh3Ehe2Kkqwf/EwstAQB1eAD/12eZMBoUKH0=; b=U+BZTWn9OC/ox1fukWuanuAi9j0NbQf08J6c5kNeLXbRoWBjOsMkpyecqMEkg70E1R j4kECokR9igOMU2fKD0ZUxb35xUTAaa2WpCoMgS+Li+8JMGZ/CCfkbASHo8Q6jsynH6S tV6Y4JsLm2mILAi8Z6Isg3Q5ISxiN0WhEjsOyQ6F2654DMnTvaLsMH1+Ru0jqetdXEjc 9tntfXR2Edk1qiV+OhHw03HaMpV6qJAac1BcKyGtMLIU61/FQ1H83rdNAS38nslD9APE aHW0DsIDtoiU0871XrEluOciYX9hYMVs+t/+yHxUD1xypVxumM+W5S3xvszif8rPWldb 9BPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=XSwZnH2kh3Ehe2Kkqwf/EwstAQB1eAD/12eZMBoUKH0=; b=lfXB+63E2xsKBlL1NviyVjD80kc7yRHmnA9kE/fANYj7hBuF6mYwXX+lVUTjh920Nf zzChh9UlTRLDaeaIwFIEJ5f9J80uK7y26KzG3k6H9VxdBn78XUV1V3gGRJLaoE8kmAg1 owgNBpQ5DHJHQuipoJkMZQy8pTyIu6zJRQavPZmI72CtqpdtXTLIwfTEP9SFe7tm47QK Q33Bl+QdsN76vfncueP8UUPLbwzhA/E+E8RoZWR2dZaY6c4O5kvvM17vmPR09zo4POCj XHAWkKtWPzecuFzKoW/JXVnd1VjhEqEkuWcLEb4IWuxY3w9nrAE+TyVmmkqrG5HSliNt w3nw== X-Gm-Message-State: AOAM531oCDRMuz1JlhFApRJ8SQUIIc86SXvtqfXiYtpMms2nEsD+YSW2 2sos//Jog5/YLlitbbgFTmC0aT5PFSUzcpJmK88o/BD+Dfqz9iycYA3OZiORaW+T9pqVuCtqbU9 XN+rGUSPVmsOM9Zlue3McTyI1a6YL6tYuJKQJ0ceRWFlVhAJn1M7IKkDlO5EfrZaawwax2rQd6k Sq X-Google-Smtp-Source: ABdhPJwYB1KcA/hgk/xHinzSZ0yFih/2qPAcyexphqHsQgZBKjFLNyiVUaJmf9sE4mruWz+pKAVvMzBW9MoG Sender: "apusaka via sendgmr" X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:b:f693:9fff:fef4:2347]) (user=apusaka job=sendgmr) by 2002:a25:374c:: with SMTP id e73mr18082555yba.376.1610711503567; Fri, 15 Jan 2021 03:51:43 -0800 (PST) Date: Fri, 15 Jan 2021 19:50:37 +0800 In-Reply-To: <20210115115036.3973761-1-apusaka@google.com> Message-Id: <20210115194853.Bluez.v4.2.I5e5ea3e2d73840e65cd42fccafe14427f6f81de7@changeid> Mime-Version: 1.0 References: <20210115115036.3973761-1-apusaka@google.com> X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [Bluez PATCH v4 2/6] doc/advmon-api: Introduce sampling period property From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: CrosBT Upstreaming , Archie Pusaka Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka The sampling period is used to align with the new MGMT opcode which also have sampling period. --- Changes in v4: * update doc doc/advertisement-monitor-api.txt | 78 +++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/doc/advertisement-monitor-api.txt b/doc/advertisement-monitor-api.txt index 92c8ffc38e..8100717c03 100644 --- a/doc/advertisement-monitor-api.txt +++ b/doc/advertisement-monitor-api.txt @@ -49,31 +49,59 @@ Properties string Type [read-only] org.bluez.AdvertisementMonitorManager1 for the available options. - (Int16, Uint16, Int16, Uint16) RSSIThresholdsAndTimers [read-only, optional] - - This contains HighRSSIThreshold, HighRSSIThresholdTimer, - LowRSSIThreshold, LowRSSIThresholdTimer in order. The - unit of HighRSSIThreshold and LowRSSIThreshold is dBm. - The unit of HighRSSIThresholdTimer and - LowRSSIThresholdTimer is second. - - If these are provided, RSSI would be used as a factor to - notify the client of whether a device stays in range or - move out of range. A device is considered in-range when - the RSSIs of the received advertisement(s) during - HighRSSIThresholdTimer seconds exceed HighRSSIThreshold. - Likewise, a device is considered out-of-range when the - RSSIs of the received advertisement(s) during - LowRSSIThresholdTimer do not reach LowRSSIThreshold. - - The valid range of a RSSI is -127 to +20 dBm while 127 - dBm indicates unset. The valid range of a timer is 1 to - 300 seconds while 0 indicates unset. - - If the peer device advertising interval is greater than the - HighRSSIThresholdTimer, the device will never be found. Similarly, - if it is greater than LowRSSIThresholdTimer, the device will be - considered as lost. Consider configuring these values accordingly. + Int16 RSSILowThreshold [read-only, optional] + + Used in conjunction with RSSILowTimeout to determine + whether a device becomes out-of-range. Valid range is + -127 to 20 (dBm), while 127 indicates unset. + + Int16 RSSIHighThreshold [read-only, optional] + + Used in conjunction with RSSIHighTimeout to determine + whether a device becomes in-range. Valid range is + -127 to 20 (dBm), while 127 indicates unset. + + Uint16 RSSILowTimeout [read-only, optional] + + The time it takes to consider a device as out-of-range. + If this many seconds elapses without receiving any + signal at least as strong as RSSILowThreshold, a + currently in-range device will be considered as + out-of-range (lost). Valid range is 1 to 300 (seconds), + while 0 indicates unset. + + Uint16 RSSIHighTimeout [read-only, optional] + + The time it takes to consider a device as in-range. + If this many seconds elapses while we continuously + receive signals at least as strong as RSSIHighThreshold, + a currently out-of-range device will be considered as + in-range (found). Valid range is 1 to 300 (seconds), + while 0 indicates unset. + + Uint16 RSSISamplingPeriod [read-only, optional] + + Grouping rules on how to propagate the received + advertisement packets to the client. Valid range is 0 to + 255 while 256 indicates unset. + + The meaning of this property is as follows: + 0: + All advertisement packets from in-range devices + would be propagated. + 255: + Only the first advertisement packet of in-range + devices would be propagated. If the device + becomes lost, then the first packet when it is + found again will also be propagated. + 1 to 254: + Advertisement packets would be grouped into + 100ms * N time period. Packets in the same group + will only be reported once, with the RSSI value + being averaged out. + + Currently this is unimplemented in user space, so the + value is only used to be forwarded to the kernel. array{(uint8, uint8, array{byte})} Patterns [read-only, optional] From patchwork Fri Jan 15 11:50:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 363922 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 1CE61C433E0 for ; Fri, 15 Jan 2021 11:52:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DB85823730 for ; Fri, 15 Jan 2021 11:52:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726370AbhAOLwm (ORCPT ); Fri, 15 Jan 2021 06:52:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725910AbhAOLwl (ORCPT ); Fri, 15 Jan 2021 06:52:41 -0500 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09A6CC0613C1 for ; Fri, 15 Jan 2021 03:52:01 -0800 (PST) Received: by mail-qk1-x749.google.com with SMTP id l138so7685070qke.4 for ; Fri, 15 Jan 2021 03:52:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=3LHP5tx+2jOMtQWFgOs6liyFkeh3GRIFgvOay/7wGag=; b=FOsXQl6BGzb/QPYSa/24S5KlQDoZxiuLzLbJivIWwRdAYnZavCkZ/+pFKmTAkegeal 1S0nqAadkqOfzvI4WNutQMvAbpAgcn6tg8iDED1kPloCOpDj0XRBoVbKjK58X5GHiusQ YgS2x6IpEaoDrtmPL4BF/ljuzyWX4STYL7XPkiNqlfqVUVUn/s+wKhRJ3MlhczwJJyeL j+zjF2jdZ1uwzrDqT4RhllPPWdLvNC0FvAfr8UAT4iQLy5jw3MPqfJ6fPq6/ak8jEp8U Spv/7q8d2dw0B5XD1yxaWo/WQRpUzGfXVV4fKsJR+Tcnuh/EmKs/nv2/BraYaFe45kG/ tYHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3LHP5tx+2jOMtQWFgOs6liyFkeh3GRIFgvOay/7wGag=; b=MnTOxVqnUZgZIXcMBA++KflEbn20cL79JJ2GvHm5jo8V+o8Qdsedweyyvt9QFxEf19 eQNmZsBbi0kYPt4seYnNcUJ14jomFQIBPzLrcygbSUyIu063COTrFiw29DvbMbGT/sB1 iWm8eVoDIdjICYmcmuettlm1MjGPiQwqjlNWbJihjJVbscdt8Qw0wkqUgmO/zOQ9kgxk OQou4inLg54QE8Cb8Dy8N5jQWPC0JhFc1IZKvZv+79MsGZ8P6ffoOA3ZVjIS41PkrqgB kXttNDOMnwTAU+HJr8GbFCaWQor8NjI136GASYwaxRo9QuD9cQyKfGe6ZJNzcJ2b95Fj OYwg== X-Gm-Message-State: AOAM531qgDsfdJ74qnOnnag44URSkRXYQEl5NeMw8X3Ify6J4ZkbKTB+ OrJu1bpzza3S7qP8rqFkMC7/tRYT52y7vvFG41KptoTkImtlPyhA6mZQPA0YVy28RNHjwfnCj+Q wGcOPwOpjnlGsgeSPl+ZYm1tez0gg8xBaDQSPVTGwnqF/XKXZLWLy0OGycD2C3kquI9/dtfxyWk O3 X-Google-Smtp-Source: ABdhPJw90YKcgd9uXCshJkpODUNpNbV+iCq/3QZQU8Lkt/+KRAmkcOki4CP1ibg3eDK/rPUcTgPI3uwYRgLu Sender: "apusaka via sendgmr" X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:b:f693:9fff:fef4:2347]) (user=apusaka job=sendgmr) by 2002:a05:6214:14ee:: with SMTP id k14mr11458657qvw.36.1610711520148; Fri, 15 Jan 2021 03:52:00 -0800 (PST) Date: Fri, 15 Jan 2021 19:50:41 +0800 In-Reply-To: <20210115115036.3973761-1-apusaka@google.com> Message-Id: <20210115194853.Bluez.v4.4.I16fa24fb791fe886f6723373772b644783b3ab92@changeid> Mime-Version: 1.0 References: <20210115115036.3973761-1-apusaka@google.com> X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [Bluez PATCH v4 4/6] btmgmt: advmon add rssi support From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: CrosBT Upstreaming , Archie Pusaka , Yun-Hao Chung Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Using the new opcode MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI to monitor advertisement according to some RSSI criteria. Reviewed-by: Yun-Hao Chung --- (no changes since v1) tools/btmgmt.c | 160 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 134 insertions(+), 26 deletions(-) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index c0e55f58e6..383e7199e4 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -4858,64 +4858,169 @@ static bool str2pattern(struct mgmt_adv_pattern *pattern, const char *str) return true; } -static void advmon_add_usage(void) +static struct option add_monitor_rssi_options[] = { + { "help", 0, 0, 'h' }, + { "high-threshold", 1, 0, 'R' }, + { "low-threshold", 1, 0, 'r' }, + { "high-timeout", 1, 0, 'T' }, + { "low-timeout", 1, 0, 't' }, + { "sampling", 1, 0, 's' }, + { 0, 0, 0, 0 } +}; + +static void advmon_add_pattern_usage(void) +{ + bt_shell_usage(); + print("patterns format:\n" + "\t [patterns]\n" + "e.g.:\n" + "\tadd-pattern 0:1:c504 ff:a:9a55beef"); +} + +static void advmon_add_pattern_rssi_usage(void) { bt_shell_usage(); - print("Monitor Types:\n\t-p ..." - "\tPattern Monitor\ne.g.:\n\tadd -p 0:1:c504 1:a:9a55beef"); + print("RSSI options:\n" + "\t -R, --high-threshold " + "RSSI high threshold. Default: -70\n" + "\t -r, --low-threshold " + "RSSI low threshold. Default: -50\n" + "\t -T, --high-timeout " + "RSSI high threshold duration. Default: 0\n" + "\t -t, --low-timeout " + "RSSI low threshold duration. Default: 5\n" + "\t -s, --sampling " + "RSSI sampling period. Default: 0\n" + "patterns format:\n" + "\t [patterns]\n" + "e.g.:\n" + "\tadd-pattern-rssi -R 0xb2 -r -102 0:1:c504 ff:a:9a55beef"); } -static bool advmon_add_pattern(int argc, char **argv) +static void cmd_advmon_add_pattern(int argc, char **argv) { + bool success = true; uint16_t index; int i, cp_len; struct mgmt_cp_add_adv_monitor *cp = NULL; - bool success = false; - index = mgmt_index; - if (index == MGMT_INDEX_NONE) - index = 0; + if (!strcmp(argv[1], "-h")) + goto done; - cp_len = sizeof(struct mgmt_cp_add_adv_monitor) + - argc * sizeof(struct mgmt_adv_pattern); + argc -= 1; + argv += 1; + cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern); cp = malloc0(cp_len); cp->pattern_count = argc; for (i = 0; i < argc; i++) { if (!str2pattern(&cp->patterns[i], argv[i])) { error("Failed to parse monitor patterns."); + success = false; goto done; } } - if (!mgmt_send(mgmt, MGMT_OP_ADD_ADV_PATTERNS_MONITOR, index, cp_len, - cp, advmon_add_rsp, NULL, NULL)) { - error("Unable to send \"Add Advertising Monitor\" command"); + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + if (!mgmt_send(mgmt, MGMT_OP_ADD_ADV_PATTERNS_MONITOR, index, + cp_len, cp, advmon_add_rsp, NULL, NULL)) { + error("Unable to send Add Advertising Monitor command"); + success = false; goto done; } - success = true; + free(cp); + return; done: free(cp); - return success; + advmon_add_pattern_usage(); + bt_shell_noninteractive_quit(success ? EXIT_SUCCESS : EXIT_FAILURE); } -static void cmd_advmon_add(int argc, char **argv) +static void cmd_advmon_add_pattern_rssi(int argc, char **argv) { - bool success = false; + bool success = true; + int opt; + int8_t rssi_low = -70; + int8_t rssi_high = -50; + uint16_t rssi_low_timeout = 5; + uint16_t rssi_high_timeout = 0; + uint8_t rssi_sampling_period = 0; + uint16_t index; + int i, cp_len; + struct mgmt_cp_add_adv_patterns_monitor_rssi *cp = NULL; - if (strcasecmp(argv[1], "-p") == 0 && argc > 2) { - argc -= 2; - argv += 2; - success = advmon_add_pattern(argc, argv); + while ((opt = getopt_long(argc, argv, "+hr:R:t:T:s:", + add_monitor_rssi_options, NULL)) != -1) { + switch (opt) { + case 'h': + goto done; + case 'r': + rssi_low = strtol(optarg, NULL, 0); + break; + case 'R': + rssi_high = strtol(optarg, NULL, 0); + break; + case 't': + rssi_low_timeout = strtol(optarg, NULL, 0); + break; + case 'T': + rssi_high_timeout = strtol(optarg, NULL, 0); + break; + case 's': + rssi_sampling_period = strtol(optarg, NULL, 0); + break; + default: + success = false; + goto done; + } } - if (!success) { - advmon_add_usage(); - bt_shell_noninteractive_quit(EXIT_FAILURE); + argc -= optind; + argv += optind; + optind = 0; + + cp_len = sizeof(*cp) + argc * sizeof(struct mgmt_adv_pattern); + cp = malloc0(cp_len); + cp->pattern_count = argc; + cp->rssi.high_threshold = rssi_high; + cp->rssi.low_threshold = rssi_low; + cp->rssi.high_threshold_timeout = htobs(rssi_high_timeout); + cp->rssi.low_threshold_timeout = htobs(rssi_low_timeout); + cp->rssi.sampling_period = rssi_sampling_period; + + for (i = 0; i < argc; i++) { + if (!str2pattern(&cp->patterns[i], argv[i])) { + error("Failed to parse monitor patterns."); + success = false; + goto done; + } + } + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + if (!mgmt_send(mgmt, MGMT_OP_ADD_ADV_PATTERNS_MONITOR_RSSI, index, + cp_len, cp, advmon_add_rsp, NULL, NULL)) { + error("Unable to send Add Advertising Monitor RSSI command"); + success = false; + goto done; } + + free(cp); + return; + +done: + free(cp); + optind = 0; + advmon_add_pattern_rssi_usage(); + bt_shell_noninteractive_quit(success ? EXIT_SUCCESS : EXIT_FAILURE); } static void advmon_remove_rsp(uint8_t status, uint16_t len, const void *param, @@ -5037,8 +5142,11 @@ static const struct bt_shell_menu monitor_menu = { "features" }, { "remove", "", cmd_advmon_remove, "Remove advertisement monitor " }, - { "add", "<-p|-h> [options...]", - cmd_advmon_add, "Add advertisement monitor" }, + { "add-pattern", "[-h] ", + cmd_advmon_add_pattern, "Add advertisement monitor pattern" }, + { "add-pattern-rssi", "[options] ", + cmd_advmon_add_pattern_rssi, + "Add advertisement monitor pattern with RSSI options" }, { } }, }; From patchwork Fri Jan 15 11:50:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Archie Pusaka X-Patchwork-Id: 363921 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL 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 4C660C433E0 for ; Fri, 15 Jan 2021 11:53:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22BB723730 for ; Fri, 15 Jan 2021 11:53:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727357AbhAOLxN (ORCPT ); Fri, 15 Jan 2021 06:53:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726808AbhAOLxM (ORCPT ); Fri, 15 Jan 2021 06:53:12 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 83B5CC0613D3 for ; Fri, 15 Jan 2021 03:52:32 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id l10so3611724ybt.6 for ; Fri, 15 Jan 2021 03:52:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=gUtBImmLVlFO2Y56vbj2nXodQnxN0F5pBsc2kcdtUFg=; b=oP6ZpSItcvNWmw/OC4S/woxu/bH8RGkLxFPCGqb8Xf7AVzAZ2uFJXtW+t2TBSPJ5Y6 7+v4+a5oM60uUSJzW+kGKq9jvKSVCQVRZSutkRysrR3P62Ucn/jwOobuzSUnWDRAoHdI 86Hdh1ZsCVD5yu3Hu0QMK/sLWWhfHpw8k+n67lZ7H+XkzoM5C+4879kDggfUBAdhvdwu vH1v9qhZcLQJxalry+aqav/qFJZkXSZZGqF+mGiGJNMvMq5RZGl/Hr+n6xKPbI9lPGei sddwAFzCA31TEN0zlhNRYYJNcNXw9aEyYy3WSCavpsIGSdcUSJpAVGVg3YLqUL0Fa5Hf jVAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gUtBImmLVlFO2Y56vbj2nXodQnxN0F5pBsc2kcdtUFg=; b=s1rKeaiXRGfdG3uX1nep6syDQhhfFK7akushHDixwgt1wM9oCM5ndz79PNKLgGevaz XOebDfj7cbFgn+mPsHoXPe2AFiDjhb2TO5HfIViHa1FZUSLwFRs2auD3XZcuZg2pnT0L i1Mo97+3LB9lgFbiqnQrh0jm4pfwYcq1grMS4RkEW4R84eN+TuP/oVC3W89q56OvogsZ Xq5d3pJ5kc6Wi13/lZv3YP1gxdQm9FWXczzT5EnavE+7OenCIrLtXXutxcYRVIM8kRmc zs5hlSLFQqmCBh2cFPRDFF+ozlMYJkbyaQmSD2s+3WMYXwHi/GpzHJUCytl0fmpbmDkO AiFw== X-Gm-Message-State: AOAM5317E4mPPBr1mztATZ9MK0HBl9cS8VPUjHBPX/KK+ZYfDlU+e4To Pe0/flS0QGMxvom6eRwmDaA2X8NSgCsGwfQMau8Efic1fEWQj2sR+XILOoahwWIRe7jJnfhkzBu sikzno0tuO0h1UTrQEutPNN6jA2pC4Maj6JCff3/nS3yACESsHkmLOOoYzgDq4kKmG/0XUMHD3+ 9e X-Google-Smtp-Source: ABdhPJzyMppn6dyWLhczub/Zs19wyyjJUhmIluS3synpKU/onKNAM/7Yb4PEK9ra9ELQ9SPWVDnflrRPdCBI Sender: "apusaka via sendgmr" X-Received: from apusaka-p920.tpe.corp.google.com ([2401:fa00:1:b:f693:9fff:fef4:2347]) (user=apusaka job=sendgmr) by 2002:a25:457:: with SMTP id 84mr17222929ybe.224.1610711551734; Fri, 15 Jan 2021 03:52:31 -0800 (PST) Date: Fri, 15 Jan 2021 19:50:45 +0800 In-Reply-To: <20210115115036.3973761-1-apusaka@google.com> Message-Id: <20210115194853.Bluez.v4.6.I0777ec8d6a8874f4d0308d1568aac8c33b04803c@changeid> Mime-Version: 1.0 References: <20210115115036.3973761-1-apusaka@google.com> X-Mailer: git-send-email 2.30.0.296.g2bfb1c46d8-goog Subject: [Bluez PATCH v4 6/6] monitor: Decode add advmon with RSSI parameter From: Archie Pusaka To: linux-bluetooth , Luiz Augusto von Dentz Cc: CrosBT Upstreaming , Archie Pusaka , Yun-Hao Chung Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Archie Pusaka Add support for MGMT command of add advertisement monitor with RSSI parameter (0x0056). @ MGMT Command: Add Advertisement.. (0x0056) plen 76 {0x0003} RSSI data: high threshold: 1 dBm high timeout: 0 seconds low threshold: -2 dBm low timeout: 3 seconds sampling: just once (0xFF) Number of patterns: 2 Pattern 1: AD type: 0 Offset: 1 Length: 2 Value : c504 Pattern 2: AD type: 255 Offset: 10 Length: 4 Value : 9a55beef Reviewed-by: Yun-Hao Chung --- (no changes since v1) monitor/packet.c | 43 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/monitor/packet.c b/monitor/packet.c index c91b91e2b2..fcd698d92a 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -13261,18 +13261,22 @@ static void mgmt_print_adv_monitor_patterns(const void *data, uint8_t len) /* Reference: struct mgmt_adv_pattern in lib/mgmt.h. */ while (data_idx + 34 <= len) { - uint8_t ad_type = get_u8(data + data_idx); - uint8_t offset = get_u8(data + data_idx + 1); - uint8_t length = get_u8(data + data_idx + 2); + uint8_t ad_type = get_u8(data); + uint8_t offset = get_u8(data + 1); + uint8_t length = get_u8(data + 2); print_field(" Pattern %d:", pattern_idx); print_field(" AD type: %d", ad_type); print_field(" Offset: %d", offset); print_field(" Length: %d", length); - print_hex_field(" Value ", data + data_idx + 3, 31); + if (length <= 31) + print_hex_field(" Value ", data + 3, length); + else + print_text(COLOR_ERROR, " invalid length"); pattern_idx += 1; data_idx += 34; + data += 34; } } @@ -13284,6 +13288,33 @@ static void mgmt_add_adv_monitor_patterns_cmd(const void *data, uint16_t size) mgmt_print_adv_monitor_patterns(data + 1, size - 1); } +static void mgmt_add_adv_monitor_patterns_rssi_cmd(const void *data, + uint16_t size) +{ + int8_t high_rssi = get_s8(data); + uint16_t high_rssi_timeout = get_le16(data + 1); + int8_t low_rssi = get_s8(data + 3); + uint16_t low_rssi_timeout = get_le16(data + 4); + uint8_t sampling_period = get_u8(data + 6); + uint8_t pattern_count = get_u8(data + 7); + + print_field("RSSI data:"); + print_field(" high threshold: %d dBm", high_rssi); + print_field(" high timeout: %d seconds", high_rssi_timeout); + print_field(" low threshold: %d dBm", low_rssi); + print_field(" low timeout: %d seconds", low_rssi_timeout); + + if (sampling_period == 0) + print_field(" sampling: propagate all (0x00)"); + else if (sampling_period == 0xff) + print_field(" sampling: just once (0xFF)"); + else + print_field(" sampling: every %d ms", 100 * sampling_period); + + print_field("Number of patterns: %d", pattern_count); + mgmt_print_adv_monitor_patterns(data + 8, size - 8); +} + static void mgmt_add_adv_monitor_patterns_rsp(const void *data, uint16_t size) { uint16_t handle = get_le16(data); @@ -13553,6 +13584,10 @@ static const struct mgmt_data mgmt_command_table[] = { { 0x0055, "Add Ext Adv Data", mgmt_add_ext_adv_data_cmd, 3, false, mgmt_add_ext_adv_data_rsp, 1, true }, + { 0x0056, "Add Advertisement Monitor With RSSI", + mgmt_add_adv_monitor_patterns_rssi_cmd, 8, + false, + mgmt_add_adv_monitor_patterns_rsp, 2, true}, { } };