Merge pull request #79 from google/gbg/fix-host-reset

fix sequencing logic broken by earlier merge
Merge pull request #77 from mogenson/l2cap-on-event
2026-05-07 03:48:01 +00:00 · 2022-11-22 09:16:26 -08:00 · 2022-11-22 09:39:04 -05:00 · 2022-11-21 21:07:47 -08:00 · 2022-11-21 12:31:21 -05:00 · 2022-11-18 10:48:02 -05:00
4 changed files with 22 additions and 15 deletions
--- a/apps/console.py
+++ b/apps/console.py
@@ -443,7 +443,10 @@ class ConsoleApp:
        # Discover all services, characteristics and descriptors
        self.append_to_output('discovering services...')
        await self.connected_peer.discover_services()
-        self.append_to_output(f'found {len(self.connected_peer.services)} services, discovering charateristics...')
+        self.append_to_output(
+            f'found {len(self.connected_peer.services)} services,'
+            ' discovering characteristics...'
+        )
        await self.connected_peer.discover_characteristics()
        self.append_to_output('found characteristics, discovering descriptors...')
        for service in self.connected_peer.services:
--- a/bumble/host.py
+++ b/bumble/host.py
@@ -121,24 +121,28 @@ class Host(EventEmitter):
            self.hc_acl_data_packet_length     = response.return_parameters.hc_acl_data_packet_length
            self.hc_total_num_acl_data_packets = response.return_parameters.hc_total_num_acl_data_packets

+            logger.debug(
+                f'HCI ACL flow control: hc_acl_data_packet_length={self.hc_acl_data_packet_length},'
+                f'hc_total_num_acl_data_packets={self.hc_total_num_acl_data_packets}'
+            )
+
        if self.supports_command(HCI_LE_READ_BUFFER_SIZE_COMMAND):
            response = await self.send_command(HCI_LE_Read_Buffer_Size_Command(), check_result=True)
            self.hc_le_acl_data_packet_length     = response.return_parameters.hc_le_acl_data_packet_length
            self.hc_total_num_le_acl_data_packets = response.return_parameters.hc_total_num_le_acl_data_packets

-        if response.return_parameters.hc_le_acl_data_packet_length == 0 or response.return_parameters.hc_total_num_le_acl_data_packets == 0:
-            # LE and Classic share the same values
-            self.hc_le_acl_data_packet_length     = self.hc_acl_data_packet_length
-            self.hc_total_num_le_acl_data_packets = self.hc_total_num_acl_data_packets
+            logger.debug(
+                f'HCI LE ACL flow control: hc_le_acl_data_packet_length={self.hc_le_acl_data_packet_length},'
+                f'hc_total_num_le_acl_data_packets={self.hc_total_num_le_acl_data_packets}'
+            )

-        logger.debug(
-            f'HCI ACL flow control: hc_acl_data_packet_length={self.hc_acl_data_packet_length},'
-            f'hc_total_num_acl_data_packets={self.hc_total_num_acl_data_packets}'
-        )
-        logger.debug(
-            f'HCI LE ACL flow control: hc_le_acl_data_packet_length={self.hc_le_acl_data_packet_length},'
-            f'hc_total_num_le_acl_data_packets={self.hc_total_num_le_acl_data_packets}'
-        )
+            if (
+                response.return_parameters.hc_le_acl_data_packet_length == 0 or
+                response.return_parameters.hc_total_num_le_acl_data_packets == 0
+            ):
+                # LE and Classic share the same values
+                self.hc_le_acl_data_packet_length     = self.hc_acl_data_packet_length
+                self.hc_total_num_le_acl_data_packets = self.hc_total_num_acl_data_packets

        if (
            self.supports_command(HCI_LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH_COMMAND) and
--- a/bumble/l2cap.py
+++ b/bumble/l2cap.py
@@ -1224,7 +1224,7 @@ class ChannelManager:
            self._host.remove_listener('disconnection', self.on_disconnection)
        self._host = host
        if host is not None:
-            host.add_listener('disconnection', self.on_disconnection)
+            host.on('disconnection', self.on_disconnection)

    def find_channel(self, connection_handle, cid):
        if connection_channels := self.channels.get(connection_handle):
--- a/bumble/rfcomm.py
+++ b/bumble/rfcomm.py
@@ -636,8 +636,8 @@ class Multiplexer(EventEmitter):
            if self.open_result:
                self.open_result.set_exception(ConnectionError(
                    ConnectionError.CONNECTION_REFUSED,
-                    self.l2cap_channel.connection.peer_address,
                    BT_BR_EDR_TRANSPORT,
+                    self.l2cap_channel.connection.peer_address,
                    'rfcomm'
                ))
        else:
Author	SHA1	Message	Date
Gilles Boccon-Gibod	ae0b739e4a	Merge pull request #79 from google/gbg/fix-host-reset fix sequencing logic broken by earlier merge	2022-11-22 09:16:26 -08:00
Michael Mogenson	0570b59796	Merge pull request #77 from mogenson/l2cap-on-event Fix for 'Host' object has no attribute 'add_listener'	2022-11-22 09:39:04 -05:00
Gilles Boccon-Gibod	22218627f6	fix sequencing logic broken by earlier merge	2022-11-21 21:07:47 -08:00
Michael Mogenson	1c72242264	Fix for 'Host' object has no attribute 'add_listener' Pyee's add_listener() method was not added until release 9.0.0. Bumble's setup.cfg specifies a minimum pyee version of 8.2.2. Remove the call to add_listener() in l2cap.py. If the add_listener() API is prefered over the on(), another solution would be to bump the pyee version requirement.	2022-11-21 12:31:21 -05:00
Michael Mogenson	4988a31487	Merge pull request #76 from mogenson/connection-error-params Swap arguments to ConnectionError in RFCOMM Multiplexer	2022-11-18 10:48:02 -05:00
Michael Mogenson	e6c062117f	Swap arguments to ConnectionError in RFCOMM Multiplexer Minor fixup. Change the order of arguments to ConnectionError to set the transport and address correctly in rfcomm.py on_dm_frame().	2022-11-18 10:02:40 -05:00