From 3fc71a0266b2bff72bea0f6915734b70d3eebb58 Mon Sep 17 00:00:00 2001
From: Josh Wu <joshwu@google.com>
Date: Thu, 30 Nov 2023 23:58:30 +0800
Subject: [PATCH] Add variable-length bytes field

---
 bumble/hci.py     | 15 +++++++++++++--
 tests/hci_test.py |  1 +
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/bumble/hci.py b/bumble/hci.py
index 376a940..f652d23 100644
--- a/bumble/hci.py
+++ b/bumble/hci.py
@@ -1517,6 +1517,12 @@ class HCI_Object:
             # The rest of the bytes
             field_value = data[offset:]
             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:
             # 8-bit unsigned
             return (data[offset], 1)
@@ -1621,6 +1627,11 @@ class HCI_Object:
                     raise ValueError('value too large for *-typed field')
             else:
                 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(
             field_value, 'to_bytes'
         ):
@@ -4498,7 +4509,7 @@ class HCI_LE_Reject_CIS_Request_Command(HCI_Command):
         ('data_path_id', 1),
         ('codec_id', CodingFormat.parse_from_bytes),
         ('controller_delay', 3),
-        ('codec_configuration', '*'),
+        ('codec_configuration', 'v'),
     ],
     return_parameters_fields=[
         ('status', STATUS_SPEC),
@@ -4515,7 +4526,7 @@ class HCI_LE_Setup_ISO_Data_Path_Command(HCI_Command):
     data_path_id: int
     codec_id: CodingFormat
     controller_delay: int
-    codec_configuration: int
+    codec_configuration: bytes
 
 
 # -----------------------------------------------------------------------------
diff --git a/tests/hci_test.py b/tests/hci_test.py
index 12f611f..b6024ff 100644
--- a/tests/hci_test.py
+++ b/tests/hci_test.py
@@ -453,6 +453,7 @@ def test_HCI_LE_Setup_ISO_Data_Path_Command():
     assert command.data_path_id == 0x01
     assert command.codec_id == CodingFormat(CodecID.TRANSPARENT)
     assert command.controller_delay == 0
+    assert command.codec_configuration == b''
 
     basic_check(command)