monitor/att: Simplify CCC decoders
Subsystems (2)
Luiz Augusto von Dentz
maintainerPATCH v2 1/4 monitor/att: Simplify CCC decoders
From: Luiz Augusto von Dentz <[email protected]>
This simplify callbacks moving the decoding of the value to print_ccc_value.
--- monitor/att.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-)
monitor/att.c +13 -22
@@ -221,9 +221,15 @@ static const struct bitfield_data ccc_value_table[] = { { } }; -static void print_ccc_value (uint8_t value) +static void print_ccc_value (const struct l2cap_frame *frame) { -uint8_t mask = value; +uint8_t value; +uint8_t mask; + +if (!l2cap_frame_get_u8 ((void *)frame, &value)) { +print_text (COLOR_ERROR ,"invalid size" ); +return ; + } mask =print_bitfield (4 , value, ccc_value_table);if (mask)
@@ -231,28 +237,14 @@ static void print_ccc_value(uint8_t value) mask); } -static void gatt_ccc_read (const struct l2cap_frame *frame) +static void ccc_read (const struct l2cap_frame *frame) { -uint8_t value; - -if (!l2cap_frame_get_u8 ((void *)frame, &value)) { -print_text (COLOR_ERROR ,"invalid size" ); -return ; - } - -print_ccc_value (value); +print_ccc_value (frame); } -static void gatt_ccc_write (const struct l2cap_frame *frame) +static void ccc_write (const struct l2cap_frame *frame) { -uint8_t value; - -if (!l2cap_frame_get_u8 ((void *)frame, &value)) { -print_text (COLOR_ERROR ,"invalid size" ); -return ; - } - -print_ccc_value (value); +print_ccc_value (frame); }#define GATT_HANDLER (_uuid, _read, _write, _notify) \
@@ -272,8 +264,7 @@ struct gatt_handler {void (*write)(const struct l2cap_frame *frame);void (*notify)(const struct l2cap_frame *frame); } gatt_handlers[] = { -GATT_HANDLER (GATT_CLIENT_CHARAC_CFG_UUID , gatt_ccc_read, - gatt_ccc_write,NULL ) + GATT_HANDLER(0x2902, ccc_read, ccc_write, NULL), };static struct gatt_handler *get_handler (struct gatt_db_attribute *attr)
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 2/4 monitor/att: Add decoding support for PAC Sink/Source
From: Luiz Augusto von Dentz <[email protected]>
This adds decoding support for PAC Sink/Source attributes:
< ACL Data TX: Handle 42 flags 0x00 dlen 9
Channel: 64 len 5 sdu 3 [PSM 39 mode Enhanced Credit (0x81)]
{chan 0}
ATT: Read Request (0x0a) len 2
Handle: 0x0017 Type: Sink PAC (0x2bc9)Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 31
Channel: 65 len 27 sdu 25 [PSM 39 mode Enhanced Credit (0x81)]
{chan 0}
Value: 010600000000100301ff0002020302030305041e00f00000
Number of PAC(s): 1
PAC #0:
Codec: LC3 (0x06)
Codec Specific Configuration #0: len 0x03 type 0x01
Codec Specific Configuration: ff00
Codec Specific Configuration #1: len 0x02 type 0x02
Codec Specific Configuration: 03
Codec Specific Configuration #2: len 0x02 type 0x03
Codec Specific Configuration: 03
Codec Specific Configuration #3: len 0x05 type 0x04
Codec Specific Configuration: 1e00f000
---
monitor/att.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++
monitor/l2cap.h | 10 +++++-
monitor/packet.c | 10 ++++++
monitor/packet.h | 2 ++
4 files changed, 113 insertions(+), 1 deletion(-)monitor/att.c +92 -0
@@ -247,6 +247,96 @@ static void ccc_write(const struct l2cap_frame *frame)print_ccc_value (frame); } +static void print_pac (const struct l2cap_frame *frame) +{ +uint8_t num =0 , i; + +if (!l2cap_frame_get_u8 ((void *)frame, &num)) { +print_text (COLOR_ERROR ,"Number of PAC(s): invalid size" ); + goto done; + } + +print_field (" Number of PAC(s): %u" , num); + +for (i =0 ; i < num; i++) { +uint8_t codec_id; +uint16_t codec_cid, codec_vid; +struct bt_hci_lv_data *cc; +struct bt_hci_lv_data *meta; + +print_field (" PAC #%u:" , i); + +if (!l2cap_frame_get_u8 ((void *)frame, &codec_id)) { +print_text (COLOR_ERROR ,"Codec: invalid size" ); + goto done; + } + +packet_print_codec_id (" Codec" , codec_id); + +if (!l2cap_frame_get_le16 ((void *)frame, &codec_cid)) { +print_text (COLOR_ERROR , +"Codec Company ID: invalid size" ); + goto done; + } + +if (!l2cap_frame_get_le16 ((void *)frame, &codec_vid)) { +print_text (COLOR_ERROR , +"Codec Vendor ID: invalid size" ); + goto done; + } + +if (codec_id ==0xff ) { +print_field (" Codec Company ID: %s (0x%04x)" , +bt_compidtostr (codec_cid), + codec_cid); +print_field (" Codec Vendor ID: 0x%04x" , codec_vid); + } + + cc =l2cap_frame_pull ((void *)frame, frame,sizeof (*cc)); +if (!cc) { +print_text (COLOR_ERROR , +"Codec Specific Configuration: invalid size" ); + goto done; + } + +if (!l2cap_frame_pull ((void *)frame, frame, cc->len)) { +print_text (COLOR_ERROR , +"Codec Specific Configuration: invalid size" ); + goto done; + } + +packet_print_ltv (" Codec Specific Configuration" , cc->data, + cc->len); + + meta =l2cap_frame_pull ((void *)frame, frame,sizeof (*meta)); +if (!meta) { +print_text (COLOR_ERROR ,"Metadata: invalid size" ); + goto done; + } + +if (!l2cap_frame_pull ((void *)frame, frame, meta->len)) { +print_text (COLOR_ERROR ,"Metadata: invalid size" ); + goto done; + } + +packet_print_ltv (" Metadata" , meta->data, meta->len); + } + +done: +if (frame->size) +print_hex_field (" Data" , frame->data, frame->size); +} + +static void pac_read (const struct l2cap_frame *frame) +{ +print_pac (frame); +} + +static void pac_notify (const struct l2cap_frame *frame) +{ +print_pac (frame); +} +#define GATT_HANDLER (_uuid, _read, _write, _notify) \ { \ .uuid = { \
@@ -265,6 +355,8 @@ struct gatt_handler {void (*notify)(const struct l2cap_frame *frame); } gatt_handlers[] = {GATT_HANDLER (0x2902 , ccc_read, ccc_write,NULL ), +GATT_HANDLER (0x2bc9 , pac_read,NULL , pac_notify), + GATT_HANDLER(0x2bcb, pac_read, NULL, pac_notify), };static struct gatt_handler *get_handler (struct gatt_db_attribute *attr)
monitor/l2cap.h +9 -1
@@ -48,13 +48,21 @@ static inline void l2cap_frame_clone(struct l2cap_frame *frame, } } -static inline void l2cap_frame_pull (struct l2cap_frame *frame, +static inline void *l2cap_frame_pull (struct l2cap_frame *frame,const struct l2cap_frame *source,uint16_t len) { +void *data; +l2cap_frame_clone (frame, source); +if (source->size < len) +return NULL ; + + data = (void *)frame->data; frame->data = source->data + len; frame->size = source->size - len; + +return data; }static inline bool l2cap_frame_get_u8 (struct l2cap_frame *frame,uint8_t *value)
monitor/packet.c +10 -0
@@ -1377,6 +1377,11 @@ static void print_codec_id(const char *label, uint8_t codec)print_field ("%s: %s (0x%2.2x)" , label, str, codec); } +void packet_print_codec_id (const char *label,uint8_t codec) +{ +print_codec_id (label, codec); +} +static const struct bitfield_data codec_transport_table[] = { {0 ,"Codec supported over BR/EDR ACL" }, {1 ,"Codec supported over BR/EDR SCO and eSCO" },
@@ -3368,6 +3373,11 @@ static void print_ltv(const char *label, const uint8_t *data, uint8_t len)print_hex_field (label, iov.iov_base, iov.iov_len); } +void packet_print_ltv (const char *label,const uint8_t *data,uint8_t len) +{ +print_ltv (label, data, len); +} +static void print_base_annoucement (const uint8_t *data,uint8_t data_len) {struct iovec iov;
monitor/packet.h +2 -0
@@ -61,6 +61,8 @@ void packet_print_channel_map_lmp(const uint8_t *map);void packet_print_channel_map_ll (const uint8_t *map);void packet_print_io_capability (uint8_t capability);void packet_print_io_authentication (uint8_t authentication); +void packet_print_codec_id (const char *label,uint8_t codec); +void packet_print_ltv (const char *label,const uint8_t *data,uint8_t len); void packet_control(struct timeval *tv, struct ucred *cred, uint16_t index, uint16_t opcode,
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 3/4 monitor/att: Add decoding support for ASE Sink/Source
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds decoding support for ASE Sink/Source attributes:
Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 9
Channel: 65 len 5 sdu 3 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Read Request (0x0a) len 2
Handle: 0x002a Type: Sink ASE (0x2bc4)
< ACL Data TX: Handle 42 flags 0x00 dlen 9
Channel: 64 len 5 sdu 3 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Read Response (0x0b) len 2
Value: 0300
ASE ID: 1
State: Idle (0x00)
< ACL Data TX: Handle 42 flags 0x00 dlen 55
Channel: 64 len 51 sdu 49 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 48
Length: 0x0023
Handle: 0x0024 Type: Sink ASE (0x2bc4)
Data: 01010000000a00204e00409c00204e00409c0006000000000a02010302020103042800
ASE ID: 1
State: Codec Configured (0x01)
Framing: Unframed PDUs supported (0x00)
PHY: 0x00
RTN: 0
Max Transport Latency: 10
Presentation Delay Min: 20000 us
Presentation Delay Max: 40000 us
Preferred Presentation Delay Min: 20000 us
Preferred Presentation Delay Max: 40000 us
Codec: LC3 (0x06)
Codec Specific Configuration #0: len 0x02 type 0x01
Codec Specific Configuration: 03
Codec Specific Configuration #1: len 0x02 type 0x02
Codec Specific Configuration: 01
Codec Specific Configuration #2: len 0x03 type 0x04
Codec Specific Configuration: 2800
< ACL Data TX: Handle 42 flags 0x00 dlen 37
Channel: 64 len 33 sdu 31 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 30
Length: 0x0011
Handle: 0x0024 Type: Sink ASE (0x2bc4)
Data: 0102000010270000022800020a00409c00
ASE ID: 1
State: QoS Configured (0x02)
CIG ID: 0x00
CIS ID: 0x00
SDU Interval: 10000 usec
Framing: Unframed (0x00)
PHY: 0x02
LE 2M PHY (0x02)
Max SDU: 40
RTN: 2
Max Transport Latency: 10
Presentation Delay: 40000 us
< ACL Data TX: Handle 42 flags 0x00 dlen 33
Channel: 64 len 29 sdu 27 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 26
Length: 0x000d
Handle: 0x002a Type: Source ASE (0x2bc5)
Data: 03030000060304030202000000
ASE ID: 3
State: Enabling (0x03)
CIG ID: 0x00
CIS ID: 0x00
Metadata #0: len 0x03 type 0x04
Metadata: 0302
Metadata #1: len 0x02 type 0x00
< ACL Data TX: Handle 42 flags 0x00 dlen 39
Channel: 64 len 35 sdu 33 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 32
Length: 0x000d
Handle: 0x002a Type: Source ASE (0x2bc5)
Data: 03040000060304030202000000
ASE ID: 3
State: Streaming (0x04)
CIG ID: 0x00
CIS ID: 0x00
Metadata #0: len 0x03 type 0x04
Metadata: 0302
Metadata #1: len 0x02 type 0x00
< ACL Data TX: Handle 42 flags 0x00 dlen 33
Channel: 64 len 29 sdu 27 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 26
Length: 0x000d
Handle: 0x002a Type: Source ASE (0x2bc5)
Data: 03050000060304030202000000
ASE ID: 3
State: Disabling (0x05)
CIG ID: 0x00
CIS ID: 0x00
Metadata #0: len 0x03 type 0x04
Metadata: 0302
Metadata #1: len 0x02 type 0x00
---
lib/bluetooth.h | 4 +
monitor/att.c | 365 ++++++++++++++++++++++++++++++++++++++++++++----
monitor/l2cap.h | 163 +++++++++++++++++++++
3 files changed, 506 insertions(+), 26 deletions(-)lib/bluetooth.h +4 -0
@@ -377,6 +377,10 @@ void bt_free(void *ptr);int bt_error (uint16_t code);const char *bt_compidtostr (int id); +typedef struct { +uint8_t data[3 ]; +}uint24_t ; +typedef struct {uint8_t data[16 ]; }uint128_t ;
monitor/att.c +339 -26
395 lines not on this page · raw message
monitor/l2cap.h +163 -0
205 lines not on this page · raw message
Signature · 1 line
2.35.1
Luiz Augusto von Dentz
maintainerPATCH v2 4/4 monitor/att: Add decoding support for ASE Control Point
In reply to Luiz Augusto von DentzFrom: Luiz Augusto von Dentz <[email protected]>
This adds decoding support for ASE Control Point attribute:
Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 30
Channel: 64 len 26 sdu 24 [PSM 39 mode Enhanced Credit (0x81)] {chan 1}
ATT: Write Command (0x52) len 23
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 010103020206000000000a02010302020103042800
Opcode: Codec Configuration (0x01)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
Target Latency: Balance Latency/Reliability (0x02)
PHY: 0x02
LE 2M PHY (0x02)
Codec: LC3 (0x06)
Codec Specific Configuration #0: len 0x02 type 0x01
Codec Specific Configuration: 03
Codec Specific Configuration #1: len 0x02 type 0x02
Codec Specific Configuration: 01
Codec Specific Configuration #2: len 0x03 type 0x04
Codec Specific Configuration: 2800
< ACL Data TX: Handle 42 flags 0x00 dlen 55
Channel: 64 len 51 sdu 49 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 48
Length: 0x0005
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 0101030000
Opcode: Codec Configuration (0x01)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
ASE Response Code: Success (0x00)
ASE Response Reason: None (0x00)Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 27
Channel: 64 len 23 sdu 21 [PSM 39 mode Enhanced Credit (0x81)] {chan 1}
ATT: Write Command (0x52) len 20
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 020103000010270000022800020a00409c00
Opcode: QoS Configuration (0x02)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
CIG ID: 0x00
CIS ID: 0x00
SDU Interval: 10000 usec
Framing: Unframed (0x00)
PHY: 0x02
LE 2M PHY (0x02)
Max SDU: 40
RTN: 2
Max Transport Latency: 10
Presentation Delay: 40000 us
< ACL Data TX: Handle 42 flags 0x00 dlen 37
Channel: 64 len 33 sdu 31 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 30
Length: 0x0005
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 0201030000
Opcode: QoS Configuration (0x02)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
ASE Response Code: Success (0x00)
ASE Response Reason: None (0x00)Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 17
Channel: 64 len 13 sdu 11 [PSM 39 mode Enhanced Credit (0x81)] {chan 1}
ATT: Write Command (0x52) len 10
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 0301030403020200
Opcode: Enable (0x03)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
Metadata #0: len 0x03 type 0x02
Metadata: 0200
< ACL Data TX: Handle 42 flags 0x00 dlen 33
Channel: 64 len 29 sdu 27 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Handle Multiple Value Notification (0x23) len 26
Length: 0x0005
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 0301030000
Opcode: Enable (0x03)
Number of ASE(s): 1
ASE: #0
ASE ID: 0x03
ASE Response Code: Success (0x00)
ASE Response Reason: None (0x00)Quoted 1 line
ACL Data RX: Handle 42 flags
0x02dlen 12
Channel: 64 len 8 sdu 6 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}
ATT: Write Command (0x52) len 5
Handle: 0x0030 Type: ASE Control Point (0x2bc6)
Data: 050101
Opcode: Disable (0x05)
Number of ASE(s): 1
---
monitor/att.c | 773 ++++++++++++++++++++++++++++++++++++++------------
1 file changed, 588 insertions(+), 185 deletions(-)monitor/att.c +588 -185
@@ -247,7 +247,7 @@ static void ccc_write(const struct l2cap_frame *frame)print_ccc_value (frame); } -static bool print_codec (const struct l2cap_frame *frame) +static bool print_ase_codec (const struct l2cap_frame *frame) {uint8_t codec_id;uint16_t codec_cid, codec_vid;
@@ -279,6 +279,36 @@ static bool print_codec(const struct l2cap_frame *frame)return true; } +static bool print_ase_lv (const struct l2cap_frame *frame,const char *label) +{ +struct bt_hci_lv_data *lv; + + lv =l2cap_frame_pull ((void *)frame, frame,sizeof (*lv)); +if (!lv) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +if (!l2cap_frame_pull ((void *)frame, frame, lv->len)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +packet_print_ltv (label, lv->data, lv->len); + +return true; +} + +static bool print_ase_cc (const struct l2cap_frame *frame) +{ +return print_ase_lv (frame," Codec Specific Configuration" ); +} + +static bool print_ase_metadata (const struct l2cap_frame *frame) +{ +return print_ase_lv (frame," Metadata" ); +} +static void print_pac (const struct l2cap_frame *frame) {uint8_t num =0 , i;
@@ -291,42 +321,16 @@ static void print_pac(const struct l2cap_frame *frame)print_field (" Number of PAC(s): %u" , num);for (i =0 ; i < num; i++) { -struct bt_hci_lv_data *cc; -struct bt_hci_lv_data *meta; -print_field (" PAC #%u:" , i); -if (!print_codec (frame)) +if (!print_ase_codec (frame)) goto done; - cc =l2cap_frame_pull ((void *)frame, frame,sizeof (*cc)); -if (!cc) { -print_text (COLOR_ERROR , -"Codec Specific Configuration: invalid size" ); - goto done; - } +if (!print_ase_cc (frame)) +break ; -if (!l2cap_frame_pull ((void *)frame, frame, cc->len)) { -print_text (COLOR_ERROR , -"Codec Specific Configuration: invalid size" ); - goto done; - } - -packet_print_ltv (" Codec Specific Configuration" , cc->data, - cc->len); - - meta =l2cap_frame_pull ((void *)frame, frame,sizeof (*meta)); -if (!meta) { -print_text (COLOR_ERROR ,"Metadata: invalid size" ); - goto done; - } - -if (!l2cap_frame_pull ((void *)frame, frame, meta->len)) { -print_text (COLOR_ERROR ,"Metadata: invalid size" ); - goto done; - } - -packet_print_ltv (" Metadata" , meta->data, meta->len); +if (!print_ase_metadata (frame)) +break ; } done:
@@ -344,20 +348,28 @@ static void pac_notify(const struct l2cap_frame *frame)print_pac (frame); } -static void print_prefer_framing (uint8_t value) +static bool print_prefer_framing (const struct l2cap_frame *frame) { -switch (value) { -case 0x00 : -print_field (" Framing: Unframed ISOAL PDUs supported " -"(0x%2.2x)" , value); -return ; -case 0x01 : -print_field (" Framing: Unframed ISOAL PDUs not supported " -"(0x%2.2x)" , value); -return ; -default : -print_field (" Framing: Reserved (0x%2.2x)" , value); +uint8_t framing; + +if (!l2cap_frame_get_u8 ((void *)frame, &framing)) { +print_text (COLOR_ERROR ," Framing: invalid size" ); +return false; } + +switch (framing) { +case 0x00 : +print_field (" Framing: Unframed PDUs supported (0x00)" ); +break ; +case 0x01 : +print_field (" Framing: Unframed PDUs not supported (0x01)" ); +break ; +default : +print_field (" Framing: Reserved (0x%2.2x)" , framing); +break ; + } + +return true; }static const struct bitfield_data prefer_phy_table[] = {
@@ -367,112 +379,122 @@ static const struct bitfield_data prefer_phy_table[] = { { } }; -static void print_prefer_phy (uint8_t phy) +static bool print_prefer_phy (const struct l2cap_frame *frame) { -uint8_t mask; +uint8_t phy, mask; + +if (!l2cap_frame_get_u8 ((void *)frame, &phy)) { +print_text (COLOR_ERROR ,"PHY: invalid size" ); +return false; + } + +print_field (" PHY: 0x%2.2x" , phy); mask =print_bitfield (4 , phy, prefer_phy_table);if (mask)print_text (COLOR_WHITE_BG ," Unknown fields (0x%2.2x)" , mask); + +return true; +} + +static bool print_ase_rtn (const struct l2cap_frame *frame,const char *label) +{ +uint8_t rtn; + +if (!l2cap_frame_get_u8 ((void *)frame, &rtn)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: %u" , label, rtn); + +return true; +} + +static bool print_ase_latency (const struct l2cap_frame *frame, +const char *label) +{ +uint16_t latency; + +if (!l2cap_frame_get_le16 ((void *)frame, &latency)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: %u" , label, latency); + +return true; +} + +static bool print_ase_pd (const struct l2cap_frame *frame,const char *label) +{ +uint32_t pd; + +if (!l2cap_frame_get_le24 ((void *)frame, &pd)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: %u us" , label, pd); + +return true; }static void print_ase_config (const struct l2cap_frame *frame) { -uint8_t framing, phy, rtn; -uint16_t latency; -uint32_t pd_min, pd_max, ppd_min, ppd_max; -struct bt_hci_lv_data *cc; - -if (!l2cap_frame_get_u8 ((void *)frame, &framing)) { -print_text (COLOR_ERROR ,"Framing: invalid size" ); -return ; - } - -print_prefer_framing (framing); - -if (!l2cap_frame_get_u8 ((void *)frame, &phy)) { -print_text (COLOR_ERROR ,"PHY: invalid size" ); -return ; - } - -print_prefer_phy (phy); - -if (!l2cap_frame_get_u8 ((void *)frame, &rtn)) { -print_text (COLOR_ERROR ,"RTN: invalid size" ); -return ; - } - -print_field (" RTN: %u" , rtn); - -if (!l2cap_frame_get_le16 ((void *)frame, &latency)) { -print_text (COLOR_ERROR ,"RTN: invalid size" ); -return ; - } - -print_field (" Max Transport Latency: %u ms" , latency); - -if (!l2cap_frame_get_le24 ((void *)frame, &pd_min)) { -print_text (COLOR_ERROR ,"Presentation Delay Min: invalid size" ); -return ; - } - -print_field (" Presentation Delay Min: %u us" , pd_min); - -if (!l2cap_frame_get_le24 ((void *)frame, &pd_max)) { -print_text (COLOR_ERROR ,"Presentation Delay Max: invalid size" ); -return ; - } - -print_field (" Presentation Delay Max: %u us" , pd_max); - -if (!l2cap_frame_get_le24 ((void *)frame, &ppd_min)) { -print_text (COLOR_ERROR , -"Preferred Presentation Delay Min: invalid size" ); -return ; - } - -print_field (" Preferred Presentation Delay Min: %u us" , ppd_min); - -if (!l2cap_frame_get_le24 ((void *)frame, &ppd_max)) { -print_text (COLOR_ERROR , -"Preferred Presentation Delay Max: invalid size" ); -return ; - } - -print_field (" Preferred Presentation Delay Max: %u us" , ppd_max); - -if (!print_codec (frame)) +if (!print_prefer_framing (frame))return ; - cc =l2cap_frame_pull ((void *)frame, frame,sizeof (*cc)); -if (!cc) { -print_text (COLOR_ERROR , -"Codec Specific Configuration: invalid size" ); +if (!print_prefer_phy (frame))return ; - } -if (!l2cap_frame_pull ((void *)frame, frame, cc->len)) { -print_text (COLOR_ERROR , -"Codec Specific Configuration: invalid size" ); +if (!print_ase_rtn (frame," RTN" ))return ; - } -packet_print_ltv (" Codec Specific Configuration" , cc->data, cc->len); +if (!print_ase_latency (frame," Max Transport Latency" )) +return ; + +if (!print_ase_pd (frame," Presentation Delay Min" )) +return ; + +if (!print_ase_pd (frame," Presentation Delay Max" )) +return ; + +if (!print_ase_pd (frame," Preferred Presentation Delay Min" )) +return ; + +if (!print_ase_pd (frame," Preferred Presentation Delay Max" )) +return ; + +if (!print_ase_codec (frame)) +return ; + +print_ase_cc (frame); } -static void print_framing (uint8_t value) +static bool print_ase_framing (const struct l2cap_frame *frame, +const char *label) { -switch (value) { +uint8_t framing; + +if (!l2cap_frame_get_u8 ((void *)frame, &framing)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +switch (framing) {case 0x00 : -print_field (" Framing: Unframed (0x%2.2x)" , value); +print_field ("%s: Unframed (0x00)" , label);break ;case 0x01 : -print_field (" Framing: Framed (0x%2.2x)" , value); +print_field ("%s: Framed (0x01)" , label);break ;default : -print_field (" Framing: Reserved (0x%2.2x)" , value); +print_field ("%s: Reserved (0x%2.2x)" , label, framing); } + +return true; }static const struct bitfield_data phy_table[] = {
@@ -482,100 +504,92 @@ static const struct bitfield_data phy_table[] = { { } }; -static void print_phy (uint8_t phy) +static bool print_ase_phy (const struct l2cap_frame *frame,const char *label) { -uint8_t mask; +uint8_t phy, mask; + +if (!l2cap_frame_get_u8 ((void *)frame, &phy)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: 0x%2.2x" , label, phy); mask =print_bitfield (4 , phy, phy_table);if (mask)print_text (COLOR_WHITE_BG ," Unknown fields (0x%2.2x)" , mask); + +return true; +} + +static bool print_ase_interval (const struct l2cap_frame *frame, +const char *label) +{ +uint32_t interval; + +if (!l2cap_frame_get_le24 ((void *)frame, &interval)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: %u usec" , label, interval); + +return true; +} + +static bool print_ase_sdu (const struct l2cap_frame *frame,const char *label) +{ +uint16_t sdu; + +if (!l2cap_frame_get_le16 ((void *)frame, &sdu)) { +print_text (COLOR_ERROR ,"%s: invalid size" , label); +return false; + } + +print_field ("%s: %u" , label, sdu); + +return true; }static void print_ase_qos (const struct l2cap_frame *frame) { -uint8_t framing, phy, rtn; -uint16_t sdu, latency; -uint32_t interval, pd; -if (!l2cap_frame_print_u8 ((void *)frame," CIG ID" ))return ;if (!l2cap_frame_print_u8 ((void *)frame," CIS ID" ))return ; -if (!l2cap_frame_get_le24 ((void *)frame, &interval)) { -print_text (COLOR_ERROR ,"SDU Interval: invalid size" ); +if (!print_ase_interval (frame," SDU Interval" ))return ; - } -print_field (" SDU Interval: %u us" , interval); - -if (!l2cap_frame_get_u8 ((void *)frame, &framing)) { -print_text (COLOR_ERROR ,"Framing: invalid size" ); +if (!print_ase_framing (frame," Framing" ))return ; - } -print_framing (framing); - -if (!l2cap_frame_get_u8 ((void *)frame, &phy)) { -print_text (COLOR_ERROR ,"PHY: invalid size" ); +if (!print_ase_phy (frame," PHY" ))return ; - } -print_phy (phy); - -if (!l2cap_frame_get_le16 ((void *)frame, &sdu)) { -print_text (COLOR_ERROR ,"Max SDU: invalid size" ); +if (!print_ase_sdu (frame," Max SDU" ))return ; - } -print_field (" Max SDU: %u" , sdu); - -if (!l2cap_frame_get_u8 ((void *)frame, &rtn)) { -print_text (COLOR_ERROR ,"RTN: invalid size" ); +if (!print_ase_rtn (frame," RTN" ))return ; - } -print_field (" RTN: %u" , rtn); - -if (!l2cap_frame_get_le16 ((void *)frame, &latency)) { -print_text (COLOR_ERROR ,"Max Transport Latency: invalid size" ); +if (!print_ase_latency (frame," Max Transport Latency" ))return ; - } -print_field (" Max Transport Latency: %u" , sdu); - -if (!l2cap_frame_get_le24 ((void *)frame, &pd)) { -print_text (COLOR_ERROR ,"Presentation Delay: invalid size" ); -return ; - } - -print_field (" Presentation Delay: %u us" , pd); +print_ase_pd (frame," Presentation Delay" ); } -static void print_ase_metadata (const struct l2cap_frame *frame) +static void print_ase_metadata_status (const struct l2cap_frame *frame) { -struct bt_hci_lv_data *meta; -if (!l2cap_frame_print_u8 ((void *)frame," CIG ID" ))return ;if (!l2cap_frame_print_u8 ((void *)frame," CIS ID" ))return ; - meta =l2cap_frame_pull ((void *)frame, frame,sizeof (*meta)); -if (!meta) { -print_text (COLOR_ERROR ,"Metadata: invalid size" ); -return ; - } - -if (!l2cap_frame_pull ((void *)frame, frame, meta->len)) { -print_text (COLOR_ERROR ,"Metadata: invalid size" ); -return ; - } - -packet_print_ltv (" Metadata" , meta->data, meta->len); +print_ase_metadata (frame); }static void print_ase_status (const struct l2cap_frame *frame)
@@ -612,17 +626,17 @@ static void print_ase_status(const struct l2cap_frame *frame)/* ASE_Status = 0x03 (Enabling) */ case 0x03 :print_field (" State: Enabling (0x03)" ); -print_ase_metadata (frame); +print_ase_metadata_status (frame);break ;/* ASE_Status = 0x04 (Streaming) */ case 0x04 :print_field (" State: Streaming (0x04)" ); -print_ase_metadata (frame); +print_ase_metadata_status (frame);break ;/* ASE_Status = 0x05 (Disabling) */ case 0x05 :print_field (" State: Disabling (0x05)" ); -print_ase_metadata (frame); +print_ase_metadata_status (frame);break ;/* ASE_Status = 0x06 (Releasing) */ case 0x06 :
@@ -648,6 +662,394 @@ static void ase_notify(const struct l2cap_frame *frame)print_ase_status (frame); } +static bool print_ase_target_latency (const struct l2cap_frame *frame) +{ +uint8_t latency; + +if (!l2cap_frame_get_u8 ((void *)frame, &latency)) { +print_text (COLOR_ERROR ," Target Latency: invalid size" ); +return false; + } + +switch (latency) { +case 0x01 : +print_field (" Target Latency: Low Latency (0x01)" ); +break ; +case 0x02 : +print_field (" Target Latency: Balance Latency/Reliability " +"(0x02)" ); +break ; +case 0x03 : +print_field (" Target Latency: High Reliability (0x03)" ); +break ; +default : +print_field (" Target Latency: Reserved (0x%2.2x)" , latency); +break ; + } + +return true; +} + +static bool ase_config_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +if (!print_ase_target_latency (frame)) +return false; + +if (!print_ase_phy (frame," PHY" )) +return false; + +if (!print_ase_codec (frame)) +return false; + +if (!print_ase_cc (frame)) +return false; + +return true; +} + +static bool ase_qos_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +if (!l2cap_frame_print_u8 ((void *)frame," CIG ID" )) +return false; + +if (!l2cap_frame_print_u8 ((void *)frame," CIS ID" )) +return false; + +if (!print_ase_interval (frame," SDU Interval" )) +return false; + +if (!print_ase_framing (frame," Framing" )) +return false; + +if (!print_ase_phy (frame," PHY" )) +return false; + +if (!print_ase_sdu (frame," Max SDU" )) +return false; + +if (!print_ase_rtn (frame," RTN" )) +return false; + +if (!print_ase_latency (frame," Max Transport Latency" )) +return false; + +if (!print_ase_pd (frame," Presentation Delay" )) +return false; + +return true; +} + +static bool ase_enable_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +if (!print_ase_metadata (frame)) +return false; + +return true; +} + +static bool ase_start_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +return true; +} + +static bool ase_disable_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +return true; +} + +static bool ase_stop_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +return true; +} + +static bool ase_metadata_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +if (!print_ase_metadata (frame)) +return false; + +return true; +} + +static bool ase_release_cmd (const struct l2cap_frame *frame) +{ +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +return false; + +return true; +} + +#define ASE_CMD (_op, _desc, _func) \ +[_op] = { \ + .desc = _desc, \ + .func = _func, \ +} + +struct ase_cmd { +const char *desc; +bool (*func)(const struct l2cap_frame *frame); +} ase_cmd_table[] = { +/* Opcode = 0x01 (Codec Configuration) */ +ASE_CMD (0x01 ,"Codec Configuration" , ase_config_cmd), +/* Opcode = 0x02 (QoS Configuration) */ +ASE_CMD (0x02 ,"QoS Configuration" , ase_qos_cmd), +/* Opcode = 0x03 (Enable) */ +ASE_CMD (0x03 ,"Enable" , ase_enable_cmd), +/* Opcode = 0x04 (Receiver Start Ready) */ +ASE_CMD (0x04 ,"Receiver Start Ready" , ase_start_cmd), +/* Opcode = 0x05 (Disable) */ +ASE_CMD (0x05 ,"Disable" , ase_disable_cmd), +/* Opcode = 0x06 (Receiver Stop Ready) */ +ASE_CMD (0x06 ,"Receiver Stop Ready" , ase_stop_cmd), +/* Opcode = 0x07 (Update Metadata) */ +ASE_CMD (0x07 ,"Update Metadata" , ase_metadata_cmd), +/* Opcode = 0x08 (Release) */ +ASE_CMD (0x08 ,"Release" , ase_release_cmd), +}; + +static struct ase_cmd *ase_get_cmd (uint8_t op) +{ +if (op >ARRAY_SIZE (ase_cmd_table)) +return NULL ; + +return &ase_cmd_table[op]; +} + +static void print_ase_cmd (const struct l2cap_frame *frame) +{ +uint8_t op, num, i; +struct ase_cmd *cmd; + +if (!l2cap_frame_get_u8 ((void *)frame, &op)) { +print_text (COLOR_ERROR ,"opcode: invalid size" ); + goto done; + } + +if (!l2cap_frame_get_u8 ((void *)frame, &num)) { +print_text (COLOR_ERROR ,"num: invalid size" ); + goto done; + } + + cmd =ase_get_cmd (op); +if (!cmd) { +print_field (" Opcode: Reserved (0x%2.2x)" , op); + goto done; + } + +print_field (" Opcode: %s (0x%2.2x)" , cmd->desc, op); +print_field (" Number of ASE(s): %u" , num); + +for (i =0 ; i < num && frame->size; i++) { +print_field (" ASE: #%u" , i); + +if (!cmd->func (frame)) +break ; + } + +done: +if (frame->size) +print_hex_field (" Data" , frame->data, frame->size); +} + +static void ase_cp_write (const struct l2cap_frame *frame) +{ +print_ase_cmd (frame); +} + +static bool print_ase_cp_rsp_code (const struct l2cap_frame *frame) +{ +uint8_t code; + +if (!l2cap_frame_get_u8 ((void *)frame, &code)) { +print_text (COLOR_ERROR ," ASE Response Code: invalid size" ); +return false; + } + +switch (code) { +case 0x00 : +print_field (" ASE Response Code: Success (0x00)" ); +break ; +case 0x01 : +print_field (" ASE Response Code: Unsupported Opcode (0x01)" ); +break ; +case 0x02 : +print_field (" ASE Response Code: Invalid Length (0x02)" ); +break ; +case 0x03 : +print_field (" ASE Response Code: Invalid ASE ID (0x03)" ); +break ; +case 0x04 : +print_field (" ASE Response Code: Invalid ASE State (0x04)" ); +break ; +case 0x05 : +print_field (" ASE Response Code: Invalid ASE Direction " +"(0x05)" ); +break ; +case 0x06 : +print_field (" ASE Response Code: Unsupported Audio " +"Capabilities (0x06)" ); +break ; +case 0x07 : +print_field (" ASE Response Code: Unsupported Configuration " +"(0x07)" ); +break ; +case 0x08 : +print_field (" ASE Response Code: Rejected Configuration " +"(0x08)" ); +break ; +case 0x09 : +print_field (" ASE Response Code: Invalid Configuration " +"(0x09)" ); +break ; +case 0x0a : +print_field (" ASE Response Code: Unsupported Metadata " +"(0x0a)" ); +break ; +case 0x0b : +print_field (" ASE Response Code: Rejected Metadata (0x0b)" ); +break ; +case 0x0c : +print_field (" ASE Response Code: Invalid Metadata (0x0c)" ); +break ; +case 0x0d : +print_field (" ASE Response Code: Insufficient Resources " +"(0x0d)" ); +break ; +case 0x0e : +print_field (" ASE Response Code: Unspecified Error (0x0e)" ); +break ; +default : +print_field (" ASE Response Code: Reserved (0x%2.2x)" , code); +break ; + } + +return true; +} + +static bool print_ase_cp_rsp_reason (const struct l2cap_frame *frame) +{ +uint8_t reason; + +if (!l2cap_frame_get_u8 ((void *)frame, &reason)) { +print_text (COLOR_ERROR , +" ASE Response Reason: invalid size" ); +return false; + } + +switch (reason) { +case 0x00 : +print_field (" ASE Response Reason: None (0x00)" ); +break ; +case 0x01 : +print_field (" ASE Response Reason: ASE ID (0x01)" ); +break ; +case 0x02 : +print_field (" ASE Response Reason: Codec Specific " +"Configuration (0x02)" ); +break ; +case 0x03 : +print_field (" ASE Response Reason: SDU Interval (0x03)" ); +break ; +case 0x04 : +print_field (" ASE Response Reason: Framing (0x04)" ); +break ; +case 0x05 : +print_field (" ASE Response Reason: PHY (0x05)" ); +break ; +case 0x06 : +print_field (" ASE Response Reason: Max SDU (0x06)" ); +break ; +case 0x07 : +print_field (" ASE Response Reason: RTN (0x07)" ); +break ; +case 0x08 : +print_field (" ASE Response Reason: Max Transport Latency " +"(0x08)" ); +break ; +case 0x09 : +print_field (" ASE Response Reason: Presentation Delay " +"(0x09)" ); +break ; +case 0x0a : +print_field (" ASE Response Reason: Invalid ASE/CIS Mapping " +"(0x0a)" ); +break ; +default : +print_field (" ASE Response Reason: Reserved (0x%2.2x)" , + reason); +break ; + } + +return true; +} + +static void print_ase_cp_rsp (const struct l2cap_frame *frame) +{ +uint8_t op, num, i; +struct ase_cmd *cmd; + +if (!l2cap_frame_get_u8 ((void *)frame, &op)) { +print_text (COLOR_ERROR ," opcode: invalid size" ); + goto done; + } + +if (!l2cap_frame_get_u8 ((void *)frame, &num)) { +print_text (COLOR_ERROR ," Number of ASE(s): invalid size" ); + goto done; + } + + cmd =ase_get_cmd (op); +if (!cmd) { +print_field (" Opcode: Reserved (0x%2.2x)" , op); + goto done; + } + +print_field (" Opcode: %s (0x%2.2x)" , cmd->desc, op); +print_field (" Number of ASE(s): %u" , num); + +for (i =0 ; i < num && frame->size; i++) { +print_field (" ASE: #%u" , i); + +if (!l2cap_frame_print_u8 ((void *)frame," ASE ID" )) +break ; + +if (!print_ase_cp_rsp_code (frame)) +break ; + +if (!print_ase_cp_rsp_reason (frame)) +break ; + } + +done: +if (frame->size) +print_hex_field (" Data" , frame->data, frame->size); +} + +static void ase_cp_notify (const struct l2cap_frame *frame) +{ +print_ase_cp_rsp (frame); +} +#define GATT_HANDLER (_uuid, _read, _write, _notify) \ { \ .uuid = { \
@@ -668,6 +1070,7 @@ struct gatt_handler {GATT_HANDLER (0x2902 , ccc_read, ccc_write,NULL ),GATT_HANDLER (0x2bc4 , ase_read,NULL , ase_notify),GATT_HANDLER (0x2bc5 , ase_read,NULL , ase_notify), +GATT_HANDLER (0x2bc6 ,NULL , ase_cp_write, ase_cp_notify),GATT_HANDLER (0x2bc9 , pac_read,NULL , pac_notify), GATT_HANDLER(0x2bcb, pac_read, NULL, pac_notify), };
Signature · 1 line
2.35.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=645406
---Test result---
Test Summary:
CheckPatch FAIL 3.81 seconds GitLint FAIL 1.81 seconds Prep - Setup ELL PASS 50.69 seconds Build - Prep PASS 0.58 seconds Build - Configure PASS 9.45 seconds Build - Make PASS 1699.16 seconds Make Check PASS 12.03 seconds Make Check w/Valgrind PASS 505.71 seconds Make Distcheck PASS 265.28 seconds Build w/ext ELL - Configure PASS 9.39 seconds Build w/ext ELL - Make PASS 1683.63 seconds Incremental Build with patchesPASS 6830.77 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[v2,3/4] monitor/att: Add decoding support for ASE Sink/Source WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #95:
Channel: 64 len 51 sdu 49 [PSM 39 mode Enhanced Credit (0x81)] {chan 0}WARNING:NEW_TYPEDEFS: do not add new typedefs
#188: FILE: lib/bluetooth.h:380:
+typedef struct {
/github/workspace/src/12862782.patch total: 0 errors, 2 warnings, 610 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/12862782.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.
[v2,4/4] monitor/att: Add decoding support for ASE Control Point WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) #86:
Channel: 64 len 26 sdu 24 [PSM 39 mode Enhanced Credit (0x81)] {chan 1}/github/workspace/src/12862783.patch total: 0 errors, 1 warnings, 904 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/12862783.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.
##############################
Test: GitLint - FAIL
Desc: Run gitlint with rule in .gitlint
Output:
[v2,3/4] monitor/att: Add decoding support for ASE Sink/Source
22: B1 Line exceeds max length (86>80): " Data: 01010000000a00204e00409c00204e00409c0006000000000a02010302020103042800"
---
Regards,
Linux Bluetooth
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 7 lines · On Thu, 26 May 2022 13:59:34 -0700 you wrote:
From: Luiz Augusto von Dentz <[email protected]>
This simplify callbacks moving the decoding of the value to
print_ccc_value.--- monitor/att.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-)
Here is the summary with links:
- [v2,1/4] monitor/att: Simplify CCC decoders
(no matching commit)
- [v2,2/4] monitor/att: Add decoding support for PAC Sink/Source
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=13bdb9f3bee1
- [v2,3/4] monitor/att: Add decoding support for ASE Sink/Source (no matching commit)
- [v2,4/4] monitor/att: Add decoding support for ASE Control Point (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html