| Message ID | 20220907191450.38262-1-brian.gix@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [BlueZ,1/2] Bluetooth: Add ADV Monitor events to btmon parser | expand |
Hi Brian, On Wed, Sep 7, 2022 at 12:15 PM Brian Gix <brian.gix@intel.com> wrote: > > Signed-off-by: Brian Gix <brian.gix@intel.com> We don't use signed-off-by in userspace, also it would be great to have a sample output of these changes in the patch description. > --- > 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 }, > { } > }; > > -- > 2.37.2 >
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 }, { } };
Signed-off-by: Brian Gix <brian.gix@intel.com> --- monitor/packet.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+)