Currently, the user sets the Broadcast Code as an array of bytes
when prompted from the assistant submenu. However, the Bluetooth
Core Specification requires that, on the UI level, the Broadcast
Code shall be represented as a string (Vol 3, Part C, 3.2.6).
This patch makes the Broadcast Code be parsed as a string from
the assistant prompt. The bluetoothctl-assistant.rst is also
updated.
The bluetoothctl log below shows a Broadcast
Assistant pushing an encrypted stream to a peer:
client/bluetoothctl
[bluetooth]# [CHG] Controller 00:60:37:31:7E:3F Pairable: yes
[bluetooth]# AdvertisementMonitor path registered
[bluetooth]# scan on
[bluetooth]# [NEW] Device 00:60:37:31:7E:3F 00-60-37-31-7E-3F
[bluetooth]# connect 00:60:37:31:7E:3F
Attempting to connect to 00:60:37:31:7E:3F
[CHG] Device 00:60:37:31:7E:3F Connected: yes
[00-60-37-31-7E-3F]# Connection successful
[00-60-37-31-7E-3F]# [NEW] Device 19:9A:7A:71:E5:8B 19-9A-7A-71-E5-8B
[00-60-37-31-7E-3F]# [NEW] Assistant
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
[00-60-37-31-7E-3F]# assistant.push
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
[Assistant] Enter Metadata (auto/value): a
[Assistant] Enter Broadcast Code (auto/value): Borne House
[00-60-37-31-7E-3F]# [CHG] Assistant
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
State: pending
[00-60-37-31-7E-3F]# Assistant
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
pushed
[00-60-37-31-7E-3F]# [CHG] Assistant
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
State: requesting
[00-60-37-31-7E-3F]# [CHG] Assistant
/org/bluez/hci0/src_19_9A_7A_71_E5_8B/dev_00_60_37_31_7E_3F/bis1
State: active
The btmon log below shows the way the Broadcast Code string is converted
into a byte array and sent to the peer via GATT:
bluetoothd[6013]: < ACL Data TX: Handle 0 flags 0x00 dlen 28
ATT: Write Command (0x52) len 23
Handle: 0x0040 Type: Broadcast Audio Scan Control Point (0x2bc7)
Data[21]: 02018be5717a9a1900db5e3a02ffff010100000000
Opcode: Add Source (0x02)
Source_Address_Type: 1
Source_Address: 19:9A:7A:71:E5:8B
Source_Adv_SID: 0
Broadcast_ID: 0x3a5edb
PA_Sync_State: Synchronize to PA - PAST not available
PA_Interval: 0xffff
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000001
> ACL Data RX: Handle 0 flags 0x01 dlen 2
ATT: Handle Multiple Value Notification (0x23) len 24
Length: 0x0014
Handle: 0x003a Type: Broadcast Receive State (0x2bc8)
Data[20]: 01018be5717a9a1900db5e3a0201010000000000
Source_ID: 1
Source_Address_Type: 1
Source_Address: 19:9A:7A:71:E5:8B
Source_Adv_SID: 0
Broadcast_ID: 0x3a5edb
PA_Sync_State: Synchronized to PA
BIG_Encryption: Broadcast_Code required
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000000
bluetoothd[6013]: < ACL Data TX: Handle 0 flags 0x00 dlen 25
ATT: Write Command (0x52) len 20
Handle: 0x0040 Type: Broadcast Audio Scan Control Point (0x2bc7)
Data[18]: 040142c3b8726e6520486f75736500000000
Opcode: Set Broadcast_Code (0x04)
Source_ID: 1
Broadcast_Code[16]: 426f726e6520486f7573650000000000
> ACL Data RX: Handle 0 flags 0x01 dlen 2
ATT: Handle Multiple Value Notification (0x23) len 24
Length: 0x0014
Handle: 0x003a Type: Broadcast Receive State (0x2bc8)
Data[20]: 01018be5717a9a1900db5e3a0202010100000000
Source_ID: 1
Source_Address_Type: 1
Source_Address: 19:9A:7A:71:E5:8B
Source_Adv_SID: 0
Broadcast_ID: 0x3a5edb
PA_Sync_State: Synchronized to PA
BIG_Encryption: Decrypting
Num_Subgroups: 1
Subgroup #0:
BIS_Sync State: 0x00000001
Iulia Tanasescu (2):
client/assistant: Enter Broadcast Code as string
bluetoothctl-assistant.1: Update push command example
client/assistant.c | 24 ++++++++++++++----------
client/bluetoothctl-assistant.rst | 16 ++++++++++------
2 files changed, 24 insertions(+), 16 deletions(-)
base-commit: 4ed7060ca9dfcc89c55801f818b0b43db6f5acdd
--
2.39.2
