* [PATCH v2 1/2] monitor: Add packet definitions for MSFT extension
@ 2021-10-14 0:57 Luiz Augusto von Dentz
2021-10-14 0:57 ` [PATCH v2 2/2] monitor: Make use of MSFT packet definitions Luiz Augusto von Dentz
2021-10-14 1:28 ` [v2,1/2] monitor: Add packet definitions for MSFT extension bluez.test.bot
0 siblings, 2 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2021-10-14 0:57 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This adds proper packet definitions for command and response of MSFT
extension.
---
monitor/msft.h | 148 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 148 insertions(+)
diff --git a/monitor/msft.h b/monitor/msft.h
index a268f4bc7..90a64117a 100644
--- a/monitor/msft.h
+++ b/monitor/msft.h
@@ -24,6 +24,154 @@
#include <stdint.h>
+#define MSFT_SUBCMD_READ_SUPPORTED_FEATURES 0x00
+
+struct msft_cmd_read_supported_features {
+ uint8_t subcmd;
+} __attribute__((packed));
+
+struct msft_rsp_read_supported_features {
+ uint8_t status;
+ uint8_t subcmd;
+ uint8_t features[8];
+ uint8_t evt_prefix_len;
+ uint8_t evt_prefix[];
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_MONITOR_RSSI 0x01
+
+struct msft_cmd_monitor_rssi {
+ uint8_t subcmd;
+ uint16_t handle;
+ int8_t rssi_high;
+ int8_t rssi_low;
+ uint8_t rssi_low_interval;
+ uint8_t rssi_period;
+} __attribute__((packed));
+
+struct msft_rsp_monitor_rssi {
+ uint8_t status;
+ uint8_t subcmd;
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_CANCEL_MONITOR_RSSI 0x02
+
+struct msft_cmd_cancel_monitor_rssi {
+ uint8_t subcmd;
+ uint16_t handle;
+} __attribute__((packed));
+
+struct msft_rsp_cancel_monitor_rssi {
+ uint8_t status;
+ uint8_t subcmd;
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03
+
+struct msft_le_monitor_pattern {
+ uint8_t len;
+ uint8_t type;
+ uint8_t start;
+ uint8_t data[];
+} __attribute__((packed));
+
+struct msft_le_monitor_adv_pattern_type {
+ uint8_t num_patterns;
+ struct msft_le_monitor_pattern data[];
+} __attribute__((packed));
+
+struct msft_le_monitor_adv_uuid_type {
+ uint8_t type;
+ union {
+ uint16_t u16;
+ uint32_t u32;
+ uint8_t u128[8];
+ } value;
+} __attribute__((packed));
+
+struct msft_le_monitor_adv_irk_type {
+ uint8_t irk[8];
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_LE_MONITOR_ADV_ADDR 0x04
+struct msft_le_monitor_adv_addr {
+ uint8_t type;
+ uint8_t addr[6];
+} __attribute__((packed));
+
+struct msft_cmd_le_monitor_adv {
+ uint8_t subcmd;
+ int8_t rssi_low;
+ int8_t rssi_high;
+ uint8_t rssi_low_interval;
+ uint8_t rssi_period;
+ uint8_t type;
+ uint8_t data[];
+} __attribute__((packed));
+
+struct msft_rsp_le_monitor_adv {
+ uint8_t status;
+ uint8_t subcmd;
+ uint8_t handle;
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_LE_CANCEL_MONITOR_ADV 0x04
+
+struct msft_cmd_le_cancel_monitor_adv {
+ uint8_t subcmd;
+ uint8_t handle;
+} __attribute__((packed));
+
+struct msft_rsp_le_cancel_monitor_adv {
+ uint8_t status;
+ uint8_t subcmd;
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_LE_MONITOR_ADV_ENABLE 0x05
+
+struct msft_cmd_le_monitor_adv_enable {
+ uint8_t subcmd;
+ uint8_t enable;
+} __attribute__((packed));
+
+struct msft_rsp_le_monitor_adv_enable {
+ uint8_t status;
+ uint8_t subcmd;
+} __attribute__((packed));
+
+#define MSFT_SUBCMD_READ_ABS_RSSI 0x06
+
+struct msft_cmd_read_abs_rssi {
+ uint8_t subcmd;
+ uint16_t handle;
+} __attribute__((packed));
+
+struct msft_rsp_read_abs_rssi {
+ uint8_t status;
+ uint8_t subcmd;
+ uint16_t handle;
+ uint8_t rssi;
+} __attribute__((packed));
+
+#define MSFT_SUBEVT_RSSI 0x01
+
+struct msft_evt_rssi {
+ uint8_t subevt;
+ uint8_t status;
+ uint16_t handle;
+ uint8_t rssi;
+} __attribute__((packed));
+
+#define MSFT_SUBEVT_MONITOR_DEVICE 0x02
+
+struct msft_evt_monitor_device {
+ uint8_t subevt;
+ uint8_t addr_type;
+ uint8_t addr[6];
+ uint8_t handle;
+ uint8_t state;
+} __attribute__((packed));
+
struct vendor_ocf;
struct vendor_evt;
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] monitor: Make use of MSFT packet definitions
2021-10-14 0:57 [PATCH v2 1/2] monitor: Add packet definitions for MSFT extension Luiz Augusto von Dentz
@ 2021-10-14 0:57 ` Luiz Augusto von Dentz
2021-10-14 1:28 ` [v2,1/2] monitor: Add packet definitions for MSFT extension bluez.test.bot
1 sibling, 0 replies; 3+ messages in thread
From: Luiz Augusto von Dentz @ 2021-10-14 0:57 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This make use of the packet definitions for MSFT extension.
---
monitor/msft.c | 144 ++++++++++++++++++++++++++++++++++++++++---------
monitor/msft.h | 11 ++--
2 files changed, 125 insertions(+), 30 deletions(-)
diff --git a/monitor/msft.c b/monitor/msft.c
index 46e765489..ccb232f3b 100644
--- a/monitor/msft.c
+++ b/monitor/msft.c
@@ -30,6 +30,9 @@
#include <stdio.h>
#include <inttypes.h>
+#include "lib/bluetooth.h"
+#include "lib/uuid.h"
+
#include "src/shared/util.h"
#include "display.h"
#include "packet.h"
@@ -49,46 +52,132 @@ static void null_rsp(const void *data, uint16_t size)
static void read_supported_features_rsp(const void *data, uint16_t size)
{
- uint8_t evt_prefix_len = get_u8(data + 8);
+ const struct msft_rsp_read_supported_features *rsp = data;
+
+ packet_print_features_msft(rsp->features);
+ print_field("Event prefix length: %u", rsp->evt_prefix_len);
+ print_field("Event prefix:");
+ packet_hexdump(rsp->evt_prefix, rsp->evt_prefix_len);
+ packet_set_msft_evt_prefix(rsp->evt_prefix, rsp->evt_prefix_len);
+}
+
+static void monitor_rssi_cmd(const void *data, uint16_t size)
+{
+ const struct msft_cmd_monitor_rssi *cmd = data;
+
+ print_field("Connection handle: 0x%04x", cmd->handle);
+ packet_print_rssi("RSSI threshold high", cmd->rssi_high);
+ packet_print_rssi("RSSI threshold low", cmd->rssi_low);
+ print_field("RSSI threshold low time interval: %u sec (0x%2.2x)",
+ cmd->rssi_low_interval,
+ cmd->rssi_low_interval);
+ print_field("RSSI sampling period: %u msec (0x%2.2x)",
+ cmd->rssi_period * 100,
+ cmd->rssi_period);
+}
- packet_print_features_msft(data);
- print_field("Event prefix length: %u", evt_prefix_len);
- packet_hexdump(data + 9, size - 9);
+static void cancel_monitor_rssi_cmd(const void *data, uint16_t size)
+{
+ const struct msft_cmd_cancel_monitor_rssi *cmd = data;
- packet_set_msft_evt_prefix(data + 9, evt_prefix_len);
+ print_field("Connection handle: 0x%04x", cmd->handle);
}
static void le_monitor_advertisement_cmd(const void *data, uint16_t size)
{
- int8_t threshold_high = get_s8(data);
- int8_t threshold_low = get_s8(data + 1);
- uint8_t threshold_low_time_interval = get_u8(data + 2);
- uint8_t sampling_period = get_u8(data + 3);
+ const struct msft_cmd_le_monitor_adv *cmd = data;
+ const struct msft_le_monitor_adv_patterns *patterns;
+ const struct msft_le_monitor_adv_uuid *uuid;
+ const struct msft_le_monitor_adv_irk *irk;
+ const struct msft_le_monitor_adv_addr *addr;
+ const char *str;
+ char uuidstr[MAX_LEN_UUID_STR];
- packet_print_rssi("RSSI threshold high", threshold_high);
- packet_print_rssi("RSSI threshold low", threshold_low);
+ packet_print_rssi("RSSI threshold high", cmd->rssi_high);
+ packet_print_rssi("RSSI threshold low", cmd->rssi_low);
print_field("RSSI threshold low time interval: %u sec (0x%2.2x)",
- threshold_low_time_interval,
- threshold_low_time_interval);
+ cmd->rssi_low_interval,
+ cmd->rssi_low_interval);
print_field("RSSI sampling period: %u msec (0x%2.2x)",
- sampling_period * 100,
- sampling_period);
- packet_hexdump(data + 4, size - 4);
+ cmd->rssi_period * 100,
+ cmd->rssi_period);
+
+ switch (cmd->type) {
+ case MSFT_SUBCMD_LE_MONITOR_ADV_PATTERN:
+ print_field("Type: Pattern (0x%2.2x)", cmd->type);
+ patterns = (void *)cmd->data;
+ print_field("Number of patterns: %u", patterns->num);
+ packet_hexdump((void *)patterns->data,
+ size - (sizeof(*cmd) + sizeof(*patterns)));
+ break;
+ case MSFT_SUBCMD_LE_MONITOR_ADV_UUID:
+ print_field("Type: UUID (0x%2.2x)", cmd->type);
+ uuid = (void *)cmd->data;
+
+ switch (uuid->type) {
+ case 0x01:
+ str = bt_uuid16_to_str(uuid->value.u16);
+ print_field("UUID: %s (0x%4.4x)", str, uuid->value.u16);
+ break;
+ case 0x02:
+ str = bt_uuid32_to_str(uuid->value.u32);
+ print_field("UUID: %s (0x%8.8x)", str, uuid->value.u32);
+ break;
+ case 0x03:
+ sprintf(uuidstr, "%8.8x-%4.4x-%4.4x-%4.4x-%8.8x%4.4x",
+ get_le32(uuid->value.u128 + 12),
+ get_le16(uuid->value.u128 + 10),
+ get_le16(uuid->value.u128 + 8),
+ get_le16(uuid->value.u128 + 6),
+ get_le32(uuid->value.u128 + 2),
+ get_le16(uuid->value.u128 + 0));
+ str = bt_uuidstr_to_str(uuidstr);
+ print_field("UUID: %s (%s)", str, uuidstr);
+ break;
+ default:
+ packet_hexdump((void *)&uuid->value,
+ size - sizeof(*cmd));
+ break;
+ }
+ break;
+ case MSFT_SUBCMD_LE_MONITOR_ADV_IRK:
+ print_field("Type: IRK (0x%2.2x)", cmd->type);
+ irk = (void *)cmd->data;
+ print_field("IRK:");
+ packet_hexdump(irk->irk, size - sizeof(*cmd));
+ break;
+ case MSFT_SUBCMD_LE_MONITOR_ADV_ADDR:
+ print_field("Type: Adderss (0x%2.2x)", cmd->type);
+ addr = (void *)cmd->data;
+ packet_print_addr(NULL, addr->addr, addr->type);
+ break;
+ default:
+ print_field("Type: Unknown (0x%2.2x)", cmd->type);
+ packet_hexdump(cmd->data, size - sizeof(*cmd));
+ break;
+ }
}
static void le_monitor_advertisement_rsp(const void *data, uint16_t size)
{
- uint8_t handle = get_u8(data);
+ const struct msft_rsp_le_monitor_adv *rsp = data;
+
+ print_field("Monitor handle: %u", rsp->handle);
+}
+
+static void le_cancel_monitor_adv_cmd(const void *data, uint16_t size)
+{
+ const struct msft_cmd_le_cancel_monitor_adv *cmd = data;
- print_field("Monitor handle: %u", handle);
+ print_field("Monitor handle: %u", cmd->handle);
}
static void set_adv_filter_enable_cmd(const void *data, uint16_t size)
{
- uint8_t enable = get_u8(data);
+ const struct msft_cmd_le_monitor_adv_enable *cmd = data;
const char *str;
- switch (enable) {
+ switch (cmd->enable) {
case 0x00:
str = "Current allow list";
break;
@@ -100,7 +189,7 @@ static void set_adv_filter_enable_cmd(const void *data, uint16_t size)
break;
}
- print_field("Enable: %s (0x%2.2x)", str, enable);
+ print_field("Enable: %s (0x%2.2x)", str, cmd->enable);
}
typedef void (*func_t) (const void *data, uint16_t size);
@@ -114,12 +203,15 @@ static const struct {
{ 0x00, "Read Supported Features",
null_cmd,
read_supported_features_rsp },
- { 0x01, "Monitor RSSI" },
- { 0x02, "Cancel Monitor RSSI" },
+ { 0x01, "Monitor RSSI",
+ monitor_rssi_cmd },
+ { 0x02, "Cancel Monitor RSSI",
+ cancel_monitor_rssi_cmd },
{ 0x03, "LE Monitor Advertisement",
le_monitor_advertisement_cmd,
le_monitor_advertisement_rsp },
- { 0x04, "LE Cancel Monitor Advertisement" },
+ { 0x04, "LE Cancel Monitor Advertisement",
+ le_cancel_monitor_adv_cmd },
{ 0x05, "LE Set Advertisement Filter Enable",
set_adv_filter_enable_cmd,
null_rsp },
@@ -156,7 +248,7 @@ static void msft_cmd(const void *data, uint8_t size)
" (0x%2.2x)", code);
if (code_func)
- code_func(data + 1, size - 1);
+ code_func(data, size);
else
packet_hexdump(data + 1, size - 1);
}
@@ -193,7 +285,7 @@ static void msft_rsp(const void *data, uint8_t size)
packet_print_error("Status", status);
if (code_func)
- code_func(data + 2, size - 2);
+ code_func(data, size);
else
packet_hexdump(data + 2, size - 2);
}
diff --git a/monitor/msft.h b/monitor/msft.h
index 90a64117a..4f4bdd992 100644
--- a/monitor/msft.h
+++ b/monitor/msft.h
@@ -68,6 +68,7 @@ struct msft_rsp_cancel_monitor_rssi {
#define MSFT_SUBCMD_LE_MONITOR_ADV 0x03
+#define MSFT_SUBCMD_LE_MONITOR_ADV_PATTERN 0x01
struct msft_le_monitor_pattern {
uint8_t len;
uint8_t type;
@@ -75,12 +76,13 @@ struct msft_le_monitor_pattern {
uint8_t data[];
} __attribute__((packed));
-struct msft_le_monitor_adv_pattern_type {
- uint8_t num_patterns;
+struct msft_le_monitor_adv_patterns {
+ uint8_t num;
struct msft_le_monitor_pattern data[];
} __attribute__((packed));
-struct msft_le_monitor_adv_uuid_type {
+#define MSFT_SUBCMD_LE_MONITOR_ADV_UUID 0x02
+struct msft_le_monitor_adv_uuid {
uint8_t type;
union {
uint16_t u16;
@@ -89,7 +91,8 @@ struct msft_le_monitor_adv_uuid_type {
} value;
} __attribute__((packed));
-struct msft_le_monitor_adv_irk_type {
+#define MSFT_SUBCMD_LE_MONITOR_ADV_IRK 0x03
+struct msft_le_monitor_adv_irk {
uint8_t irk[8];
} __attribute__((packed));
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* RE: [v2,1/2] monitor: Add packet definitions for MSFT extension
2021-10-14 0:57 [PATCH v2 1/2] monitor: Add packet definitions for MSFT extension Luiz Augusto von Dentz
2021-10-14 0:57 ` [PATCH v2 2/2] monitor: Make use of MSFT packet definitions Luiz Augusto von Dentz
@ 2021-10-14 1:28 ` bluez.test.bot
1 sibling, 0 replies; 3+ messages in thread
From: bluez.test.bot @ 2021-10-14 1:28 UTC (permalink / raw)
To: linux-bluetooth, luiz.dentz
[-- Attachment #1: Type: text/plain, Size: 4729 bytes --]
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=563121
---Test result---
Test Summary:
CheckPatch FAIL 2.98 seconds
GitLint PASS 1.89 seconds
Prep - Setup ELL PASS 42.20 seconds
Build - Prep PASS 0.46 seconds
Build - Configure PASS 7.78 seconds
Build - Make PASS 178.44 seconds
Make Check PASS 9.71 seconds
Make Distcheck PASS 213.17 seconds
Build w/ext ELL - Configure PASS 7.92 seconds
Build w/ext ELL - Make PASS 169.34 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[v2,1/2] monitor: Add packet definitions for MSFT extension
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#102: FILE: monitor/msft.h:31:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#110: FILE: monitor/msft.h:39:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#121: FILE: monitor/msft.h:50:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#126: FILE: monitor/msft.h:55:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#133: FILE: monitor/msft.h:62:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#138: FILE: monitor/msft.h:67:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#147: FILE: monitor/msft.h:76:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#152: FILE: monitor/msft.h:81:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#161: FILE: monitor/msft.h:90:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#165: FILE: monitor/msft.h:94:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#171: FILE: monitor/msft.h:100:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#181: FILE: monitor/msft.h:110:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#187: FILE: monitor/msft.h:116:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#194: FILE: monitor/msft.h:123:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#199: FILE: monitor/msft.h:128:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#206: FILE: monitor/msft.h:135:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#211: FILE: monitor/msft.h:140:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#218: FILE: monitor/msft.h:147:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#225: FILE: monitor/msft.h:154:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#234: FILE: monitor/msft.h:163:
+} __attribute__((packed));
WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed))
#244: FILE: monitor/msft.h:173:
+} __attribute__((packed));
/github/workspace/src/12557621.patch total: 0 errors, 21 warnings, 154 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12557621.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-14 1:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-14 0:57 [PATCH v2 1/2] monitor: Add packet definitions for MSFT extension Luiz Augusto von Dentz
2021-10-14 0:57 ` [PATCH v2 2/2] monitor: Make use of MSFT packet definitions Luiz Augusto von Dentz
2021-10-14 1:28 ` [v2,1/2] monitor: Add packet definitions for MSFT extension bluez.test.bot
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.