monitor: Fix the incorrect vendor name
PATCH v5 1/1 monitor: Fix the incorrect vendor name
From: Tedd Ho-Jeong An <[email protected]>
This patch fixes the vendor name is alwasy shown as "Microsoft".
< HCI Command: Microsoft Secure Send (0x3f|0x0009) plen 249
Type: Data fragment (0x01)
Quoted 1 line
HCI Event: Command Complete (
0x0e) plen 4
Microsoft Secure Send (0x3f|0x0009) ncmd 31
Status: Success (0x00)
---
monitor/packet.c | 121 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 103 insertions(+), 18 deletions(-)monitor/packet.c +103 -18
@@ -266,6 +266,8 @@ struct index_data {uint8_t bdaddr[6 ];uint16_t manufacturer;uint16_t msft_opcode; +uint8_t msft_evt_prefix_len; +uint8_t msft_evt_prefix[32 ];size_t frame; };
@@ -3940,6 +3942,8 @@ void packet_monitor(struct timeval *tv, struct ucred *cred,memcpy (index_list[index].bdaddr, ni->bdaddr,6 ); index_list[index].manufacturer = fallback_manufacturer; index_list[index].msft_opcode =BT_HCI_CMD_NOP ; + index_list[index].msft_evt_prefix_len =0 ; +memset (index_list[index].msft_evt_prefix,0 ,32 ); }addr2str (ni->bdaddr, str);
@@ -4006,9 +4010,12 @@ void packet_monitor(struct timeval *tv, struct ucred *cred,/* * Intel controllers that support the * Microsoft vendor extension are using -* 0xFC1E for VsMsftOpCode. +* 0xFC1E for VsMsftOpCode and 0x50 for event +* code. */ index_list[index].msft_opcode =0xFC1E ; + index_list[index].msft_evt_prefix_len =1 ; + index_list[index].msft_evt_prefix[0 ] =0x50 ;break ;case 93 :/*
@@ -4017,6 +4024,15 @@ void packet_monitor(struct timeval *tv, struct ucred *cred,* 0xFCF0 for VsMsftOpCode. */ index_list[index].msft_opcode =0xFCF0 ; + index_list[index].msft_evt_prefix_len =8 ; + index_list[index].msft_evt_prefix[0 ] =0x23 ; + index_list[index].msft_evt_prefix[1 ] =0x79 ; + index_list[index].msft_evt_prefix[2 ] =0x54 ; + index_list[index].msft_evt_prefix[3 ] =0x33 ; + index_list[index].msft_evt_prefix[4 ] =0x77 ; + index_list[index].msft_evt_prefix[5 ] =0x88 ; + index_list[index].msft_evt_prefix[6 ] =0x97 ; + index_list[index].msft_evt_prefix[7 ] =0x68 ;break ; } }
@@ -9323,7 +9339,7 @@ static const char *get_supported_command(int bit)return NULL ; } -static const char *current_vendor_str (void ) +static const char *current_vendor_str (uint16_t ocf) {uint16_t manufacturer, msft_opcode;
@@ -9335,7 +9351,8 @@ static const char *current_vendor_str(void) msft_opcode =BT_HCI_CMD_NOP ; } -if (msft_opcode !=BT_HCI_CMD_NOP ) +if (msft_opcode !=BT_HCI_CMD_NOP && +cmd_opcode_ocf (msft_opcode) == ocf)return "Microsoft" ;switch (manufacturer) {
@@ -9350,6 +9367,27 @@ static const char *current_vendor_str(void)return NULL ; } +static const char *current_vendor_evt_str (uint8_t evt) +{ +uint16_t manufacturer; + +if (index_current <MAX_INDEX ) + manufacturer = index_list[index_current].manufacturer; +else + manufacturer = fallback_manufacturer; + +switch (manufacturer) { +case 2 : +return "Intel" ; +case 15 : +return "Broadcom" ; +case 93 : +return "Realtek" ; + } + +return NULL ; +} +static const struct vendor_ocf *current_vendor_ocf (uint16_t ocf) {uint16_t manufacturer, msft_opcode;
@@ -9378,18 +9416,12 @@ static const struct vendor_ocf *current_vendor_ocf(uint16_t ocf)static const struct vendor_evt *current_vendor_evt (uint8_t evt) { -uint16_t manufacturer, msft_opcode; +uint16_t manufacturer; -if (index_current <MAX_INDEX ) { +if (index_current <MAX_INDEX ) manufacturer = index_list[index_current].manufacturer; - msft_opcode = index_list[index_current].msft_opcode; - }else { +else manufacturer = fallback_manufacturer; - msft_opcode =BT_HCI_CMD_NOP ; - } - -if (msft_opcode !=BT_HCI_CMD_NOP ) -return NULL ;switch (manufacturer) {case 2 :
@@ -9401,6 +9433,26 @@ static const struct vendor_evt *current_vendor_evt(uint8_t evt)return NULL ; } +static const struct vendor_evt *current_vendor_msft_evt (const void *data, +uint8_t size) +{ +uint8_t *prefix, prefix_len; + +if (index_current <MAX_INDEX ) { + prefix_len = index_list[index_current].msft_evt_prefix_len; + prefix = index_list[index_current].msft_evt_prefix; + }else +return NULL ; + +/* MSFT extension events start with the MSFT event prefix which is +* defined by the vendor and followed by the MSFT event code. +*/ +if (size > prefix_len && !memcmp (data, prefix, prefix_len)) +return msft_vendor_evt (); + +return NULL ; +} +static void inquiry_complete_evt (const void *data,uint8_t size) {const struct bt_hci_evt_inquiry_complete *evt = data;
@@ -9573,7 +9625,7 @@ static void cmd_complete_evt(const void *data, uint8_t size)const struct vendor_ocf *vnd =current_vendor_ocf (ocf);if (vnd) { -const char *str =current_vendor_str (); +const char *str =current_vendor_str (ocf);if (str) { snprintf(vendor_str, sizeof(vendor_str),
@@ -9665,7 +9717,7 @@ static void cmd_status_evt(const void *data, uint8_t size)const struct vendor_ocf *vnd =current_vendor_ocf (ocf);if (vnd) { -const char *str =current_vendor_str (); +const char *str =current_vendor_str (ocf);if (str) { snprintf(vendor_str, sizeof(vendor_str),
@@ -11012,13 +11064,46 @@ static void le_meta_event_evt(const void *data, uint8_t size)static void vendor_evt (const void *data,uint8_t size) { -uint8_t subevent = *((const uint8_t *) data); +uint8_t subevent;struct subevent_data vendor_data;char vendor_str[150 ]; -const struct vendor_evt *vnd =current_vendor_evt (subevent); +const struct vendor_evt *vnd; + +/* For MSFT Extension event only */ + vnd =current_vendor_msft_evt (data, size); +if (vnd) { +snprintf (vendor_str,sizeof (vendor_str), +"Microsoft %s" , vnd->str); +print_indent (6 ,COLOR_HCI_EVENT ,"" , vendor_str,COLOR_OFF , +" length: %u" , size); + +if (!vnd->evt_func) { +packet_hexdump (data, size); +return ; + } + +if (vnd->evt_fixed) { +if (size != vnd->evt_size) { +print_text (COLOR_ERROR ,"invalid packet size" ); +packet_hexdump (data, size); +return ; + } + }else { +if (size < vnd->evt_size) { +print_text (COLOR_ERROR ,"too short packet" ); +packet_hexdump (data, size); +return ; + } + } + + vnd->evt_func (data, size); +return ; + } + subevent = *((const uint8_t *) data); + vnd =current_vendor_evt (subevent);if (vnd) { -const char *str =current_vendor_str (); +const char *str =current_vendor_evt_str (subevent);if (str) { snprintf(vendor_str, sizeof(vendor_str),
@@ -11419,7 +11504,7 @@ void packet_hci_command(struct timeval *tv, struct ucred *cred, uint16_t index,const struct vendor_ocf *vnd =current_vendor_ocf (ocf);if (vnd) { -const char *str =current_vendor_str (); +const char *str =current_vendor_str (ocf);if (str) { snprintf(vendor_str, sizeof(vendor_str),
Signature · 1 line
2.25.1
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=471127
---Test result---
Test Summary:
CheckPatch PASS 0.48 seconds GitLint PASS 0.13 seconds Prep - Setup ELL PASS 53.04 seconds Build - Prep PASS 0.14 seconds Build - Configure PASS 9.35 seconds Build - Make PASS 226.97 seconds Make Check PASS 9.64 seconds Make Dist PASS 13.25 seconds Make Dist - Configure PASS 5.69 seconds Make Dist - Make PASS 93.44 seconds Build w/ext ELL - Configure PASS 9.35 seconds Build w/ext ELL - Make PASS 217.10 seconds
Details
##############################
Test: CheckPatch - PASS
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
##############################
Test: GitLint - PASS
Desc: Run gitlint with rule in .gitlint
##############################
Test: Prep - Setup ELL - PASS
Desc: Clone, build, and install ELL
##############################
Test: Build - Prep - PASS
Desc: Prepare environment for build
##############################
Test: Build - Configure - PASS
Desc: Configure the BlueZ source tree
##############################
Test: Build - Make - PASS
Desc: Build the BlueZ source tree
##############################
Test: Make Check - PASS
Desc: Run 'make check'
##############################
Test: Make Dist - PASS
Desc: Run 'make dist' and build the distribution tarball
##############################
Test: Make Dist - Configure - PASS
Desc: Configure the source from distribution tarball
##############################
Test: Make Dist - Make - PASS
Desc: Build the source from distribution tarball
##############################
Test: Build w/ext ELL - Configure - PASS
Desc: Configure BlueZ source with '--enable-external-ell' configuration
##############################
Test: Build w/ext ELL - Make - PASS
Desc: Build BlueZ source with '--enable-external-ell' configuration
---
Regards,
Linux Bluetooth