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: 12022349 X-Patchwork-Delegate: luiz.dentz@gmail.com 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}, { } };