From patchwork Wed Sep 7 19:14:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Gix X-Patchwork-Id: 604606 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5B2FC54EE9 for ; Wed, 7 Sep 2022 19:15:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229472AbiIGTPM (ORCPT ); Wed, 7 Sep 2022 15:15:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229822AbiIGTPG (ORCPT ); Wed, 7 Sep 2022 15:15:06 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09CC65A3CA for ; Wed, 7 Sep 2022 12:15:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662578104; x=1694114104; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=3/Is8Ta2Wze6VCsK5CfSxbJAZUh8B1jwDalKJy2A2zQ=; b=cOwSxWqbB5JbwYC3PKLLIl+Km/cBXJkR2vOxBA1OhEVCpyR01+FGY33E 5161cl0HgAi5IfHmVhL9QehQsVYQDSao8lLHd9htLHbLZlMd1LwHfhnB9 vh6kR475DtFqGQH60oUMqK30LZOX6X379vT2kM0P7FPubk1nf7YAiJ4H5 /PAQz9NW+6AdiJLEoZTryOfo8X3vmTc6eUsGFfTIK3/Gy+ogutdSy8q7l EctC/NM64Eip8g3XV36UrUyWnzr1JMoEvEgpymhOPggG3NvRy//wmzr9z XoPhyg9NppcakEqJjXfOku5LE69YDZSh6Y4V/BgR8+6O0MTa73sGw+eV/ w==; X-IronPort-AV: E=McAfee;i="6500,9779,10463"; a="360938874" X-IronPort-AV: E=Sophos;i="5.93,297,1654585200"; d="scan'208";a="360938874" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 12:15:02 -0700 X-IronPort-AV: E=Sophos;i="5.93,297,1654585200"; d="scan'208";a="644755639" Received: from jsanch3-desk4.amr.corp.intel.com (HELO bgi1-mobl2.amr.corp.intel.com) ([10.212.92.69]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 12:15:02 -0700 From: Brian Gix To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, brian.gix@intel.com Subject: [PATCH BlueZ 1/2] Bluetooth: Add ADV Monitor events to btmon parser Date: Wed, 7 Sep 2022 12:14:49 -0700 Message-Id: <20220907191450.38262-1-brian.gix@intel.com> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Signed-off-by: Brian Gix --- monitor/packet.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/monitor/packet.c b/monitor/packet.c index 46587e087..7447e1565 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -14914,6 +14914,37 @@ static void mgmt_controller_resume_evt(const void *data, uint16_t size) mgmt_print_address(data, addr_type); } +static void mgmt_adv_monitor_device_found_evt(const void *data, uint16_t size) +{ + uint8_t handle = get_le16(data); + const uint8_t *addr = data + 2; + uint8_t addr_type = get_u8(data + 8); + int8_t rssi = get_s8(data + 9); + uint32_t flags = get_le32(data + 10); + uint16_t ad_data_len = get_le16(data + 14); + const uint8_t *ad_data = data + 16; + + print_field("Handle: %d", handle); + print_bdaddr(addr); + print_field("Addr Type: %d", addr_type); + print_field("RSSI: %d", rssi); + mgmt_print_device_flags(flags); + print_field("AD Data Len: %d", ad_data_len); + size -= 16; + print_hex_field("AD Data: ", ad_data, size); +} + +static void mgmt_adv_monitor_device_lost_evt(const void *data, uint16_t size) +{ + uint8_t handle = get_le16(data); + const uint8_t *addr = data + 2; + uint8_t addr_type = get_u8(data + 8); + + print_field("Handle: %d", handle); + print_bdaddr(addr); + print_field("Addr Type: %d", addr_type); +} + static const struct mgmt_data mgmt_event_table[] = { { 0x0001, "Command Complete", mgmt_command_complete_evt, 3, false }, @@ -15003,6 +15034,10 @@ static const struct mgmt_data mgmt_event_table[] = { mgmt_controller_suspend_evt, 1, true }, { 0x002e, "Controller Resumed", mgmt_controller_resume_evt, 8, true }, + { 0x002f, "ADV Monitor Device Found", + mgmt_adv_monitor_device_found_evt, 16, false }, + { 0x0030, "Controller Resumed", + mgmt_adv_monitor_device_lost_evt, 9, true }, { } }; From patchwork Wed Sep 7 19:14:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Gix X-Patchwork-Id: 603474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B487C6FA83 for ; Wed, 7 Sep 2022 19:15:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229869AbiIGTPN (ORCPT ); Wed, 7 Sep 2022 15:15:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229880AbiIGTPI (ORCPT ); Wed, 7 Sep 2022 15:15:08 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D9946CF5E for ; Wed, 7 Sep 2022 12:15:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1662578106; x=1694114106; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=FbVrbF50J5aXWFbdzsmp2nJ6EfgMOS2vh4yrlSWxq38=; b=VgRoUz232eVEU3n1cK0xM947lWNFVKkymRH6hhQqjXNt9ahsFz5nMTij L3pngKLVZdTxhBlLG25KBsosKJQiusE7tW5+maf7Q/Lx6mT9Pio12xCeh JDub7ij/iSwD5fR11X/R34AR3Mk6DbKLlrYqCW9skosWTYd3mSINXZy74 S7+YP0PDFA9sI/ZGYyZCoNdPAN40MTIhumBX0q1b4aaPSwlB2rWUu57ea erZUxFXVRuA0uPL0SNJJnqeqcf5gMvV4FSFkOasNfedwRqq8wij16llpD VQH/FXQtJpYcarVeBxYg4LzcMrll2vDFBxovKdPGyFlrAAgaW4ImeA3wI Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10463"; a="360938877" X-IronPort-AV: E=Sophos;i="5.93,297,1654585200"; d="scan'208";a="360938877" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 12:15:02 -0700 X-IronPort-AV: E=Sophos;i="5.93,297,1654585200"; d="scan'208";a="644755644" Received: from jsanch3-desk4.amr.corp.intel.com (HELO bgi1-mobl2.amr.corp.intel.com) ([10.212.92.69]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Sep 2022 12:15:02 -0700 From: Brian Gix To: linux-bluetooth@vger.kernel.org Cc: luiz.dentz@gmail.com, brian.gix@intel.com Subject: [PATCH BlueZ 2/2] Bluetooth: Add mesh MGMT cmds/events to btmon parser Date: Wed, 7 Sep 2022 12:14:50 -0700 Message-Id: <20220907191450.38262-2-brian.gix@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220907191450.38262-1-brian.gix@intel.com> References: <20220907191450.38262-1-brian.gix@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Signed-off-by: Brian Gix --- monitor/packet.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/monitor/packet.c b/monitor/packet.c index 7447e1565..9d4a5e50d 100644 --- a/monitor/packet.c +++ b/monitor/packet.c @@ -14191,6 +14191,74 @@ static void mgmt_remove_adv_monitor_patterns_rsp(const void *data, print_field("Handle: %d", handle); } +static void mgmt_set_mesh_receiver_cmd(const void *data, uint16_t size) +{ + uint8_t enable = get_u8(data); + uint16_t window = get_le16(data + 1); + uint16_t period = get_le16(data + 3); + uint8_t num_ad_types = get_u8(data + 5); + const uint8_t *ad_types = data + 6; + + print_field("Enable: %d", enable); + print_field("Window: %d", window); + print_field("Period: %d", period); + print_field("Num AD Types: %d", num_ad_types); + size -= 6; + + while (size--) + print_field(" AD Type: %d", *ad_types++); +} + +static void mgmt_read_mesh_features_rsp(const void *data, uint16_t size) +{ + uint16_t index = get_le16(data); + uint8_t max_handles = get_u8(data + 2); + uint8_t used_handles = get_u8(data + 3); + const uint8_t *handles = data + 4; + + print_field("Index: %d", index); + print_field("Max Handles: %d", max_handles); + print_field("Used Handles: %d", used_handles); + size -= 4; + + while (size--) + print_field(" Used Handle: %d", *handles++); +} + +static void mgmt_mesh_send_cmd(const void *data, uint16_t size) +{ + const uint8_t *addr = data; + uint8_t addr_type = get_u8(data + 6); + uint64_t instant = get_le64(data + 7); + uint16_t delay = get_le16(data + 15); + uint8_t cnt = get_u8(data + 17); + uint8_t adv_data_len = get_u8(data + 18); + + data += 19; + size -= 19; + print_bdaddr(addr); + print_field("Addr Type: %d", addr_type); + print_field("Instant: 0x%16.16" PRIx64, instant); + print_field("Delay: %d", delay); + print_field("Count: %d", cnt); + print_field("Data Length: %d", adv_data_len); + print_hex_field("Data: ", data, size); +} + +static void mgmt_mesh_send_rsp(const void *data, uint16_t size) +{ + uint8_t handle = get_u8(data); + + print_field("Handle: %d", handle); +} + +static void mgmt_mesh_send_cancel_cmd(const void *data, uint16_t size) +{ + uint8_t handle = get_u8(data); + + print_field("Handle: %d", handle); +} + struct mgmt_data { uint16_t opcode; const char *str; @@ -14448,6 +14516,18 @@ static const struct mgmt_data mgmt_command_table[] = { mgmt_add_adv_monitor_patterns_rssi_cmd, 8, false, mgmt_add_adv_monitor_patterns_rsp, 2, true}, + { 0x0057, "Set Mesh Receiver", + mgmt_set_mesh_receiver_cmd, 6, false, + mgmt_null_rsp, 0, true}, + { 0x0058, "Read Mesh Features", + mgmt_null_cmd, 0, true, + mgmt_read_mesh_features_rsp, 4, false}, + { 0x0059, "Mesh Send", + mgmt_mesh_send_cmd, 19, false, + mgmt_mesh_send_rsp, 1, true}, + { 0x0056, "Mesh Send Cancel", + mgmt_mesh_send_cancel_cmd, 1, true, + mgmt_null_rsp, 0, true}, { } }; @@ -14945,6 +15025,33 @@ static void mgmt_adv_monitor_device_lost_evt(const void *data, uint16_t size) print_field("Addr Type: %d", addr_type); } +static void mgmt_mesh_device_found_evt(const void *data, uint16_t size) +{ + const uint8_t *addr = data; + uint8_t addr_type = get_u8(data + 6); + int8_t rssi = get_s8(data + 7); + uint64_t instant = get_le64(data + 8); + uint32_t flags = get_le32(data + 16); + uint16_t eir_len = get_le16(data + 20); + const uint8_t *eir_data = data + 22; + + print_bdaddr(addr); + print_field("Addr Type: %d", addr_type); + print_field("RSSI: %d", rssi); + print_field("Instant: 0x%16.16" PRIx64, instant); + mgmt_print_device_flags(flags); + print_field("EIR Length: %d", eir_len); + size -= 22; + print_hex_field("EIR Data: ", eir_data, size); +} + +static void mgmt_mesh_packet_cmplt_evt(const void *data, uint16_t size) +{ + uint8_t handle = get_u8(data); + + print_field("Handle: %d", handle); +} + static const struct mgmt_data mgmt_event_table[] = { { 0x0001, "Command Complete", mgmt_command_complete_evt, 3, false }, @@ -15038,6 +15145,10 @@ static const struct mgmt_data mgmt_event_table[] = { mgmt_adv_monitor_device_found_evt, 16, false }, { 0x0030, "Controller Resumed", mgmt_adv_monitor_device_lost_evt, 9, true }, + { 0x0031, "Mesh Device Found", + mgmt_mesh_device_found_evt, 22, false }, + { 0x0032, "Mesh Packet Complete", + mgmt_mesh_packet_cmplt_evt, 1, true }, { } };