auracaster/bumble_mirror
3
0
Fork 1
mirror of https://github.com/google/bumble.git synced 2026-05-09 04:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add variable-length bytes field

Browse Source
This commit is contained in:
Josh Wu
2023-11-30 23:58:30 +08:00
parent 392dcc3a05
commit 3fc71a0266
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bumble/hci.py
View File

@@ -1517,6 +1517,12 @@ class HCI_Object:
# The rest of the bytes # The rest of the bytes
field_value = data[offset:] field_value = data[offset:]
return (field_value, len(field_value)) return (field_value, len(field_value))
if field_type == 'v':
# Variable-length bytes field, with 1-byte length at the beginning
field_length = data[offset]
offset += 1
field_value = data[offset : offset + field_length]
return (field_value, field_length + 1)
if field_type == 1: if field_type == 1:
# 8-bit unsigned # 8-bit unsigned
return (data[offset], 1) return (data[offset], 1)
@@ -1621,6 +1627,11 @@ class HCI_Object:
raise ValueError('value too large for *-typed field') raise ValueError('value too large for *-typed field')
else: else:
field_bytes = bytes(field_value) field_bytes = bytes(field_value)
elif field_type == 'v':
# Variable-length bytes field, with 1-byte length at the beginning
field_bytes = bytes(field_bytes)
field_length = len(field_bytes)
field_bytes = bytes([field_length]) + field_bytes
elif isinstance(field_value, (bytes, bytearray)) or hasattr( elif isinstance(field_value, (bytes, bytearray)) or hasattr(
field_value, 'to_bytes' field_value, 'to_bytes'
): ):
@@ -4498,7 +4509,7 @@ class HCI_LE_Reject_CIS_Request_Command(HCI_Command):
('data_path_id', 1), ('data_path_id', 1),
('codec_id', CodingFormat.parse_from_bytes), ('codec_id', CodingFormat.parse_from_bytes),
('controller_delay', 3), ('controller_delay', 3),
('codec_configuration', '*'), ('codec_configuration', 'v'),
], ],
return_parameters_fields=[ return_parameters_fields=[
('status', STATUS_SPEC), ('status', STATUS_SPEC),
@@ -4515,7 +4526,7 @@ class HCI_LE_Setup_ISO_Data_Path_Command(HCI_Command):
data_path_id: int data_path_id: int
codec_id: CodingFormat codec_id: CodingFormat
controller_delay: int controller_delay: int
codec_configuration: int codec_configuration: bytes
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------

1
tests/hci_test.py
View File

@@ -453,6 +453,7 @@ def test_HCI_LE_Setup_ISO_Data_Path_Command():
assert command.data_path_id == 0x01 assert command.data_path_id == 0x01
assert command.codec_id == CodingFormat(CodecID.TRANSPARENT) assert command.codec_id == CodingFormat(CodecID.TRANSPARENT)
assert command.controller_delay == 0 assert command.controller_delay == 0
assert command.codec_configuration == b''
basic_check(command) basic_check(command)