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

Merge pull request #5 from google/gbg/disconnection-event-routing

Browse Source 
fix the routing of disconnection events
This commit is contained in:
Gilles Boccon-Gibod
2022-06-15 10:50:14 -07:00
committed by GitHub
parent 99ca31c063 153788afe3
commit f0fdd0c7ee
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bumble/device.py
View File

@@ -816,8 +816,8 @@ class Device(CompositeEventEmitter):
async def disconnect(self, connection, reason): async def disconnect(self, connection, reason):
# Create a future so that we can wait for the disconnection's result # Create a future so that we can wait for the disconnection's result
pending_disconnection = asyncio.get_running_loop().create_future() pending_disconnection = asyncio.get_running_loop().create_future()
self.on('disconnection', pending_disconnection.set_result) connection.on('disconnection', pending_disconnection.set_result)
self.on('disconnection_failure', pending_disconnection.set_exception) connection.on('disconnection_failure', pending_disconnection.set_exception)
# Request a disconnection # Request a disconnection
result = await self.send_command(HCI_Disconnect_Command(connection_handle = connection.handle, reason = reason)) result = await self.send_command(HCI_Disconnect_Command(connection_handle = connection.handle, reason = reason))
@@ -830,8 +830,8 @@ class Device(CompositeEventEmitter):
self.disconnecting = True self.disconnecting = True
return await pending_disconnection return await pending_disconnection
finally: finally:
self.remove_listener('disconnection', pending_disconnection.set_result) connection.remove_listener('disconnection', pending_disconnection.set_result)
self.remove_listener('disconnection_failure', pending_disconnection.set_exception) connection.remove_listener('disconnection_failure', pending_disconnection.set_exception)
self.disconnecting = False self.disconnecting = False
async def update_connection_parameters( async def update_connection_parameters(
@@ -1181,14 +1181,15 @@ class Device(CompositeEventEmitter):
asyncio.create_task(self.start_advertising(auto_restart=self.auto_restart_advertising)) asyncio.create_task(self.start_advertising(auto_restart=self.auto_restart_advertising))
@host_event_handler @host_event_handler
def on_disconnection_failure(self, error_code): @with_connection_from_handle
def on_disconnection_failure(self, connection, error_code):
logger.debug(f'*** Disconnection failed: {error_code}') logger.debug(f'*** Disconnection failed: {error_code}')
error = ConnectionError( error = ConnectionError(
error_code, error_code,
'hci', 'hci',
HCI_Constant.error_name(error_code) HCI_Constant.error_name(error_code)
) )
self.emit('disconnection_failure', error) connection.emit('disconnection_failure', error)
@host_event_handler @host_event_handler
@AsyncRunner.run_in_task() @AsyncRunner.run_in_task()
@@ -1225,7 +1226,7 @@ class Device(CompositeEventEmitter):
smp.SMP_NO_INPUT_NO_OUTPUT_IO_CAPABILITY: HCI_NO_INPUT_NO_OUTPUT_IO_CAPABILITY, smp.SMP_NO_INPUT_NO_OUTPUT_IO_CAPABILITY: HCI_NO_INPUT_NO_OUTPUT_IO_CAPABILITY,
smp.SMP_KEYBOARD_DISPLAY_IO_CAPABILITY: HCI_DISPLAY_YES_NO_IO_CAPABILITY smp.SMP_KEYBOARD_DISPLAY_IO_CAPABILITY: HCI_DISPLAY_YES_NO_IO_CAPABILITY
}.get(pairing_config.delegate.io_capability) }.get(pairing_config.delegate.io_capability)
if io_capability is None: if io_capability is None:
logger.warning(f'cannot map IO capability ({pairing_config.delegate.io_capability}') logger.warning(f'cannot map IO capability ({pairing_config.delegate.io_capability}')
io_capability = HCI_NO_INPUT_NO_OUTPUT_IO_CAPABILITY io_capability = HCI_NO_INPUT_NO_OUTPUT_IO_CAPABILITY

2
bumble/host.py
View File

@@ -364,7 +364,7 @@ class Host(EventEmitter):
logger.debug(f'### BR/EDR CONNECTION FAILED: {event.status}') logger.debug(f'### BR/EDR CONNECTION FAILED: {event.status}')
# Notify the client # Notify the client
self.emit('connection_failure', event.status) self.emit('connection_failure', event.connection_handle, event.status)
def on_hci_disconnection_complete_event(self, event): def on_hci_disconnection_complete_event(self, event):
# Find the connection # Find the connection