This change adds the following to packet monitor:
-Add Ext Adv Params command and response
-Add Ext Adv Data command and response
This patch was manually tested by registering advertisements with
various features and verifying in btmon log.
Reviewed-by: Sonny Sasaka <sonnysasaka@xxxxxxxxxxxx>
Reviewed-by: Alain Michaud <alainm@xxxxxxxxxxxx>
---
Changes in v5: None
Changes in v4: None
Changes in v3:
- Removed Tx Power Selected MGMT event from monitor
Changes in v2: None
monitor/packet.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 65 insertions(+)
diff --git a/monitor/packet.c b/monitor/packet.c
index 615c180f8..b67510f6d 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -11844,8 +11844,16 @@ static const struct bitfield_data mgmt_adv_flags_table[] = {
{ 7, "Advertise in 1M on Secondary channel" },
{ 8, "Advertise in 2M on Secondary channel" },
{ 9, "Advertise in CODED on Secondary channel" },
+ { 12, "Use provided duration parameter" },
+ { 13, "Use provided timeout parameter" },
+ { 14, "Use provided interval parameters" },
+ { 15, "Use provided tx power parameter" },
{ }
};
+#define MGMT_ADV_PARAM_DURATION (1 << 12)
+#define MGMT_ADV_PARAM_TIMEOUT (1 << 13)
+#define MGMT_ADV_PARAM_INTERVALS (1 << 14)
+#define MGMT_ADV_PARAM_TX_POWER (1 << 15)
static void mgmt_print_adv_flags(uint32_t flags)
{
@@ -13150,6 +13158,57 @@ static void mgmt_set_device_flags_rsp(const void *data, uint16_t size)
mgmt_print_address(data, type);
}
+static void mgmt_add_ext_adv_params_cmd(const void *data, uint16_t size)
+{
+ uint8_t instance = get_u8(data);
+ uint32_t flags = get_le32(data + 1);
+ uint16_t duration = get_le16(data + 5);
+ uint16_t timeout = get_le16(data + 7);
+ uint8_t *min_interval = (uint8_t *)(data + 9);
+ uint8_t *max_interval = (uint8_t *)(data + 13);
+ int8_t tx_power = get_s8(data + 17);
+
+ print_field("Instance: %u", instance);
+ mgmt_print_adv_flags(flags);
+ print_field("Duration: %u", duration);
+ print_field("Timeout: %u", timeout);
+ print_ext_slot_625("Min advertising interval", min_interval);
+ print_ext_slot_625("Max advertising interval", max_interval);
+ print_power_level(tx_power, NULL);
+}
+
+static void mgmt_add_ext_adv_params_rsp(const void *data, uint16_t size)
+{
+ uint8_t instance = get_u8(data);
+ int8_t tx_power = get_s8(data + 1);
+ uint8_t max_adv_data_len = get_u8(data+2);
+ uint8_t max_scan_rsp_len = get_u8(data+3);
+
+ print_field("Instance: %u", instance);
+ print_power_level(tx_power, NULL);
+ print_field("Available adv data len: %u", max_adv_data_len);
+ print_field("Available scan rsp data len: %u", max_scan_rsp_len);
+}
+
+static void mgmt_add_ext_adv_data_cmd(const void *data, uint16_t size)
+{
+ uint8_t instance = get_u8(data);
+ uint8_t adv_data_len = get_u8(data + 1);
+ uint8_t scan_rsp_len = get_u8(data + 2);
+
+ print_field("Instance: %u", instance);
+ print_field("Advertising data length: %u", adv_data_len);
+ print_eir(data + 3, adv_data_len, false);
+ print_field("Scan response length: %u", scan_rsp_len);
+ print_eir(data + 3 + adv_data_len, scan_rsp_len, false);
+}
+
+static void mgmt_add_ext_adv_data_rsp(const void *data, uint16_t size)
+{
+ uint8_t instance = get_u8(data);
+
+ print_field("Instance: %u", instance);
+}
struct mgmt_data {
uint16_t opcode;
@@ -13382,6 +13441,12 @@ static const struct mgmt_data mgmt_command_table[] = {
{ 0x0050, "Set Device Flags",
mgmt_set_device_flags_cmd, 11, true,
mgmt_set_device_flags_rsp, 7, true},
+ { 0x0054, "Add Ext Adv Params",
+ mgmt_add_ext_adv_params_cmd, 18, false,
+ mgmt_add_ext_adv_params_rsp, 4, true },
+ { 0x0055, "Add Ext Adv Data",
+ mgmt_add_ext_adv_data_cmd, 3, false,
+ mgmt_add_ext_adv_data_rsp, 1, true },
{ }
};
--
2.29.1.341.ge80a0c044ae-goog
