From patchwork Tue Jun 16 00:03:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Sun X-Patchwork-Id: 11606029 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CCE813A0 for ; Tue, 16 Jun 2020 00:03:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84CF42074D for ; Tue, 16 Jun 2020 00:03:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="H9Z6gsUB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726355AbgFPADd (ORCPT ); Mon, 15 Jun 2020 20:03:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725960AbgFPADa (ORCPT ); Mon, 15 Jun 2020 20:03:30 -0400 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 5DFC0C061A0E for ; Mon, 15 Jun 2020 17:03:29 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id b135so22802273yba.11 for ; Mon, 15 Jun 2020 17:03:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=0S8jfx64Oylkhow8HNw6DxJgN6A+Bkg1Tt/PI3xOWUk=; b=H9Z6gsUBUfayvmNtJumNBWi+1HvNh8zX6TV4OY2yjyg0yRJBJ0Iz6IEZ0FycinDWYB lgyprixhQjS/SqqVjM8kYyDFJRTK+WhtuN3YFSjafzJfwY83J/nDnGuUcrO6NWjs1oea /cA+sI/mwf75OCT917TO2UeRHoEp0/2QSZUe2yp4NRha6pPF9NDiY5HYaML+o6/JadvV 5XnKp7l9d4RL+Tc1Pg/LkCZQJeGuPScjzTivSj71g2mI7+/6l1ffIHG6Z1NPuabLT0DW nNi+sTUkDx361xA+TEVz/jXcW6Fcdy95wC7K+FX+BBvTOxWvmjADrLGEjBNdXJEkn4zB tLGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=0S8jfx64Oylkhow8HNw6DxJgN6A+Bkg1Tt/PI3xOWUk=; b=fydog5DgBAgMrkevmdbrT1HY8je9tKjT2CTUdKWg1b+Ghgfs3F9C0hGDsmldUhrijC tvukBIAxsW+EoMqTRTTxrwNACSxs3jw5/vAveM6qItzGU6BSzWjTbDRDpmdxnwmMkWQv NfVV60zFaUubPJZchogqqWR7UTnP6MUKxxjKG55xCFursch8R985a68aqqZbVX2psQ9f b57+7iPoJJ7ah5CVSbGUVAZ4h6kPRlOCrgY9hrQ1APuBCUI2KfLKLqtzsWakvA4R6Ow5 l9U+4L82JwGcEEdMs/kialN+EHIZPFzKtFFPVgrOA4fMq6aa8QMTlMxhwbUQE3jqdWon g6Qw== X-Gm-Message-State: AOAM533d3vjIJWN3uyG2izpnMpMwzE7PaLTHfWlWZbUE+SDj8RcwnQMU LgmyPHXPONxLOQ+jat+4S5GCC2s67L917cRgJBZ09L6McSlt3iEZb30sUe3KRXrX3rBjy6+yVE5 1CxtBuaYcFFIRLcbM70YednR30xlKezYNjaqUJdrQfyDJKqdlw9b2lbZtWB0pSU+hvK2N43Jg1W Ye0HaFrHBAxbI= X-Google-Smtp-Source: ABdhPJzZnSMswq5l2yb9BtBIBcXyfjEniV1RHFmljNpPC3kqcJFmsnrS1u7e/oQwo6MOfdphCoo+DrxObijcYbgXcQ== X-Received: by 2002:a25:2313:: with SMTP id j19mr175464ybj.144.1592265808520; Mon, 15 Jun 2020 17:03:28 -0700 (PDT) Date: Mon, 15 Jun 2020 17:03:16 -0700 In-Reply-To: <20200616000318.42664-1-michaelfsun@google.com> Message-Id: <20200616000318.42664-2-michaelfsun@google.com> Mime-Version: 1.0 References: <20200616000318.42664-1-michaelfsun@google.com> X-Mailer: git-send-email 2.27.0.290.gba653c62da-goog Subject: [bluez PATCH v1 1/3] btmgmt: Add btmgmt command advmon-features From: Michael Sun To: linux-bluetooth@vger.kernel.org Cc: luiz.von.dentz@intel.com, chromeos-bluetooth-upstreaming@chromium.org, mcchou@chromium.org, alainm@chromium.org, Michael Sun Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch introduces a new btmgmt command ‘advmon-features’ to help user query for supported advertisement features. The command will work with the new MGMT opcode MGMT_OP_READ_ADV_MONITOR_FEATURES. Reviewed-by: Alain Michaud Reviewed-by: Miao-chen Chou Signed-off-by: Michael Sun --- tools/btmgmt.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 46e7465b3..1aae7098c 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -4567,6 +4567,84 @@ static void cmd_wbs(int argc, char **argv) cmd_setting(MGMT_OP_SET_WIDEBAND_SPEECH, argc, argv); } +static const char *advmon_features_str[] = { + "Pattern monitor with logic OR.", +}; + +static const char *advmon_features2str(uint32_t features) +{ + static char str[512]; + int off, i; + + off = 0; + snprintf(str, sizeof(str), "\n\tNone"); + + for (i = 0; i < NELEM(advmon_features_str); i++) { + if ((features & (1 << i)) != 0 && off < sizeof(str)) + off += snprintf(str + off, sizeof(str) - off, "\n\t%s", + advmon_features_str[i]); + } + + return str; +} + +static void advmon_features_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_rp_read_adv_monitor_features *rp = param; + uint32_t supported_features, enabled_features; + uint16_t num_handles; + int i; + + if (status != MGMT_STATUS_SUCCESS) { + error("Reading adv monitor features failed with status 0x%02x " + "(%s)", status, mgmt_errstr(status)); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (len < sizeof(*rp)) { + error("Too small adv monitor features reply (%u bytes)", len); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + if (len < sizeof(*rp) + rp->num_handles * sizeof(uint16_t)) { + error("Handles count (%u) doesn't match reply length (%u)", + rp->num_handles, len); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + supported_features = le32_to_cpu(rp->supported_features); + enabled_features = le32_to_cpu(rp->enabled_features); + num_handles = le16_to_cpu(rp->num_handles); + + print("Supported features:%s", advmon_features2str(supported_features)); + print("Enabled features:%s", advmon_features2str(enabled_features)); + print("Max number of handles: %u", le16_to_cpu(rp->max_num_handles)); + print("Max number of patterns: %u", rp->max_num_patterns); + print("Handles list with %u item%s", num_handles, + num_handles == 0 ? "" : num_handles == 1 ? ":" : "s:"); + for (i = 0; i < num_handles; i++) { + print("\t0x%04x ", le16_to_cpu(rp->handles[i])); + } + + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static void cmd_advmon_features(int argc, char **argv) +{ + uint16_t index; + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + if (!mgmt_send(mgmt, MGMT_OP_READ_ADV_MONITOR_FEATURES, index, 0, NULL, + advmon_features_rsp, NULL, NULL)) { + error("Unable to send advertising monitor features command"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index) { mgmt_register(mgmt, MGMT_EV_CONTROLLER_ERROR, index, controller_error, @@ -4776,6 +4854,9 @@ static const struct bt_shell_menu main_menu = { cmd_expinfo, "Show experimental features" }, { "exp-debug", "", cmd_exp_debug, "Set debug feature" }, + { "advmon-features", NULL, + cmd_advmon_features, "Show advertisement monitor " + "features" }, {} }, }; From patchwork Tue Jun 16 00:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Sun X-Patchwork-Id: 11606031 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E61E313A0 for ; Tue, 16 Jun 2020 00:03:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD0A720707 for ; Tue, 16 Jun 2020 00:03:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="IT9pgTTQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726380AbgFPADe (ORCPT ); Mon, 15 Jun 2020 20:03:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726332AbgFPADc (ORCPT ); Mon, 15 Jun 2020 20:03:32 -0400 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 5B680C08C5C2 for ; Mon, 15 Jun 2020 17:03:31 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id f130so22671575yba.9 for ; Mon, 15 Jun 2020 17:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=nuit4bBIRBkyo+2krW4KL+PEr6ovVm41hSjXIW2cVh4=; b=IT9pgTTQtV/Ow0IediFSpgwJdUV07hQOY1rVuH54wSUoZFogEG+7zqUEmT2b4csGpD KAdhqkxHKNaZ+smcjUvSkESqd0eQDHPX7XWpIQW2x9qOF3BlHyAPA8YuptZ/LmtpMO0C 3w7V+jN7mOoUFjgFpCeXyW+WGH9LHX2x2ibz7yORcVWttS0QYS/zCUpU2HLMkeun/PNR Z1pwVAG6xH8MtkyoSwt6CfH3RGYwa+V7dymmxwXutsmqrw+OS+8zULZAdsEKyzmUbo9G G0pO4RiBFzeQ4Zl1IJcl5FtUGRTHrXfsCmZNTb7kk+j5vUDn12H/Ji8sdHBZTMCgO2Cw BArQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=nuit4bBIRBkyo+2krW4KL+PEr6ovVm41hSjXIW2cVh4=; b=Dnh+26i+G2OamUuNFvguGCU/+oewnWUQs5oV/DYK6iKZPX722EkB6z4SQHt4jHVcJ0 Wlzq0gwnmvGK7RgdhhVmZn0/1gA+H9MxQjdsAla/DqsJXs3DZ2g0Rv2ExKzgjdJI/W9y g9Z0DgB5TUsMCi3jfh0XKeR1Jw1fWzfTT8BIV3793EqzjBPGK6bZK/b+dzdsGmXAjoXD hwbIN134XPM8X+VrzEBp4mZENfPuvPhYwbKXpWq4k9dVwhLv3qTFQUlAPyxvchGre0q8 0QNuwglyGTg/Z3wYMh/bU+Mq7E9R1zIHagFnLHW2Bd4ttjC6JF9Sp9hcR4L00R3kVc61 YhBg== X-Gm-Message-State: AOAM532TbPA/fVAh4XTC0Mte7XljJHM91MdxMHGdQXc9qW0wa1nJAFDr NKKi47Vi+jbBYAJbOE8z3BfOzHEOEcagoPqPY1gNVcOOQ8/c3PFiYtRlqgrr/JVwu0h5/+k2Fth LOW+jUYPTK4uDwsUVtAG4d2zbyF45wRNwA0aWkz2Ys+dQSAMTXJ78Mj+XxnQIRB3JUAs2Ziu2zK /XuuUlSqcIaTc= X-Google-Smtp-Source: ABdhPJzpbFOtaoKCv94D6MK9NqWdp467iokuC5/s4FVgpVZmB5XF6DGwVXW1QNh5UTyNqv5lscwIISWcYW3s97he7A== X-Received: by 2002:a25:50cc:: with SMTP id e195mr135590ybb.452.1592265810284; Mon, 15 Jun 2020 17:03:30 -0700 (PDT) Date: Mon, 15 Jun 2020 17:03:17 -0700 In-Reply-To: <20200616000318.42664-1-michaelfsun@google.com> Message-Id: <20200616000318.42664-3-michaelfsun@google.com> Mime-Version: 1.0 References: <20200616000318.42664-1-michaelfsun@google.com> X-Mailer: git-send-email 2.27.0.290.gba653c62da-goog Subject: [bluez PATCH v1 2/3] btmgmt: Add btmgmt command advmon-remove From: Michael Sun To: linux-bluetooth@vger.kernel.org Cc: luiz.von.dentz@intel.com, chromeos-bluetooth-upstreaming@chromium.org, mcchou@chromium.org, alainm@chromium.org, Michael Sun Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch introduces a new btmgmt command ‘advmon-remove’ to allow users to remove previously added filters along with a event handler to handle kernel issued MGMT_EV_ADV_MONITOR_REMOVED event. The command will work with the new MGMT opcode MGMT_OP_REMOVE_ADV_MONITOR. Reviewed-by: Alain Michaud Reviewed-by: Miao-chen Chou Signed-off-by: Michael Sun --- tools/btmgmt.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 1aae7098c..719e92196 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -1013,6 +1013,19 @@ static void advertising_removed(uint16_t index, uint16_t len, print("hci%u advertising_removed: instance %u", index, ev->instance); } +static void advmon_removed(uint16_t index, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_ev_adv_monitor_removed *ev = param; + + if (len < sizeof(*ev)) { + error("Too small (%u bytes) advmon_removed event", len); + return; + } + + print("hci%u advmon_removed: handle %u", index, ev->monitor_handle); +} + static void version_rsp(uint8_t status, uint16_t len, const void *param, void *user_data) { @@ -4645,6 +4658,44 @@ static void cmd_advmon_features(int argc, char **argv) } } +static void advmon_remove_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_rp_remove_adv_monitor *rp = param; + + if (status != MGMT_STATUS_SUCCESS) { + error("Could not remove advertisement monitor with status " + "0x%02x (%s)", status, mgmt_errstr(status)); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + print("Advertisement monitor with handle: 0x%04x removed", + rp->monitor_handle); + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static void cmd_advmon_remove(int argc, char **argv) +{ + struct mgmt_cp_remove_adv_monitor cp; + uint16_t index, monitor_handle; + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + if (sscanf(argv[1], "%hx", &monitor_handle) != 1) { + error("Wrong formatted handle argument"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + cp.monitor_handle = monitor_handle; + if (mgmt_send(mgmt, MGMT_OP_REMOVE_ADV_MONITOR, index, sizeof(cp), &cp, + advmon_remove_rsp, NULL, NULL) == 0) { + error("Unable to send appearance cmd"); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } +} + static void register_mgmt_callbacks(struct mgmt *mgmt, uint16_t index) { mgmt_register(mgmt, MGMT_EV_CONTROLLER_ERROR, index, controller_error, @@ -4697,6 +4748,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_ADV_MONITOR_REMOVED, index, advmon_removed, + NULL, NULL); } static void cmd_select(int argc, char **argv) @@ -4857,6 +4910,8 @@ static const struct bt_shell_menu main_menu = { { "advmon-features", NULL, cmd_advmon_features, "Show advertisement monitor " "features" }, + { "advmon-remove", "", + cmd_advmon_remove, "Remove advertisement monitor " }, {} }, }; From patchwork Tue Jun 16 00:03:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Sun X-Patchwork-Id: 11606033 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2DE6613B1 for ; Tue, 16 Jun 2020 00:03:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 154E720707 for ; Tue, 16 Jun 2020 00:03:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="MMIyZLpP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726384AbgFPADf (ORCPT ); Mon, 15 Jun 2020 20:03:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725960AbgFPADd (ORCPT ); Mon, 15 Jun 2020 20:03:33 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 32C5BC061A0E for ; Mon, 15 Jun 2020 17:03:33 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id k23so15411583qtb.2 for ; Mon, 15 Jun 2020 17:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc:content-transfer-encoding; bh=P8sypJtpBIoUK0gFq2shspleE46NBUSITI+9t3y6wLg=; b=MMIyZLpP7PvVUwB/FzkBHtZ6KEedPwelOp68ZTf1r6vx/2QiVYa2oqGzdOaBHFJVBH FUScv8X3shOPWG8sn8TF0BeZxJjlRhcbMTXwhemtd77X4mzRG97SZub1pk+4994CQEYP LuizN6saipNAPRCGXQ1EWXHqnsl0XPnCTu84RSQSILLP3pMhsipQaViWWzmJeiRufHgb 1mpoCf0+hm2bDcY0Z3Srg0jpiu47jU1UfTfyh91rYDvmfQDl3jVSoI0hv0FtU7P+q/0c 1fIGnqbRJ3z/Ea4fg6P8VDncYrv2X573D/QpSE8C8cmikYn82hg0O9WFJaPqfBbdl7WZ 13IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc:content-transfer-encoding; bh=P8sypJtpBIoUK0gFq2shspleE46NBUSITI+9t3y6wLg=; b=f66LohLqye42cpMs++7+dnijYIni9kprBQ0por9k6SiN3wUccC7zENLPM3Dv3XGJg8 WIgoY5WToDDlkfPp7bkEJSHuQcYQOhpAE8nKmJFGJzYmPNnAmEZpTe9oulEAnL8A50Rl 0g7wHSFFVvrH8ykOQ2WpF2g9hyE/8F5iXH+jokkp5HcN2VQXQ7daijianLcv5fvbMHyt 5OHg1MMffjZc0eqOvjeR51oOMSx/u+I+tu7RAU05mSVITOgLhobEMldJxxRHEYCH1gqO sCHc6ssActz15GcaHtPhZpRbHnPL0U+hS6o87MdGud1Dvsi/20g7QdB4n01mTRbVncxf foLg== X-Gm-Message-State: AOAM532iZg8TNbhZZ67HaZLKMydS7d+JaRHeT2PU1tJa8/nHvHFTWSDB OO/kgPHWJ6KFJlH4GD9dK65uvItl+2uoz/d/j0ZlAPIAxCyf+Nzhdm0OxKOY5KKgpRD7fw/Df5m mIjyL8t6Kvhaf7X28cz2SFEBPIvYf8t7PZPU0u5QeHS8OiEwwzRcBO/yd4mK87K7Bu0/WU/ki1w 22PDQ1KNrrNSo= X-Google-Smtp-Source: ABdhPJyZaKVjhYo7XFEMHBD10vphC0JtgA0K1wrMJ3iAznPOE3d35mzJuiL8OrpiIxbBNDnWlSFtfBw2EWkD/hJUXA== X-Received: by 2002:ad4:552b:: with SMTP id ba11mr278705qvb.145.1592265812333; Mon, 15 Jun 2020 17:03:32 -0700 (PDT) Date: Mon, 15 Jun 2020 17:03:18 -0700 In-Reply-To: <20200616000318.42664-1-michaelfsun@google.com> Message-Id: <20200616000318.42664-4-michaelfsun@google.com> Mime-Version: 1.0 References: <20200616000318.42664-1-michaelfsun@google.com> X-Mailer: git-send-email 2.27.0.290.gba653c62da-goog Subject: [bluez PATCH v1 3/3] btmgmt: Add btmgmt command advmon-add From: Michael Sun To: linux-bluetooth@vger.kernel.org Cc: luiz.von.dentz@intel.com, chromeos-bluetooth-upstreaming@chromium.org, mcchou@chromium.org, alainm@chromium.org, Michael Sun Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This patch introduces a new btmgmt command ‘advmon-add’ to allow users to add advertisement monitor filters and return monitor handlers. An event handler is also added to handle kernel issued MGMT_EV_ADV_MONITOR_ADDED events. The command will work with the new MGMT opcode MGMT_OP_ADD_ADV_MONITOR. This patch only adds support for adding pattern based filters. Reviewed-by: Alain Michaud Reviewed-by: Miao-chen Chou Signed-off-by: Michael Sun --- tools/btmgmt.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 719e92196..2bdaf03fa 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -1013,6 +1013,19 @@ static void advertising_removed(uint16_t index, uint16_t len, print("hci%u advertising_removed: instance %u", index, ev->instance); } +static void advmon_added(uint16_t index, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_ev_adv_monitor_added *ev = param; + + if (len < sizeof(*ev)) { + error("Too small (%u bytes) advmon_removed event", len); + return; + } + + print("hci%u advmon_added: handle %u", index, ev->monitor_handle); +} + static void advmon_removed(uint16_t index, uint16_t len, const void *param, void *user_data) { @@ -4658,6 +4671,147 @@ static void cmd_advmon_features(int argc, char **argv) } } +static void advmon_add_rsp(uint8_t status, uint16_t len, const void *param, + void *user_data) +{ + const struct mgmt_rp_add_adv_patterns_monitor *rp = param; + + if (status != MGMT_STATUS_SUCCESS) { + error("Could not add advertisement monitor with status " + "0x%02x (%s)", status, mgmt_errstr(status)); + return bt_shell_noninteractive_quit(EXIT_FAILURE); + } + + print("Advertisement monitor with handle:0x%04x added", + rp->monitor_handle); + return bt_shell_noninteractive_quit(EXIT_SUCCESS); +} + +static bool str2pattern(struct mgmt_adv_pattern *pattern, const char *str) +{ + int type_len, offset_len, offset_end_pos, length, str_len; + int i, j; + char pattern_str[62] = { 0 }; + char tmp; + + if (sscanf(str, "%2hhx%n:%2hhx%n:%s", &pattern->ad_type, &type_len, + &pattern->offset, &offset_end_pos, pattern_str) != 3) + return false; + + offset_len = offset_end_pos - type_len - 1; + str_len = strlen(pattern_str); + pattern->length = str_len / 2 + str_len % 2; + + if (type_len > 2 || offset_len > 2 || + pattern->offset + pattern->length > 31) + return false; + + for (i = 0, j = 0; i < str_len; i++, j++) { + if (!sscanf(&pattern_str[i++], "%2hhx", &pattern->value[j])) + return false; + if (i < str_len && !sscanf(&pattern_str[i], "%1hhx", &tmp)) + return false; + } + + return true; +} + +static void advmon_add_usage(void) +{ + bt_shell_usage(); + print("Options:\n" + "\t -P, --pattern " + "Advertising Data bytes\n" + "Monitor Types:\n" + "\t -p, --pattern-monitor " + "Pattern Monitor\n" + "e.g.:\n" + "\tadvmon-add -P 0:1:c504 -P 1:a:9a55beef -p"); +} + +static struct option advmon_add_options[] = + { { "help", 0, 0, 'h' }, + { "pattern-monitor", 0, 0, 'p' }, + { "pattern", 1, 0, 'P' }, + { 0, 0, 0, 0 } }; + +static void cmd_advmon_add(int argc, char **argv) +{ + + uint16_t index; + void *cp = NULL; + struct mgmt_adv_pattern *patterns = NULL; + int opt, i; + int pattern_count = 0, patterns_len, cp_len; + bool success = false, type_selected = false; + + index = mgmt_index; + if (index == MGMT_INDEX_NONE) + index = 0; + + while ((opt = getopt_long(argc, argv, "P:ph", advmon_add_options, + NULL)) != -1) { + switch (opt) { + case 'P': + patterns_len = (pattern_count + 1) * + sizeof(struct mgmt_adv_pattern); + patterns = realloc(patterns, patterns_len); + + if (!str2pattern(&patterns[pattern_count++], optarg)) { + error("Failed to parse monitor patterns."); + goto done; + } + break; + case 'p': + if (!pattern_count) { + advmon_add_usage(); + goto done; + } + cp_len = + sizeof(struct mgmt_cp_add_adv_patterns_monitor) + + patterns_len; + cp = realloc(cp, cp_len); + + ((struct mgmt_cp_add_adv_patterns_monitor *)cp) + ->pattern_count = pattern_count; + + memcpy(((struct mgmt_cp_add_adv_patterns_monitor *)cp) + ->patterns, patterns, patterns_len); + type_selected = true; + break; + case 'h': + success = true; + /* fall through */ + default: + advmon_add_usage(); + goto done; + } + } + + argc -= optind; + argv += optind; + + if (argc || !type_selected) { + advmon_add_usage(); + 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"); + goto done; + } + + success = true; + +done: + optind = 0; + free(patterns); + free(cp); + if (!success) + bt_shell_noninteractive_quit(EXIT_FAILURE); +} + static void advmon_remove_rsp(uint8_t status, uint16_t len, const void *param, void *user_data) { @@ -4748,6 +4902,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_ADV_MONITOR_ADDED, index, advmon_added, + NULL, NULL); mgmt_register(mgmt, MGMT_EV_ADV_MONITOR_REMOVED, index, advmon_removed, NULL, NULL); } @@ -4910,6 +5066,8 @@ static const struct bt_shell_menu main_menu = { { "advmon-features", NULL, cmd_advmon_features, "Show advertisement monitor " "features" }, + { "advmon-add", "[options] <-p|-h>", + cmd_advmon_add, "Add advertisement monitor " }, { "advmon-remove", "", cmd_advmon_remove, "Remove advertisement monitor " }, {} },