bumble 0.0.220__py3-none-any.whl → 0.0.221__py3-none-any.whl

bumble/controller.py

@@ -23,14 +23,14 @@ import itertools
 import logging
 import random
 import struct
-from typing import TYPE_CHECKING, Any, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 
-from bumble import hci, lmp
+from bumble import hci, link, ll, lmp
+from bumble import link as bumble_link
 from bumble.colors import color
 from bumble.core import PhysicalTransport
 
 if TYPE_CHECKING:
-    from bumble.link import LocalLink
     from bumble.transport.common import TransportSink
 
 # -----------------------------------------------------------------------------
@@ -52,10 +52,128 @@ class CisLink:
     handle: int
     cis_id: int
     cig_id: int
-    acl_connection: Optional[Connection] = None
+    acl_connection: Connection | None = None
     data_paths: set[int] = dataclasses.field(default_factory=set)
 
 
+# -----------------------------------------------------------------------------
+@dataclasses.dataclass
+class LegacyAdvertiser:
+    controller: Controller
+    advertising_interval_min: int = 0
+    advertising_interval_max: int = 0
+    advertising_type: int = 0
+    own_address_type: int = 0
+    peer_address_type: int = 0
+    peer_address: hci.Address = hci.Address.ANY
+    advertising_channel_map: int = 0
+    advertising_filter_policy: int = 0
+
+    advertising_data: bytes = b''
+    scan_response_data: bytes = b''
+
+    enabled: bool = False
+    timer_handle: asyncio.Handle | None = None
+
+    @property
+    def address(self) -> hci.Address:
+        '''Address used in advertising PDU.'''
+        if self.own_address_type == hci.Address.PUBLIC_DEVICE_ADDRESS:
+            return self.controller.public_address
+        else:
+            return self.controller.random_address
+
+    def _on_timer_fired(self) -> None:
+        self.send_advertising_data()
+        self.timer_handle = asyncio.get_running_loop().call_later(
+            self.advertising_interval_min / 1000.0, self._on_timer_fired
+        )
+
+    def start(self) -> None:
+        # Stop any ongoing advertising before we start again
+        self.stop()
+        self.enabled = True
+
+        # Advertise now
+        self.timer_handle = asyncio.get_running_loop().call_soon(self._on_timer_fired)
+
+    def stop(self) -> None:
+        if self.timer_handle is not None:
+            self.timer_handle.cancel()
+            self.timer_handle = None
+        self.enabled = False
+
+    def send_advertising_data(self) -> None:
+        if not self.enabled:
+            return
+
+        if (
+            self.advertising_type
+            == hci.HCI_LE_Set_Advertising_Parameters_Command.AdvertisingType.ADV_IND
+        ):
+            self.controller.send_advertising_pdu(
+                ll.AdvInd(
+                    advertiser_address=self.address,
+                    data=self.advertising_data,
+                )
+            )
+
+
+# -----------------------------------------------------------------------------
+@dataclasses.dataclass
+class AdvertisingSet:
+    controller: Controller
+    handle: int
+    parameters: hci.HCI_LE_Set_Extended_Advertising_Parameters_Command | None = None
+    data: bytearray = dataclasses.field(default_factory=bytearray)
+    scan_response_data: bytearray = dataclasses.field(default_factory=bytearray)
+    enabled: bool = False
+    timer_handle: asyncio.Handle | None = None
+    random_address: hci.Address | None = None
+
+    @property
+    def address(self) -> hci.Address | None:
+        '''Address used in advertising PDU.'''
+        if not self.parameters:
+            return None
+        if self.parameters.own_address_type == hci.Address.PUBLIC_DEVICE_ADDRESS:
+            return self.controller.public_address
+        else:
+            return self.random_address
+
+    def _on_extended_advertising_timer_fired(self) -> None:
+        if not self.enabled:
+            return
+
+        self.send_extended_advertising_data()
+
+        interval = (
+            self.parameters.primary_advertising_interval_min * 0.625 / 1000.0
+            if self.parameters
+            else 1.0
+        )
+        self.timer_handle = asyncio.get_running_loop().call_later(
+            interval, self._on_extended_advertising_timer_fired
+        )
+
+    def start(self) -> None:
+        self.enabled = True
+        asyncio.get_running_loop().call_soon(self._on_extended_advertising_timer_fired)
+
+    def stop(self) -> None:
+        self.enabled = False
+        if timer_handle := self.timer_handle:
+            timer_handle.cancel()
+        self.timer_handle = None
+
+    def send_extended_advertising_data(self) -> None:
+        if self.controller.link:
+            address = self.address
+            assert address
+
+            self.controller.send_advertising_pdu(ll.AdvInd(address, bytes(self.data)))
+
+
 # -----------------------------------------------------------------------------
 @dataclasses.dataclass
 class ScoLink:
@@ -70,9 +188,10 @@ class Connection:
     controller: Controller
     handle: int
     role: hci.Role
+    self_address: hci.Address
     peer_address: hci.Address
-    link: Any
-    transport: int
+    link: link.LocalLink
+    transport: PhysicalTransport
     link_type: int
     classic_allow_role_switch: bool = False
 
@@ -93,22 +212,27 @@ class Connection:
                 self.controller, self.peer_address, self.transport, pdu
             )
 
+    def send_ll_control_pdu(self, packet: ll.ControlPdu) -> None:
+        if self.link:
+            self.link.send_ll_control_pdu(
+                sender_address=self.self_address,
+                receiver_address=self.peer_address,
+                packet=packet,
+            )
+
 
 # -----------------------------------------------------------------------------
 class Controller:
-    hci_sink: Optional[TransportSink] = None
-
-    central_connections: dict[
-        hci.Address, Connection
-    ]  # Connections where this controller is the central
-    peripheral_connections: dict[
-        hci.Address, Connection
-    ]  # Connections where this controller is the peripheral
+    hci_sink: TransportSink | None = None
+
+    le_connections: dict[hci.Address, Connection]  # LE Connections
     classic_connections: dict[hci.Address, Connection]  # Connections in BR/EDR
     classic_pending_commands: dict[hci.Address, dict[lmp.Opcode, asyncio.Future[int]]]
     sco_links: dict[hci.Address, ScoLink]  # SCO links by address
     central_cis_links: dict[int, CisLink]  # CIS links by handle
     peripheral_cis_links: dict[int, CisLink]  # CIS links by handle
+    advertising_sets: dict[int, AdvertisingSet]  # Advertising sets by handle
+    le_legacy_advertiser: LegacyAdvertiser
 
     hci_version: int = hci.HCI_VERSION_BLUETOOTH_CORE_5_0
     hci_revision: int = 0
@@ -131,10 +255,20 @@ class Controller:
         '30f0f9ff01008004002000000000000000000000000000000000000000000000'
     )
     le_event_mask: int = 0
-    advertising_parameters: Optional[hci.HCI_LE_Set_Advertising_Parameters_Command] = (
-        None
+    le_features: hci.LeFeatureMask = (
+        hci.LeFeatureMask.LE_ENCRYPTION
+        | hci.LeFeatureMask.CONNECTION_PARAMETERS_REQUEST_PROCEDURE
+        | hci.LeFeatureMask.EXTENDED_REJECT_INDICATION
+        | hci.LeFeatureMask.PERIPHERAL_INITIATED_FEATURE_EXCHANGE
+        | hci.LeFeatureMask.LE_PING
+        | hci.LeFeatureMask.LE_DATA_PACKET_LENGTH_EXTENSION
+        | hci.LeFeatureMask.LL_PRIVACY
+        | hci.LeFeatureMask.EXTENDED_SCANNER_FILTER_POLICIES
+        | hci.LeFeatureMask.LE_2M_PHY
+        | hci.LeFeatureMask.LE_CODED_PHY
+        | hci.LeFeatureMask.CHANNEL_SELECTION_ALGORITHM_2
+        | hci.LeFeatureMask.MINIMUM_NUMBER_OF_USED_CHANNELS_PROCEDURE
     )
-    le_features: bytes = bytes.fromhex('ff49010000000000')
     le_states: bytes = bytes.fromhex('ffff3fffff030000')
     advertising_channel_tx_power: int = 0
     filter_accept_list_size: int = 8
@@ -150,19 +284,23 @@ class Controller:
     le_scan_type: int = 0
     le_scan_interval: int = 0x10
     le_scan_window: int = 0x10
-    le_scan_enable: int = 0
+    le_scan_enable: bool = False
     le_scan_own_address_type: int = hci.Address.RANDOM_DEVICE_ADDRESS
     le_scanning_filter_policy: int = 0
-    le_scan_response_data: Optional[bytes] = None
     le_address_resolution: bool = False
     le_rpa_timeout: int = 0
     sync_flow_control: bool = False
     local_name: str = 'Bumble'
     advertising_interval: int = 2000
-    advertising_data: Optional[bytes] = None
-    advertising_timer_handle: Optional[asyncio.Handle] = None
+    advertising_data: bytes | None = None
+    advertising_timer_handle: asyncio.Handle | None = None
     classic_scan_enable: int = 0
     classic_allow_role_switch: bool = True
+    pending_le_connection: (
+        hci.HCI_LE_Create_Connection_Command
+        | hci.HCI_LE_Extended_Create_Connection_Command
+        | None
+    ) = None
 
     _random_address: hci.Address = hci.Address('00:00:00:00:00:00')
 
@@ -170,24 +308,25 @@ class Controller:
         self,
         name: str,
         host_source=None,
-        host_sink: Optional[TransportSink] = None,
-        link: Optional[LocalLink] = None,
-        public_address: Optional[Union[bytes, str, hci.Address]] = None,
+        host_sink: TransportSink | None = None,
+        link: link.LocalLink | None = None,
+        public_address: bytes | str | hci.Address | None = None,
     ) -> None:
         self.name = name
-        self.link = link
-        self.central_connections = {}
-        self.peripheral_connections = {}
+        self.link = link or bumble_link.LocalLink()
+        self.le_connections = {}
         self.classic_connections = {}
         self.sco_links = {}
         self.classic_pending_commands = {}
         self.central_cis_links = {}
         self.peripheral_cis_links = {}
+        self.advertising_sets = {}
         self.default_phy = {
             'all_phys': 0,
             'tx_phys': 0,
             'rx_phys': 0,
         }
+        self.le_legacy_advertiser = LegacyAdvertiser(self)
 
         if isinstance(public_address, hci.Address):
             self._public_address = public_address
@@ -212,18 +351,18 @@ class Controller:
         )
 
     @property
-    def host(self) -> Optional[TransportSink]:
+    def host(self) -> TransportSink | None:
         return self.hci_sink
 
     @host.setter
-    def host(self, host: Optional[TransportSink]) -> None:
+    def host(self, host: TransportSink | None) -> None:
         '''
         Sets the host (sink) for this controller, and set this controller as the
         controller (sink) for the host
         '''
         self.set_packet_sink(host)
 
-    def set_packet_sink(self, sink: Optional[TransportSink]) -> None:
+    def set_packet_sink(self, sink: TransportSink | None) -> None:
         '''
         Method from the Packet Source interface
         '''
@@ -234,7 +373,7 @@ class Controller:
         return self._public_address
 
     @public_address.setter
-    def public_address(self, address: Union[hci.Address, str]) -> None:
+    def public_address(self, address: hci.Address | str) -> None:
         if isinstance(address, str):
             address = hci.Address(address)
         self._public_address = address
@@ -244,7 +383,7 @@ class Controller:
         return self._random_address
 
     @random_address.setter
-    def random_address(self, address: Union[hci.Address, str]) -> None:
+    def random_address(self, address: hci.Address | str) -> None:
         if isinstance(address, str):
             address = hci.Address(address)
         self._random_address = address
@@ -276,7 +415,7 @@ class Controller:
     def on_hci_command_packet(self, command: hci.HCI_Command) -> None:
         handler_name = f'on_{command.name.lower()}'
         handler = getattr(self, handler_name, self.on_hci_command)
-        result: Optional[bytes] = handler(command)
+        result: bytes | None = handler(command)
         if isinstance(result, bytes):
             self.send_hci_packet(
                 hci.HCI_Command_Complete_Event(
@@ -320,8 +459,7 @@ class Controller:
         current_handles = set(
             cast(Connection | CisLink | ScoLink, link).handle
             for link in itertools.chain(
-                self.central_connections.values(),
-                self.peripheral_connections.values(),
+                self.le_connections.values(),
                 self.classic_connections.values(),
                 self.sco_links.values(),
                 self.central_cis_links.values(),
@@ -329,82 +467,106 @@ class Controller:
             )
         )
         return next(
-            handle for handle in range(0xEFF + 1) if handle not in current_handles
-        )
-
-    def find_le_connection_by_address(
-        self, address: hci.Address
-    ) -> Optional[Connection]:
-        return self.central_connections.get(address) or self.peripheral_connections.get(
-            address
+            handle
+            for handle in range(0x0001, 0xEFF + 1)
+            if handle not in current_handles
         )
 
-    def find_classic_connection_by_address(
-        self, address: hci.Address
-    ) -> Optional[Connection]:
-        return self.classic_connections.get(address)
-
-    def find_connection_by_handle(self, handle: int) -> Optional[Connection]:
+    def find_connection_by_handle(self, handle: int) -> Connection | None:
         for connection in itertools.chain(
-            self.central_connections.values(),
-            self.peripheral_connections.values(),
+            self.le_connections.values(),
             self.classic_connections.values(),
         ):
             if connection.handle == handle:
                 return connection
         return None
 
-    def find_central_connection_by_handle(self, handle: int) -> Optional[Connection]:
-        for connection in self.central_connections.values():
-            if connection.handle == handle:
-                return connection
-        return None
-
-    def find_peripheral_connection_by_handle(self, handle: int) -> Optional[Connection]:
-        for connection in self.peripheral_connections.values():
-            if connection.handle == handle:
-                return connection
-        return None
-
-    def find_classic_connection_by_handle(self, handle: int) -> Optional[Connection]:
-        for connection in self.classic_connections.values():
-            if connection.handle == handle:
-                return connection
-        return None
-
-    def find_classic_sco_link_by_handle(self, handle: int) -> Optional[ScoLink]:
+    def find_classic_sco_link_by_handle(self, handle: int) -> ScoLink | None:
         for connection in self.sco_links.values():
             if connection.handle == handle:
                 return connection
         return None
 
-    def find_iso_link_by_handle(self, handle: int) -> Optional[CisLink]:
+    def find_iso_link_by_handle(self, handle: int) -> CisLink | None:
         return self.central_cis_links.get(handle) or self.peripheral_cis_links.get(
             handle
         )
 
-    def on_link_central_connected(self, central_address: hci.Address) -> None:
+    def send_advertising_pdu(self, packet: ll.AdvertisingPdu) -> None:
+        logger.debug("[%s] >>> Advertising PDU: %s", self.name, packet)
+        if self.link:
+            self.link.send_advertising_pdu(self, packet)
+
+    def on_ll_control_pdu(
+        self, sender_address: hci.Address, packet: ll.ControlPdu
+    ) -> None:
+        logger.debug("[%s] >>> LL Control PDU: %s", self.name, packet)
+        if not (connection := self.le_connections.get(sender_address)):
+            logger.error("Cannot find a connection for %s", sender_address)
+            return
+
+        if isinstance(packet, ll.TerminateInd):
+            self.on_le_disconnected(connection, packet.error_code)
+        elif isinstance(packet, ll.CisReq):
+            self.on_le_cis_request(connection, packet.cig_id, packet.cis_id)
+        elif isinstance(packet, ll.CisRsp):
+            self.on_le_cis_established(packet.cig_id, packet.cis_id)
+            connection.send_ll_control_pdu(ll.CisInd(packet.cig_id, packet.cis_id))
+        elif isinstance(packet, ll.CisInd):
+            self.on_le_cis_established(packet.cig_id, packet.cis_id)
+        elif isinstance(packet, ll.CisTerminateInd):
+            self.on_le_cis_disconnected(packet.cig_id, packet.cis_id)
+        elif isinstance(packet, ll.EncReq):
+            self.on_le_encrypted(connection)
+
+    def on_ll_advertising_pdu(self, packet: ll.AdvertisingPdu) -> None:
+        logger.debug("[%s] <<< Advertising PDU: %s", self.name, packet)
+        if isinstance(packet, ll.ConnectInd):
+            self.on_le_connect_ind(packet)
+        elif isinstance(packet, (ll.AdvInd, ll.AdvExtInd)):
+            self.on_advertising_pdu(packet)
+
+    def on_le_connect_ind(self, packet: ll.ConnectInd) -> None:
         '''
         Called when an incoming connection occurs from a central on the link
         '''
+        advertiser: LegacyAdvertiser | AdvertisingSet | None
+        if (
+            self.le_legacy_advertiser.address == packet.advertiser_address
+            and self.le_legacy_advertiser.enabled
+        ):
+            advertiser = self.le_legacy_advertiser
+        else:
+            advertiser = next(
+                (
+                    advertising_set
+                    for advertising_set in self.advertising_sets.values()
+                    if advertising_set.address == packet.advertiser_address
+                    and advertising_set.enabled
+                ),
+                None,
+            )
+
+        if not advertiser:
+            # This is not send to us.
+            return
 
         # Allocate (or reuse) a connection handle
-        peer_address = central_address
-        peer_address_type = central_address.address_type
-        connection = self.peripheral_connections.get(peer_address)
-        if connection is None:
-            connection_handle = self.allocate_connection_handle()
-            connection = Connection(
-                controller=self,
-                handle=connection_handle,
-                role=hci.Role.PERIPHERAL,
-                peer_address=peer_address,
-                link=self.link,
-                transport=PhysicalTransport.LE,
-                link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
-            )
-            self.peripheral_connections[peer_address] = connection
-            logger.debug(f'New PERIPHERAL connection handle: 0x{connection_handle:04X}')
+        peer_address = packet.initiator_address
+
+        connection_handle = self.allocate_connection_handle()
+        connection = Connection(
+            controller=self,
+            handle=connection_handle,
+            role=hci.Role.PERIPHERAL,
+            self_address=packet.advertiser_address,
+            peer_address=peer_address,
+            link=self.link,
+            transport=PhysicalTransport.LE,
+            link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
+        )
+        self.le_connections[peer_address] = connection
+        logger.debug(f'New PERIPHERAL connection handle: 0x{connection_handle:04X}')
 
         # Then say that the connection has completed
         self.send_hci_packet(
@@ -412,7 +574,7 @@ class Controller:
                 status=hci.HCI_SUCCESS,
                 connection_handle=connection.handle,
                 role=connection.role,
-                peer_address_type=peer_address_type,
+                peer_address_type=peer_address.address_type,
                 peer_address=peer_address,
                 connection_interval=10,  # FIXME
                 peripheral_latency=0,  # FIXME
@@ -421,131 +583,113 @@ class Controller:
             )
         )
 
-    def on_link_disconnected(self, peer_address: hci.Address, reason: int) -> None:
-        '''
-        Called when an active disconnection occurs from a peer
-        '''
-
-        # Send a disconnection complete event
-        if connection := self.peripheral_connections.get(peer_address):
+        if isinstance(advertiser, AdvertisingSet):
             self.send_hci_packet(
-                hci.HCI_Disconnection_Complete_Event(
+                hci.HCI_LE_Advertising_Set_Terminated_Event(
                     status=hci.HCI_SUCCESS,
+                    advertising_handle=advertiser.handle,
                     connection_handle=connection.handle,
-                    reason=reason,
+                    num_completed_extended_advertising_events=0,
                 )
             )
+        advertiser.stop()
 
-            # Remove the connection
-            del self.peripheral_connections[peer_address]
-        elif connection := self.central_connections.get(peer_address):
-            self.send_hci_packet(
-                hci.HCI_Disconnection_Complete_Event(
-                    status=hci.HCI_SUCCESS,
-                    connection_handle=connection.handle,
-                    reason=reason,
-                )
+    def on_le_disconnected(self, connection: Connection, reason: int) -> None:
+        # Send a disconnection complete event
+        self.send_hci_packet(
+            hci.HCI_Disconnection_Complete_Event(
+                status=hci.HCI_SUCCESS,
+                connection_handle=connection.handle,
+                reason=reason,
             )
+        )
 
-            # Remove the connection
-            del self.central_connections[peer_address]
-        else:
-            logger.warning(f'!!! No peripheral connection found for {peer_address}')
-
-    def on_link_peripheral_connection_complete(
-        self,
-        le_create_connection_command: hci.HCI_LE_Create_Connection_Command,
-        status: int,
-    ) -> None:
+    def create_le_connection(self, peer_address: hci.Address) -> None:
         '''
-        Called by the link when a connection has been made or has failed to be made
+        Called when we receive advertisement matching connection filter.
         '''
+        pending_le_connection = self.pending_le_connection
+        assert pending_le_connection
 
-        if status == hci.HCI_SUCCESS:
-            # Allocate (or reuse) a connection handle
-            peer_address = le_create_connection_command.peer_address
-            connection = self.central_connections.get(peer_address)
-            if connection is None:
-                connection_handle = self.allocate_connection_handle()
-                connection = Connection(
-                    controller=self,
-                    handle=connection_handle,
-                    role=hci.Role.CENTRAL,
-                    peer_address=peer_address,
-                    link=self.link,
-                    transport=PhysicalTransport.LE,
-                    link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
-                )
-                self.central_connections[peer_address] = connection
-                logger.debug(
-                    f'New CENTRAL connection handle: 0x{connection_handle:04X}'
-                )
+        if self.le_connections.get(peer_address):
+            logger.error("Connection for %s already exists?", peer_address)
+            return
+
+        self_address = (
+            self.public_address
+            if pending_le_connection.own_address_type == hci.OwnAddressType.PUBLIC
+            else self.random_address
+        )
+
+        # Allocate (or reuse) a connection handle
+        peer_address = pending_le_connection.peer_address
+        connection_handle = self.allocate_connection_handle()
+        connection = Connection(
+            controller=self,
+            handle=connection_handle,
+            role=hci.Role.CENTRAL,
+            self_address=self_address,
+            peer_address=peer_address,
+            link=self.link,
+            transport=PhysicalTransport.LE,
+            link_type=hci.HCI_Connection_Complete_Event.LinkType.ACL,
+        )
+        self.le_connections[peer_address] = connection
+        logger.debug(f'New CENTRAL connection handle: 0x{connection_handle:04X}')
+
+        if isinstance(
+            pending_le_connection, hci.HCI_LE_Extended_Create_Connection_Command
+        ):
+            interval = pending_le_connection.connection_interval_mins[0]
+            latency = pending_le_connection.max_latencies[0]
+            timeout = pending_le_connection.supervision_timeouts[0]
         else:
-            connection = None
+            interval = pending_le_connection.connection_interval_min
+            latency = pending_le_connection.max_latency
+            timeout = pending_le_connection.supervision_timeout
 
+        self.send_advertising_pdu(
+            ll.ConnectInd(
+                initiator_address=self_address,
+                advertiser_address=peer_address,
+                interval=interval,
+                latency=latency,
+                timeout=timeout,
+            )
+        )
         # Say that the connection has completed
         self.send_hci_packet(
             # pylint: disable=line-too-long
             hci.HCI_LE_Connection_Complete_Event(
-                status=status,
+                status=hci.HCI_SUCCESS,
                 connection_handle=connection.handle if connection else 0,
                 role=hci.Role.CENTRAL,
-                peer_address_type=le_create_connection_command.peer_address_type,
-                peer_address=le_create_connection_command.peer_address,
-                connection_interval=le_create_connection_command.connection_interval_min,
-                peripheral_latency=le_create_connection_command.max_latency,
-                supervision_timeout=le_create_connection_command.supervision_timeout,
+                peer_address_type=peer_address.address_type,
+                peer_address=peer_address,
+                connection_interval=interval,
+                peripheral_latency=latency,
+                supervision_timeout=timeout,
                 central_clock_accuracy=0,
             )
         )
+        self.pending_le_connection = None
 
-    def on_link_disconnection_complete(
-        self, disconnection_command: hci.HCI_Disconnect_Command, status: int
-    ) -> None:
-        '''
-        Called when a disconnection has been completed
-        '''
-
-        # Send a disconnection complete event
+    def on_le_encrypted(self, connection: Connection) -> None:
+        # For now, just setup the encryption without asking the host
         self.send_hci_packet(
-            hci.HCI_Disconnection_Complete_Event(
-                status=status,
-                connection_handle=disconnection_command.connection_handle,
-                reason=disconnection_command.reason,
+            hci.HCI_Encryption_Change_Event(
+                status=0, connection_handle=connection.handle, encryption_enabled=1
             )
         )
 
-        # Remove the connection
-        if connection := self.find_central_connection_by_handle(
-            disconnection_command.connection_handle
-        ):
-            logger.debug(f'CENTRAL Connection removed: {connection}')
-            del self.central_connections[connection.peer_address]
-        elif connection := self.find_peripheral_connection_by_handle(
-            disconnection_command.connection_handle
-        ):
-            logger.debug(f'PERIPHERAL Connection removed: {connection}')
-            del self.peripheral_connections[connection.peer_address]
-
-    def on_link_encrypted(
-        self, peer_address: hci.Address, _rand: bytes, _ediv: int, _ltk: bytes
-    ) -> None:
-        # For now, just setup the encryption without asking the host
-        if connection := self.find_le_connection_by_address(peer_address):
-            self.send_hci_packet(
-                hci.HCI_Encryption_Change_Event(
-                    status=0, connection_handle=connection.handle, encryption_enabled=1
-                )
-            )
-
     def on_link_acl_data(
         self, sender_address: hci.Address, transport: PhysicalTransport, data: bytes
     ) -> None:
         # Look for the connection to which this data belongs
         if transport == PhysicalTransport.LE:
-            connection = self.find_le_connection_by_address(sender_address)
+            connection = self.le_connections.get(sender_address)
         else:
-            connection = self.find_classic_connection_by_address(sender_address)
+            connection = self.classic_connections.get(sender_address)
         if connection is None:
             logger.warning(f'!!! no connection for {sender_address}')
             return
@@ -555,43 +699,83 @@ class Controller:
         acl_packet = hci.HCI_AclDataPacket(connection.handle, 2, 0, len(data), data)
         self.send_hci_packet(acl_packet)
 
-    def on_link_advertising_data(
-        self, sender_address: hci.Address, data: bytes
-    ) -> None:
-        # Ignore if we're not scanning
-        if self.le_scan_enable == 0:
-            return
+    def on_advertising_pdu(self, pdu: ll.AdvInd | ll.AdvExtInd) -> None:
+        if isinstance(pdu, ll.AdvExtInd):
+            direct_address = pdu.target_address
+        else:
+            direct_address = None
 
-        # Send a scan report
-        report = hci.HCI_LE_Advertising_Report_Event.Report(
-            event_type=hci.HCI_LE_Advertising_Report_Event.EventType.ADV_IND,
-            address_type=sender_address.address_type,
-            address=sender_address,
-            data=data,
-            rssi=-50,
-        )
-        self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
+        if self.le_scan_enable:
+            # Send a scan report
+            if self.le_features & hci.LeFeatureMask.LE_EXTENDED_ADVERTISING:
+                ext_report = hci.HCI_LE_Extended_Advertising_Report_Event.Report(
+                    event_type=hci.HCI_LE_Extended_Advertising_Report_Event.EventType.CONNECTABLE_ADVERTISING,
+                    address_type=pdu.advertiser_address.address_type,
+                    address=pdu.advertiser_address,
+                    primary_phy=hci.Phy.LE_1M,
+                    secondary_phy=hci.Phy.LE_1M,
+                    advertising_sid=0,
+                    tx_power=0,
+                    rssi=-50,
+                    periodic_advertising_interval=0,
+                    direct_address_type=(
+                        direct_address.address_type if direct_address else 0
+                    ),
+                    direct_address=direct_address or hci.Address.ANY,
+                    data=pdu.data,
+                )
+                self.send_hci_packet(
+                    hci.HCI_LE_Extended_Advertising_Report_Event([ext_report])
+                )
+                ext_report = hci.HCI_LE_Extended_Advertising_Report_Event.Report(
+                    event_type=hci.HCI_LE_Extended_Advertising_Report_Event.EventType.SCAN_RESPONSE,
+                    address_type=pdu.advertiser_address.address_type,
+                    address=pdu.advertiser_address,
+                    primary_phy=hci.Phy.LE_1M,
+                    secondary_phy=hci.Phy.LE_1M,
+                    advertising_sid=0,
+                    tx_power=0,
+                    rssi=-50,
+                    periodic_advertising_interval=0,
+                    direct_address_type=(
+                        direct_address.address_type if direct_address else 0
+                    ),
+                    direct_address=direct_address or hci.Address.ANY,
+                    data=pdu.data,
+                )
+                self.send_hci_packet(
+                    hci.HCI_LE_Extended_Advertising_Report_Event([ext_report])
+                )
+            else:
+                report = hci.HCI_LE_Advertising_Report_Event.Report(
+                    event_type=hci.HCI_LE_Advertising_Report_Event.EventType.ADV_IND,
+                    address_type=pdu.advertiser_address.address_type,
+                    address=pdu.advertiser_address,
+                    data=pdu.data,
+                    rssi=-50,
+                )
+                self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
+                report = hci.HCI_LE_Advertising_Report_Event.Report(
+                    event_type=hci.HCI_LE_Advertising_Report_Event.EventType.SCAN_RSP,
+                    address_type=pdu.advertiser_address.address_type,
+                    address=pdu.advertiser_address,
+                    data=pdu.data,
+                    rssi=-50,
+                )
+                self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
 
-        # Simulate a scan response
-        report = hci.HCI_LE_Advertising_Report_Event.Report(
-            event_type=hci.HCI_LE_Advertising_Report_Event.EventType.SCAN_RSP,
-            address_type=sender_address.address_type,
-            address=sender_address,
-            data=data,
-            rssi=-50,
-        )
-        self.send_hci_packet(hci.HCI_LE_Advertising_Report_Event([report]))
+        # Create connection.
+        if (
+            pending_le_connection := self.pending_le_connection
+        ) and pending_le_connection.peer_address == pdu.advertiser_address:
+            self.create_le_connection(pdu.advertiser_address)
 
-    def on_link_cis_request(
-        self, central_address: hci.Address, cig_id: int, cis_id: int
+    def on_le_cis_request(
+        self, connection: Connection, cig_id: int, cis_id: int
     ) -> None:
         '''
         Called when an incoming CIS request occurs from a central on the link
         '''
-
-        connection = self.peripheral_connections.get(central_address)
-        assert connection
-
         pending_cis_link = CisLink(
             handle=self.allocate_connection_handle(),
             cis_id=cis_id,
@@ -609,7 +793,7 @@ class Controller:
             )
         )
 
-    def on_link_cis_established(self, cig_id: int, cis_id: int) -> None:
+    def on_le_cis_established(self, cig_id: int, cis_id: int) -> None:
         '''
         Called when an incoming CIS established.
         '''
@@ -644,7 +828,7 @@ class Controller:
             )
         )
 
-    def on_link_cis_disconnected(self, cig_id: int, cis_id: int) -> None:
+    def on_le_cis_disconnected(self, cig_id: int, cis_id: int) -> None:
         '''
         Called when a CIS disconnected.
         '''
@@ -750,6 +934,7 @@ class Controller:
                 controller=self,
                 handle=0,
                 role=hci.Role.PERIPHERAL,
+                self_address=self.public_address,
                 peer_address=peer_address,
                 link=self.link,
                 transport=PhysicalTransport.BR_EDR,
@@ -784,6 +969,7 @@ class Controller:
                     controller=self,
                     handle=connection_handle,
                     role=hci.Role.CENTRAL,
+                    self_address=self.public_address,
                     peer_address=peer_address,
                     link=self.link,
                     transport=PhysicalTransport.BR_EDR,
@@ -934,44 +1120,23 @@ class Controller:
     ############################################################
     # Advertising support
     ############################################################
-    def on_advertising_timer_fired(self) -> None:
-        self.send_advertising_data()
-        self.advertising_timer_handle = asyncio.get_running_loop().call_later(
-            self.advertising_interval / 1000.0, self.on_advertising_timer_fired
-        )
-
-    def start_advertising(self) -> None:
-        # Stop any ongoing advertising before we start again
-        self.stop_advertising()
-
-        # Advertise now
-        self.advertising_timer_handle = asyncio.get_running_loop().call_soon(
-            self.on_advertising_timer_fired
-        )
-
-    def stop_advertising(self) -> None:
-        if self.advertising_timer_handle is not None:
-            self.advertising_timer_handle.cancel()
-            self.advertising_timer_handle = None
-
-    def send_advertising_data(self) -> None:
-        if self.link and self.advertising_data:
-            self.link.send_advertising_data(self.random_address, self.advertising_data)
 
     @property
     def is_advertising(self) -> bool:
-        return self.advertising_timer_handle is not None
+        return self.le_legacy_advertiser.enabled or any(
+            s.enabled for s in self.advertising_sets.values()
+        )
 
     ############################################################
     # HCI handlers
     ############################################################
-    def on_hci_command(self, command: hci.HCI_Command) -> Optional[bytes]:
+    def on_hci_command(self, command: hci.HCI_Command) -> bytes | None:
         logger.warning(color(f'--- Unsupported command {command}', 'red'))
         return bytes([hci.HCI_UNKNOWN_HCI_COMMAND_ERROR])
 
     def on_hci_create_connection_command(
         self, command: hci.HCI_Create_Connection_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.5 Create Connection command
         '''
@@ -981,7 +1146,7 @@ class Controller:
         logger.debug(f'Connection request to {command.bd_addr}')
 
         # Check that we don't already have a pending connection
-        if self.link.get_pending_connection():
+        if self.pending_le_connection:
             self.send_hci_packet(
                 hci.HCI_Command_Status_Event(
                     status=hci.HCI_CONTROLLER_BUSY_ERROR,
@@ -995,6 +1160,7 @@ class Controller:
             controller=self,
             handle=0,
             role=hci.Role.CENTRAL,
+            self_address=self.public_address,
             peer_address=command.bd_addr,
             link=self.link,
             transport=PhysicalTransport.BR_EDR,
@@ -1020,7 +1186,7 @@ class Controller:
 
     def on_hci_disconnect_command(
         self, command: hci.HCI_Disconnect_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.6 Disconnect Command
         '''
@@ -1035,29 +1201,19 @@ class Controller:
 
         # Notify the link of the disconnection
         handle = command.connection_handle
-        if connection := self.find_central_connection_by_handle(handle):
-            if self.link:
-                self.link.disconnect(
-                    self.random_address, connection.peer_address, command
-                )
-            else:
-                # Remove the connection
-                del self.central_connections[connection.peer_address]
-        elif connection := self.find_peripheral_connection_by_handle(handle):
+        if connection := self.find_connection_by_handle(handle):
             if self.link:
-                self.link.disconnect(
-                    self.random_address, connection.peer_address, command
-                )
-            else:
-                # Remove the connection
-                del self.peripheral_connections[connection.peer_address]
-        elif connection := self.find_classic_connection_by_handle(handle):
-            if self.link:
-                self.send_lmp_packet(
-                    connection.peer_address,
-                    lmp.LmpDetach(command.reason),
-                )
-                self.on_classic_disconnected(connection.peer_address, command.reason)
+                if connection.transport == PhysicalTransport.BR_EDR:
+                    self.send_lmp_packet(
+                        connection.peer_address,
+                        lmp.LmpDetach(command.reason),
+                    )
+                    self.on_classic_disconnected(
+                        connection.peer_address, command.reason
+                    )
+                else:
+                    connection.send_ll_control_pdu(ll.TerminateInd(command.reason))
+                    self.on_le_disconnected(connection, command.reason)
             else:
                 # Remove the connection
                 del self.classic_connections[connection.peer_address]
@@ -1088,19 +1244,19 @@ class Controller:
             self.central_cis_links.get(handle) or self.peripheral_cis_links.get(handle)
         ):
             if self.link and cis_link.acl_connection:
-                self.link.disconnect_cis(
-                    initiator_controller=self,
-                    peer_address=cis_link.acl_connection.peer_address,
-                    cig_id=cis_link.cig_id,
-                    cis_id=cis_link.cis_id,
+                cis_link.acl_connection.send_ll_control_pdu(
+                    ll.CisTerminateInd(
+                        cis_link.cig_id, cis_link.cis_id, command.reason
+                    ),
                 )
+                self.on_le_cis_disconnected(cis_link.cig_id, cis_link.cis_id)
             # Spec requires handle to be kept after disconnection.
 
         return None
 
     def on_hci_accept_connection_request_command(
         self, command: hci.HCI_Accept_Connection_Request_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.8 Accept Connection Request command
         '''
@@ -1158,7 +1314,7 @@ class Controller:
 
     def on_hci_remote_name_request_command(
         self, command: hci.HCI_Remote_Name_Request_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.19 Remote Name Request command
         '''
@@ -1176,7 +1332,7 @@ class Controller:
 
     def on_hci_enhanced_setup_synchronous_connection_command(
         self, command: hci.HCI_Enhanced_Setup_Synchronous_Connection_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.45 Enhanced Setup Synchronous Connection command
         '''
@@ -1185,9 +1341,7 @@ class Controller:
             return None
 
         if not (
-            connection := self.find_classic_connection_by_handle(
-                command.connection_handle
-            )
+            connection := self.find_connection_by_handle(command.connection_handle)
         ):
             self.send_hci_packet(
                 hci.HCI_Command_Status_Event(
@@ -1235,7 +1389,7 @@ class Controller:
 
     def on_hci_enhanced_accept_synchronous_connection_request_command(
         self, command: hci.HCI_Enhanced_Accept_Synchronous_Connection_Request_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.1.46 Enhanced Accept Synchronous Connection Request command
         '''
@@ -1243,7 +1397,7 @@ class Controller:
         if self.link is None:
             return None
 
-        if not (connection := self.find_classic_connection_by_address(command.bd_addr)):
+        if not (connection := self.classic_connections.get(command.bd_addr)):
             self.send_hci_packet(
                 hci.HCI_Command_Status_Event(
                     status=hci.HCI_UNKNOWN_CONNECTION_IDENTIFIER_ERROR,
@@ -1273,7 +1427,7 @@ class Controller:
 
     def on_hci_sniff_mode_command(
         self, command: hci.HCI_Sniff_Mode_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.2.2 Sniff Mode command
         '''
@@ -1306,7 +1460,7 @@ class Controller:
 
     def on_hci_exit_sniff_mode_command(
         self, command: hci.HCI_Exit_Sniff_Mode_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.2.3 Exit Sniff Mode command
         '''
@@ -1340,7 +1494,7 @@ class Controller:
 
     def on_hci_switch_role_command(
         self, command: hci.HCI_Switch_Role_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.2.8 Switch hci.Role command
         '''
@@ -1397,7 +1551,7 @@ class Controller:
 
     def on_hci_set_event_mask_command(
         self, command: hci.HCI_Set_Event_Mask_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.1 Set Event Mask Command
         '''
@@ -1406,7 +1560,7 @@ class Controller:
         )
         return bytes([hci.HCI_SUCCESS])
 
-    def on_hci_reset_command(self, _command: hci.HCI_Reset_Command) -> Optional[bytes]:
+    def on_hci_reset_command(self, _command: hci.HCI_Reset_Command) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.2 Reset Command
         '''
@@ -1415,7 +1569,7 @@ class Controller:
 
     def on_hci_write_local_name_command(
         self, command: hci.HCI_Write_Local_Name_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.11 Write Local Name Command
         '''
@@ -1432,7 +1586,7 @@ class Controller:
 
     def on_hci_read_local_name_command(
         self, _command: hci.HCI_Read_Local_Name_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.12 Read Local Name Command
         '''
@@ -1444,7 +1598,7 @@ class Controller:
 
     def on_hci_read_class_of_device_command(
         self, _command: hci.HCI_Read_Class_Of_Device_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.25 Read Class of Device Command
         '''
@@ -1452,7 +1606,7 @@ class Controller:
 
     def on_hci_write_class_of_device_command(
         self, _command: hci.HCI_Write_Class_Of_Device_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.26 Write Class of Device Command
         '''
@@ -1460,7 +1614,7 @@ class Controller:
 
     def on_hci_read_synchronous_flow_control_enable_command(
         self, _command: hci.HCI_Read_Synchronous_Flow_Control_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.36 Read Synchronous Flow Control Enable
         Command
@@ -1473,7 +1627,7 @@ class Controller:
 
     def on_hci_write_synchronous_flow_control_enable_command(
         self, command: hci.HCI_Write_Synchronous_Flow_Control_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.37 Write Synchronous Flow Control Enable
         Command
@@ -1489,7 +1643,7 @@ class Controller:
 
     def on_hci_set_controller_to_host_flow_control_command(
         self, _command: hci.HCI_Set_Controller_To_Host_Flow_Control_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.38 Set Controller To Host Flow Control
         Command
@@ -1500,7 +1654,7 @@ class Controller:
 
     def on_hci_host_buffer_size_command(
         self, _command: hci.HCI_Host_Buffer_Size_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.39 Host Buffer Size Command
         '''
@@ -1510,7 +1664,7 @@ class Controller:
 
     def on_hci_write_extended_inquiry_response_command(
         self, _command: hci.HCI_Write_Extended_Inquiry_Response_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.56 Write Extended Inquiry Response
         Command
@@ -1519,7 +1673,7 @@ class Controller:
 
     def on_hci_write_simple_pairing_mode_command(
         self, _command: hci.HCI_Write_Simple_Pairing_Mode_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.59 Write Simple Pairing Mode Command
         '''
@@ -1527,7 +1681,7 @@ class Controller:
 
     def on_hci_set_event_mask_page_2_command(
         self, command: hci.HCI_Set_Event_Mask_Page_2_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.69 Set Event Mask Page 2 Command
         '''
@@ -1538,7 +1692,7 @@ class Controller:
 
     def on_hci_read_le_host_support_command(
         self, _command: hci.HCI_Read_LE_Host_Support_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.78 Write LE Host Support Command
         '''
@@ -1546,7 +1700,7 @@ class Controller:
 
     def on_hci_write_le_host_support_command(
         self, _command: hci.HCI_Write_LE_Host_Support_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.79 Write LE Host Support Command
         '''
@@ -1555,7 +1709,7 @@ class Controller:
 
     def on_hci_write_authenticated_payload_timeout_command(
         self, command: hci.HCI_Write_Authenticated_Payload_Timeout_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.94 Write Authenticated Payload Timeout
         Command
@@ -1565,7 +1719,7 @@ class Controller:
 
     def on_hci_read_local_version_information_command(
         self, _command: hci.HCI_Read_Local_Version_Information_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.1 Read Local Version Information Command
         '''
@@ -1581,7 +1735,7 @@ class Controller:
 
     def on_hci_read_local_supported_commands_command(
         self, _command: hci.HCI_Read_Local_Supported_Commands_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.2 Read Local Supported Commands Command
         '''
@@ -1589,7 +1743,7 @@ class Controller:
 
     def on_hci_read_local_supported_features_command(
         self, _command: hci.HCI_Read_Local_Supported_Features_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.3 Read Local Supported Features Command
         '''
@@ -1597,7 +1751,7 @@ class Controller:
 
     def on_hci_read_local_extended_features_command(
         self, command: hci.HCI_Read_Local_Extended_Features_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.4 Read Local Extended Features Command
         '''
@@ -1620,7 +1774,7 @@ class Controller:
 
     def on_hci_read_buffer_size_command(
         self, _command: hci.HCI_Read_Buffer_Size_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.5 Read Buffer Size Command
         '''
@@ -1635,7 +1789,7 @@ class Controller:
 
     def on_hci_read_bd_addr_command(
         self, _command: hci.HCI_Read_BD_ADDR_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.4.6 Read BD_ADDR Command
         '''
@@ -1648,7 +1802,7 @@ class Controller:
 
     def on_hci_le_set_default_subrate_command(
         self, command: hci.HCI_LE_Set_Default_Subrate_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 6, Part E - 7.8.123 LE Set Event Mask Command
         '''
@@ -1664,7 +1818,7 @@ class Controller:
 
     def on_hci_le_subrate_request_command(
         self, command: hci.HCI_LE_Subrate_Request_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 6, Part E - 7.8.124 LE Subrate Request command
         '''
@@ -1698,7 +1852,7 @@ class Controller:
 
     def on_hci_le_set_event_mask_command(
         self, command: hci.HCI_LE_Set_Event_Mask_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.1 LE Set Event Mask Command
         '''
@@ -1709,7 +1863,7 @@ class Controller:
 
     def on_hci_le_read_buffer_size_command(
         self, _command: hci.HCI_LE_Read_Buffer_Size_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.2 LE Read Buffer Size Command
         '''
@@ -1722,7 +1876,7 @@ class Controller:
 
     def on_hci_le_read_buffer_size_v2_command(
         self, _command: hci.HCI_LE_Read_Buffer_Size_V2_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.2 LE Read Buffer Size Command
         '''
@@ -1737,16 +1891,16 @@ class Controller:
 
     def on_hci_le_read_local_supported_features_command(
         self, _command: hci.HCI_LE_Read_Local_Supported_Features_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.3 LE Read Local Supported Features
         Command
         '''
-        return bytes([hci.HCI_SUCCESS]) + self.le_features
+        return bytes([hci.HCI_SUCCESS]) + self.le_features.value.to_bytes(8, 'little')
 
     def on_hci_le_set_random_address_command(
         self, command: hci.HCI_LE_Set_Random_Address_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.4 LE Set Random hci.Address Command
         '''
@@ -1755,16 +1909,31 @@ class Controller:
 
     def on_hci_le_set_advertising_parameters_command(
         self, command: hci.HCI_LE_Set_Advertising_Parameters_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.5 LE Set Advertising Parameters Command
         '''
-        self.advertising_parameters = command
+        self.le_legacy_advertiser.advertising_interval_min = (
+            command.advertising_interval_min
+        )
+        self.le_legacy_advertiser.advertising_interval_max = (
+            command.advertising_interval_max
+        )
+        self.le_legacy_advertiser.advertising_type = command.advertising_type
+        self.le_legacy_advertiser.own_address_type = command.own_address_type
+        self.le_legacy_advertiser.peer_address_type = command.peer_address_type
+        self.le_legacy_advertiser.peer_address = command.peer_address
+        self.le_legacy_advertiser.advertising_channel_map = (
+            command.advertising_channel_map
+        )
+        self.le_legacy_advertiser.advertising_filter_policy = (
+            command.advertising_filter_policy
+        )
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_advertising_physical_channel_tx_power_command(
         self, _command: hci.HCI_LE_Read_Advertising_Physical_Channel_Tx_Power_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.6 LE Read Advertising Physical Channel
         Tx Power Command
@@ -1773,38 +1942,39 @@ class Controller:
 
     def on_hci_le_set_advertising_data_command(
         self, command: hci.HCI_LE_Set_Advertising_Data_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.7 LE Set Advertising Data Command
         '''
-        self.advertising_data = command.advertising_data
+        self.le_legacy_advertiser.advertising_data = command.advertising_data
+
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_scan_response_data_command(
         self, command: hci.HCI_LE_Set_Scan_Response_Data_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.8 LE Set Scan Response Data Command
         '''
-        self.le_scan_response_data = command.scan_response_data
+        self.le_legacy_advertiser.scan_response_data = command.scan_response_data
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_advertising_enable_command(
         self, command: hci.HCI_LE_Set_Advertising_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.9 LE Set Advertising Enable Command
         '''
         if command.advertising_enable:
-            self.start_advertising()
+            self.le_legacy_advertiser.start()
         else:
-            self.stop_advertising()
+            self.le_legacy_advertiser.stop()
 
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_scan_parameters_command(
         self, command: hci.HCI_LE_Set_Scan_Parameters_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.10 LE Set Scan Parameters Command
         '''
@@ -1820,7 +1990,7 @@ class Controller:
 
     def on_hci_le_set_scan_enable_command(
         self, command: hci.HCI_LE_Set_Scan_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.11 LE Set Scan Enable Command
         '''
@@ -1830,7 +2000,7 @@ class Controller:
 
     def on_hci_le_create_connection_command(
         self, command: hci.HCI_LE_Create_Connection_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.12 LE Create Connection Command
         '''
@@ -1841,7 +2011,7 @@ class Controller:
         logger.debug(f'Connection request to {command.peer_address}')
 
         # Check that we don't already have a pending connection
-        if self.link.get_pending_connection():
+        if self.pending_le_connection:
             self.send_hci_packet(
                 hci.HCI_Command_Status_Event(
                     status=hci.HCI_COMMAND_DISALLOWED_ERROR,
@@ -1851,8 +2021,7 @@ class Controller:
             )
             return None
 
-        # Initiate the connection
-        self.link.connect(self.random_address, command)
+        self.pending_le_connection = command
 
         # Say that the connection is pending
         self.send_hci_packet(
@@ -1866,15 +2035,46 @@ class Controller:
 
     def on_hci_le_create_connection_cancel_command(
         self, _command: hci.HCI_LE_Create_Connection_Cancel_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.13 LE Create Connection Cancel Command
         '''
         return bytes([hci.HCI_SUCCESS])
 
+    def on_hci_le_extended_create_connection_command(
+        self, command: hci.HCI_LE_Extended_Create_Connection_Command
+    ) -> bytes | None:
+        '''
+        See Bluetooth spec Vol 4, Part E - 7.8.66 LE Extended Create Connection Command
+        '''
+        if not self.link:
+            return None
+
+        # Check pending
+        if self.pending_le_connection:
+            self.send_hci_packet(
+                hci.HCI_Command_Status_Event(
+                    status=hci.HCI_COMMAND_DISALLOWED_ERROR,
+                    num_hci_command_packets=1,
+                    command_opcode=command.op_code,
+                )
+            )
+            return None
+
+        self.pending_le_connection = command
+
+        self.send_hci_packet(
+            hci.HCI_Command_Status_Event(
+                status=hci.HCI_COMMAND_STATUS_PENDING,
+                num_hci_command_packets=1,
+                command_opcode=command.op_code,
+            )
+        )
+        return None
+
     def on_hci_le_read_filter_accept_list_size_command(
         self, _command: hci.HCI_LE_Read_Filter_Accept_List_Size_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.14 LE Read Filter Accept List Size
         Command
@@ -1883,7 +2083,7 @@ class Controller:
 
     def on_hci_le_clear_filter_accept_list_command(
         self, _command: hci.HCI_LE_Clear_Filter_Accept_List_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.15 LE Clear Filter Accept List Command
         '''
@@ -1891,7 +2091,7 @@ class Controller:
 
     def on_hci_le_add_device_to_filter_accept_list_command(
         self, _command: hci.HCI_LE_Add_Device_To_Filter_Accept_List_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.16 LE Add Device To Filter Accept List
         Command
@@ -1900,7 +2100,7 @@ class Controller:
 
     def on_hci_le_remove_device_from_filter_accept_list_command(
         self, _command: hci.HCI_LE_Remove_Device_From_Filter_Accept_List_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.17 LE Remove Device From Filter Accept
         List Command
@@ -1909,7 +2109,7 @@ class Controller:
 
     def on_hci_write_scan_enable_command(
         self, command: hci.HCI_Write_Scan_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.3.18 Write Scan Enable Command
         '''
@@ -1918,7 +2118,7 @@ class Controller:
 
     def on_hci_le_read_remote_features_command(
         self, command: hci.HCI_LE_Read_Remote_Features_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.21 LE Read Remote Features Command
         '''
@@ -1954,9 +2154,7 @@ class Controller:
         )
         return None
 
-    def on_hci_le_rand_command(
-        self, _command: hci.HCI_LE_Rand_Command
-    ) -> Optional[bytes]:
+    def on_hci_le_rand_command(self, _command: hci.HCI_LE_Rand_Command) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.23 LE Rand Command
         '''
@@ -1964,7 +2162,7 @@ class Controller:
 
     def on_hci_le_enable_encryption_command(
         self, command: hci.HCI_LE_Enable_Encryption_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.24 LE Enable Encryption Command
         '''
@@ -1972,21 +2170,21 @@ class Controller:
             return None
 
         # Check the parameters
-        if not (
-            connection := self.find_central_connection_by_handle(
-                command.connection_handle
+        if (
+            not (
+                connection := self.find_connection_by_handle(command.connection_handle)
             )
+            or connection.transport != PhysicalTransport.LE
         ):
             logger.warning('connection not found')
             return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
-        # Notify that the connection is now encrypted
-        self.link.on_connection_encrypted(
-            self.random_address,
-            connection.peer_address,
-            command.random_number,
-            command.encrypted_diversifier,
-            command.long_term_key,
+        connection.send_ll_control_pdu(
+            ll.EncReq(
+                rand=command.random_number,
+                ediv=command.encrypted_diversifier,
+                ltk=command.long_term_key,
+            ),
         )
 
         self.send_hci_packet(
@@ -1997,11 +2195,14 @@ class Controller:
             )
         )
 
+        # TODO: Handle authentication
+        self.on_le_encrypted(connection)
+
         return None
 
     def on_hci_le_read_supported_states_command(
         self, _command: hci.HCI_LE_Read_Supported_States_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.27 LE Read Supported States Command
         '''
@@ -2009,7 +2210,7 @@ class Controller:
 
     def on_hci_le_read_suggested_default_data_length_command(
         self, _command: hci.HCI_LE_Read_Suggested_Default_Data_Length_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.34 LE Read Suggested Default Data Length
         Command
@@ -2023,7 +2224,7 @@ class Controller:
 
     def on_hci_le_write_suggested_default_data_length_command(
         self, command: hci.HCI_LE_Write_Suggested_Default_Data_Length_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.35 LE Write Suggested Default Data Length
         Command
@@ -2035,7 +2236,7 @@ class Controller:
 
     def on_hci_le_read_local_p_256_public_key_command(
         self, _command: hci.HCI_LE_Read_Local_P_256_Public_Key_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.36 LE Read P-256 Public Key Command
         '''
@@ -2044,7 +2245,7 @@ class Controller:
 
     def on_hci_le_add_device_to_resolving_list_command(
         self, _command: hci.HCI_LE_Add_Device_To_Resolving_List_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.38 LE Add Device To Resolving List
         Command
@@ -2053,7 +2254,7 @@ class Controller:
 
     def on_hci_le_clear_resolving_list_command(
         self, _command: hci.HCI_LE_Clear_Resolving_List_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.40 LE Clear Resolving List Command
         '''
@@ -2061,7 +2262,7 @@ class Controller:
 
     def on_hci_le_read_resolving_list_size_command(
         self, _command: hci.HCI_LE_Read_Resolving_List_Size_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.41 LE Read Resolving List Size Command
         '''
@@ -2069,7 +2270,7 @@ class Controller:
 
     def on_hci_le_set_address_resolution_enable_command(
         self, command: hci.HCI_LE_Set_Address_Resolution_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.44 LE Set hci.Address Resolution Enable
         Command
@@ -2085,7 +2286,7 @@ class Controller:
 
     def on_hci_le_set_resolvable_private_address_timeout_command(
         self, command: hci.HCI_LE_Set_Resolvable_Private_Address_Timeout_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.45 LE Set Resolvable Private hci.Address
         Timeout Command
@@ -2095,7 +2296,7 @@ class Controller:
 
     def on_hci_le_read_maximum_data_length_command(
         self, _command: hci.HCI_LE_Read_Maximum_Data_Length_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.46 LE Read Maximum Data Length Command
         '''
@@ -2110,7 +2311,7 @@ class Controller:
 
     def on_hci_le_read_phy_command(
         self, command: hci.HCI_LE_Read_PHY_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.47 LE Read PHY Command
         '''
@@ -2124,7 +2325,7 @@ class Controller:
 
     def on_hci_le_set_default_phy_command(
         self, command: hci.HCI_LE_Set_Default_PHY_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.48 LE Set Default PHY Command
         '''
@@ -2134,53 +2335,130 @@ class Controller:
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_advertising_set_random_address_command(
-        self, _command: hci.HCI_LE_Set_Advertising_Set_Random_Address_Command
-    ) -> Optional[bytes]:
+        self, command: hci.HCI_LE_Set_Advertising_Set_Random_Address_Command
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.52 LE Set Advertising Set Random hci.Address
         Command
         '''
+        handle = command.advertising_handle
+        if handle not in self.advertising_sets:
+            self.advertising_sets[handle] = AdvertisingSet(
+                controller=self, handle=handle
+            )
+        self.advertising_sets[handle].random_address = command.random_address
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_advertising_parameters_command(
-        self, _command: hci.HCI_LE_Set_Extended_Advertising_Parameters_Command
-    ) -> Optional[bytes]:
+        self, command: hci.HCI_LE_Set_Extended_Advertising_Parameters_Command
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.53 LE Set Extended Advertising Parameters
         Command
         '''
+        handle = command.advertising_handle
+        if handle not in self.advertising_sets:
+            self.advertising_sets[handle] = AdvertisingSet(
+                controller=self, handle=handle
+            )
+
+        self.advertising_sets[handle].parameters = command
         return bytes([hci.HCI_SUCCESS, 0])
 
     def on_hci_le_set_extended_advertising_data_command(
-        self, _command: hci.HCI_LE_Set_Extended_Advertising_Data_Command
-    ) -> Optional[bytes]:
+        self, command: hci.HCI_LE_Set_Extended_Advertising_Data_Command
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.54 LE Set Extended Advertising Data
         Command
         '''
+        handle = command.advertising_handle
+        if not (adv_set := self.advertising_sets.get(handle)):
+            return bytes([hci.HCI_UNKNOWN_ADVERTISING_IDENTIFIER_ERROR])
+
+        if command.operation in (
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.FIRST_FRAGMENT,
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.COMPLETE_DATA,
+        ):
+            adv_set.data = bytearray(command.advertising_data)
+        elif command.operation in (
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.INTERMEDIATE_FRAGMENT,
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.LAST_FRAGMENT,
+        ):
+            adv_set.data.extend(command.advertising_data)
+
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_scan_response_data_command(
-        self, _command: hci.HCI_LE_Set_Extended_Scan_Response_Data_Command
-    ) -> Optional[bytes]:
+        self, command: hci.HCI_LE_Set_Extended_Scan_Response_Data_Command
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.55 LE Set Extended Scan Response Data
         Command
         '''
+        handle = command.advertising_handle
+        if not (adv_set := self.advertising_sets.get(handle)):
+            return bytes([hci.HCI_UNKNOWN_ADVERTISING_IDENTIFIER_ERROR])
+
+        if command.operation in (
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.FIRST_FRAGMENT,
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.COMPLETE_DATA,
+        ):
+            adv_set.scan_response_data = bytearray(command.scan_response_data)
+        elif command.operation in (
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.INTERMEDIATE_FRAGMENT,
+            hci.HCI_LE_Set_Extended_Advertising_Data_Command.Operation.LAST_FRAGMENT,
+        ):
+            adv_set.scan_response_data.extend(command.scan_response_data)
+
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_set_extended_advertising_enable_command(
-        self, _command: hci.HCI_LE_Set_Extended_Advertising_Enable_Command
-    ) -> Optional[bytes]:
+        self, command: hci.HCI_LE_Set_Extended_Advertising_Enable_Command
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.56 LE Set Extended Advertising Enable
         Command
         '''
+        if command.enable:
+            for handle in command.advertising_handles:
+                if advertising_set := self.advertising_sets.get(handle):
+                    advertising_set.start()
+        else:
+            if not command.advertising_handles:
+                for advertising_set in self.advertising_sets.values():
+                    advertising_set.stop()
+            else:
+                for handle in command.advertising_handles:
+                    if advertising_set := self.advertising_sets.get(handle):
+                        advertising_set.stop()
+        return bytes([hci.HCI_SUCCESS])
+
+    def on_hci_le_remove_advertising_set_command(
+        self, command: hci.HCI_LE_Remove_Advertising_Set_Command
+    ) -> bytes | None:
+        '''
+        See Bluetooth spec Vol 4, Part E - 7.8.59 LE Remove Advertising Set Command
+        '''
+        handle = command.advertising_handle
+        if advertising_set := self.advertising_sets.pop(handle, None):
+            advertising_set.stop()
+        return bytes([hci.HCI_SUCCESS])
+
+    def on_hci_le_clear_advertising_sets_command(
+        self, _command: hci.HCI_LE_Clear_Advertising_Sets_Command
+    ) -> bytes | None:
+        '''
+        See Bluetooth spec Vol 4, Part E - 7.8.60 LE Clear Advertising Sets Command
+        '''
+        for advertising_set in self.advertising_sets.values():
+            advertising_set.stop()
+        self.advertising_sets.clear()
         return bytes([hci.HCI_SUCCESS])
 
     def on_hci_le_read_maximum_advertising_data_length_command(
         self, _command: hci.HCI_LE_Read_Maximum_Advertising_Data_Length_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.57 LE Read Maximum Advertising Data
         Length Command
@@ -2189,7 +2467,7 @@ class Controller:
 
     def on_hci_le_read_number_of_supported_advertising_sets_command(
         self, _command: hci.HCI_LE_Read_Number_Of_Supported_Advertising_Sets_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.58 LE Read Number of Supported
         Advertising Set Command
@@ -2198,7 +2476,7 @@ class Controller:
 
     def on_hci_le_set_periodic_advertising_parameters_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Parameters_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.61 LE Set Periodic Advertising Parameters
         Command
@@ -2207,7 +2485,7 @@ class Controller:
 
     def on_hci_le_set_periodic_advertising_data_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Data_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.62 LE Set Periodic Advertising Data
         Command
@@ -2216,7 +2494,7 @@ class Controller:
 
     def on_hci_le_set_periodic_advertising_enable_command(
         self, _command: hci.HCI_LE_Set_Periodic_Advertising_Enable_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.63 LE Set Periodic Advertising Enable
         Command
@@ -2225,7 +2503,7 @@ class Controller:
 
     def on_hci_le_read_transmit_power_command(
         self, _command: hci.HCI_LE_Read_Transmit_Power_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.74 LE Read Transmit Power Command
         '''
@@ -2233,7 +2511,7 @@ class Controller:
 
     def on_hci_le_set_cig_parameters_command(
         self, command: hci.HCI_LE_Set_CIG_Parameters_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.97 LE Set CIG Parameter Command
         '''
@@ -2259,7 +2537,7 @@ class Controller:
 
     def on_hci_le_create_cis_command(
         self, command: hci.HCI_LE_Create_CIS_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.99 LE Create CIS Command
         '''
@@ -2279,11 +2557,8 @@ class Controller:
 
             cis_link.acl_connection = connection
 
-            self.link.create_cis(
-                self,
-                peripheral_address=connection.peer_address,
-                cig_id=cis_link.cig_id,
-                cis_id=cis_link.cis_id,
+            connection.send_ll_control_pdu(
+                ll.CisReq(cig_id=cis_link.cig_id, cis_id=cis_link.cis_id)
             )
 
         self.send_hci_packet(
@@ -2297,7 +2572,7 @@ class Controller:
 
     def on_hci_le_remove_cig_command(
         self, command: hci.HCI_LE_Remove_CIG_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.100 LE Remove CIG Command
         '''
@@ -2314,7 +2589,7 @@ class Controller:
 
     def on_hci_le_accept_cis_request_command(
         self, command: hci.HCI_LE_Accept_CIS_Request_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.101 LE Accept CIS Request Command
         '''
@@ -2328,11 +2603,8 @@ class Controller:
             return bytes([hci.HCI_INVALID_HCI_COMMAND_PARAMETERS_ERROR])
 
         assert pending_cis_link.acl_connection
-        self.link.accept_cis(
-            peripheral_controller=self,
-            central_address=pending_cis_link.acl_connection.peer_address,
-            cig_id=pending_cis_link.cig_id,
-            cis_id=pending_cis_link.cis_id,
+        pending_cis_link.acl_connection.send_ll_control_pdu(
+            ll.CisRsp(cig_id=pending_cis_link.cig_id, cis_id=pending_cis_link.cis_id),
         )
 
         self.send_hci_packet(
@@ -2346,7 +2618,7 @@ class Controller:
 
     def on_hci_le_setup_iso_data_path_command(
         self, command: hci.HCI_LE_Setup_ISO_Data_Path_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.109 LE Setup ISO Data Path Command
         '''
@@ -2367,7 +2639,7 @@ class Controller:
 
     def on_hci_le_remove_iso_data_path_command(
         self, command: hci.HCI_LE_Remove_ISO_Data_Path_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.110 LE Remove ISO Data Path Command
         '''
@@ -2393,7 +2665,7 @@ class Controller:
 
     def on_hci_le_set_host_feature_command(
         self, _command: hci.HCI_LE_Set_Host_Feature_Command
-    ) -> Optional[bytes]:
+    ) -> bytes | None:
         '''
         See Bluetooth spec Vol 4, Part E - 7.8.115 LE Set Host Feature command
         '''