pstruebi/bumble_fork
1
0
Fork 0
forked from auracaster/bumble_mirror
Code Pull Requests Activity

Revert pending_connections

Browse Source
This commit is contained in:
Josh Wu
2025-09-19 12:32:28 +08:00
parent a25427305c
commit 58debcd8bb
1 changed files with 76 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
bumble/device.py
View File

@@ -2169,10 +2169,12 @@ def with_connection_from_handle(function):
# Decorator that converts the first argument from a bluetooth address to a connection # Decorator that converts the first argument from a bluetooth address to a connection
def with_connection_from_address(function): def with_connection_from_address(function):
@functools.wraps(function) @functools.wraps(function)
def wrapper(self, address: hci.Address, *args, **kwargs): def wrapper(device: Device, address: hci.Address, *args, **kwargs):
for connection in self.connections.values(): if connection := device.pending_connections.get(address):
return function(device, connection, address, *args, **kwargs)
for connection in device.connections.values():
if connection.peer_address == address: if connection.peer_address == address:
return function(self, connection, *args, **kwargs) return function(device, connection, *args, **kwargs)
raise ObjectLookupError('no connection for address') raise ObjectLookupError('no connection for address')
return wrapper return wrapper
@@ -2182,11 +2184,13 @@ def with_connection_from_address(function):
# connection # connection
def try_with_connection_from_address(function): def try_with_connection_from_address(function):
@functools.wraps(function) @functools.wraps(function)
def wrapper(self, address, *args, **kwargs): def wrapper(device: Device, address: hci.Address, *args, **kwargs):
for connection in self.connections.values(): if connection := device.pending_connections.get(address):
return function(device, connection, address, *args, **kwargs)
for connection in device.connections.values():
if connection.peer_address == address: if connection.peer_address == address:
return function(self, connection, address, *args, **kwargs) return function(device, connection, address, *args, **kwargs)
return function(self, None, address, *args, **kwargs) return function(device, None, address, *args, **kwargs)
return wrapper return wrapper
@@ -2234,7 +2238,7 @@ class Device(utils.CompositeEventEmitter):
scan_response_data: bytes scan_response_data: bytes
cs_capabilities: ChannelSoundingCapabilities | None = None cs_capabilities: ChannelSoundingCapabilities | None = None
connections: dict[int, Connection] connections: dict[int, Connection]
connection_roles: dict[hci.Address, hci.Role] pending_connections: dict[hci.Address, Connection]
classic_pending_accepts: dict[ classic_pending_accepts: dict[
hci.Address, hci.Address,
list[asyncio.Future[Union[Connection, tuple[hci.Address, int, int]]]], list[asyncio.Future[Union[Connection, tuple[hci.Address, int, int]]]],
@@ -2356,9 +2360,9 @@ class Device(utils.CompositeEventEmitter):
self.le_connecting = False self.le_connecting = False
self.disconnecting = False self.disconnecting = False
self.connections = {} # Connections, by connection handle self.connections = {} # Connections, by connection handle
self.connection_roles = ( self.pending_connections = (
{} {}
) # Local connection roles, by BD address (BR/EDR only) ) # Pending connections, by BD address (BR/EDR only)
self.sco_links = {} # ScoLinks, by connection handle (BR/EDR only) self.sco_links = {} # ScoLinks, by connection handle (BR/EDR only)
self.cis_links = {} # CisLinks, by connection handle (LE only) self.cis_links = {} # CisLinks, by connection handle (LE only)
self._pending_cis = {} # (CIS_ID, CIG_ID), by CIS_handle self._pending_cis = {} # (CIS_ID, CIG_ID), by CIS_handle
@@ -3827,7 +3831,17 @@ class Device(utils.CompositeEventEmitter):
) )
else: else:
# Save pending connection # Save pending connection
self.connection_roles[peer_address] = hci.Role.CENTRAL self.pending_connections[peer_address] = Connection(
device=self,
handle=0,
transport=core.PhysicalTransport.BR_EDR,
self_address=self.public_address,
self_resolvable_address=None,
peer_address=peer_address,
peer_resolvable_address=None,
role=hci.Role.CENTRAL,
parameters=Connection.Parameters(0, 0, 0),
)
# TODO: allow passing other settings # TODO: allow passing other settings
result = await self.send_command( result = await self.send_command(
@@ -3880,7 +3894,7 @@ class Device(utils.CompositeEventEmitter):
self.le_connecting = False self.le_connecting = False
self.connect_own_address_type = None self.connect_own_address_type = None
else: else:
self.connection_roles.pop(peer_address, None) self.pending_connections.pop(peer_address, None)
async def accept( async def accept(
self, self,
@@ -3978,7 +3992,17 @@ class Device(utils.CompositeEventEmitter):
# Even if we requested a role switch in the hci.HCI_Accept_Connection_Request # Even if we requested a role switch in the hci.HCI_Accept_Connection_Request
# command, this connection is still considered Peripheral until an eventual # command, this connection is still considered Peripheral until an eventual
# role change event. # role change event.
self.connection_roles[peer_address] = hci.Role.PERIPHERAL self.pending_connections[peer_address] = Connection(
device=self,
handle=0,
transport=core.PhysicalTransport.BR_EDR,
self_address=self.public_address,
self_resolvable_address=None,
peer_address=peer_address,
peer_resolvable_address=None,
role=hci.Role.PERIPHERAL,
parameters=Connection.Parameters(0, 0, 0),
)
try: try:
# Accept connection request # Accept connection request
@@ -3996,7 +4020,7 @@ class Device(utils.CompositeEventEmitter):
finally: finally:
self.remove_listener(self.EVENT_CONNECTION, on_connection) self.remove_listener(self.EVENT_CONNECTION, on_connection)
self.remove_listener(self.EVENT_CONNECTION_FAILURE, on_connection_failure) self.remove_listener(self.EVENT_CONNECTION_FAILURE, on_connection_failure)
self.connection_roles.pop(peer_address, None) self.pending_connections.pop(peer_address, None)
@asynccontextmanager @asynccontextmanager
async def connect_as_gatt(self, peer_address: Union[hci.Address, str]): async def connect_as_gatt(self, peer_address: Union[hci.Address, str]):
@@ -5441,29 +5465,27 @@ class Device(utils.CompositeEventEmitter):
connection_handle: int, connection_handle: int,
peer_address: hci.Address, peer_address: hci.Address,
) -> None: ) -> None:
connection_role = self.connection_roles.pop(peer_address, hci.Role.PERIPHERAL) if connection := self.pending_connections.pop(peer_address, None):
connection.handle = connection_handle
else:
# Create a new connection
connection = Connection(
device=self,
handle=connection_handle,
transport=PhysicalTransport.BR_EDR,
self_address=self.public_address,
self_resolvable_address=None,
peer_address=peer_address,
peer_resolvable_address=None,
role=hci.Role.PERIPHERAL,
parameters=Connection.Parameters(0.0, 0, 0.0),
)
logger.debug( logger.debug('*** %s', connection)
f'*** Connection: [0x{connection_handle:04X}] '
f'{peer_address} {hci.HCI_Constant.role_name(connection_role)}'
)
if connection_handle in self.connections: if connection_handle in self.connections:
logger.warning( logger.warning(
'new connection reuses the same handle as a previous connection' 'new connection reuses the same handle as a previous connection'
) )
# Create a new connection
connection = Connection(
device=self,
handle=connection_handle,
transport=PhysicalTransport.BR_EDR,
self_address=self.public_address,
self_resolvable_address=None,
peer_address=peer_address,
peer_resolvable_address=None,
role=connection_role,
parameters=Connection.Parameters(0.0, 0, 0.0),
)
self.connections[connection_handle] = connection self.connections[connection_handle] = connection
self.emit(self.EVENT_CONNECTION, connection) self.emit(self.EVENT_CONNECTION, connection)
@@ -5618,7 +5640,9 @@ class Device(utils.CompositeEventEmitter):
# FIXME: Explore a delegate-model for BR/EDR wait connection #56. # FIXME: Explore a delegate-model for BR/EDR wait connection #56.
@host_event_handler @host_event_handler
def on_connection_request(self, bd_addr, class_of_device, link_type): def on_connection_request(
self, bd_addr: hci.Address, class_of_device: int, link_type: int
):
logger.debug(f'*** Connection request: {bd_addr}') logger.debug(f'*** Connection request: {bd_addr}')
# Handle SCO request. # Handle SCO request.
@@ -5647,7 +5671,17 @@ class Device(utils.CompositeEventEmitter):
# device configuration is set to accept any incoming connection # device configuration is set to accept any incoming connection
elif self.classic_accept_any: elif self.classic_accept_any:
# Save pending connection # Save pending connection
self.connection_roles[bd_addr] = hci.Role.PERIPHERAL self.pending_connections[bd_addr] = Connection(
device=self,
handle=0,
transport=core.PhysicalTransport.BR_EDR,
self_address=self.public_address,
self_resolvable_address=None,
peer_address=bd_addr,
peer_resolvable_address=None,
role=hci.Role.PERIPHERAL,
parameters=Connection.Parameters(0, 0, 0),
)
self.host.send_command_sync( self.host.send_command_sync(
hci.HCI_Accept_Connection_Request_Command( hci.HCI_Accept_Connection_Request_Command(
@@ -5958,7 +5992,7 @@ class Device(utils.CompositeEventEmitter):
@host_event_handler @host_event_handler
@try_with_connection_from_address @try_with_connection_from_address
def on_remote_name( def on_remote_name(
self, connection: Connection, address: hci.Address, remote_name: bytes self, connection: Optional[Connection], address: hci.Address, remote_name: bytes
): ):
# Try to decode the name # Try to decode the name
try: try:
@@ -5977,7 +6011,7 @@ class Device(utils.CompositeEventEmitter):
@host_event_handler @host_event_handler
@try_with_connection_from_address @try_with_connection_from_address
def on_remote_name_failure( def on_remote_name_failure(
self, connection: Connection, address: hci.Address, error: int self, connection: Optional[Connection], address: hci.Address, error: int
): ):
if connection: if connection:
connection.emit(connection.EVENT_REMOTE_NAME_FAILURE, error) connection.emit(connection.EVENT_REMOTE_NAME_FAILURE, error)
@@ -6411,19 +6445,22 @@ class Device(utils.CompositeEventEmitter):
@host_event_handler @host_event_handler
@try_with_connection_from_address @try_with_connection_from_address
def on_role_change( def on_role_change(
self, connection: Connection, peer_address: hci.Address, new_role: hci.Role self,
connection: Optional[Connection],
peer_address: hci.Address,
new_role: hci.Role,
): ):
if connection: if connection:
connection.role = new_role connection.role = new_role
connection.emit(connection.EVENT_ROLE_CHANGE, new_role) connection.emit(connection.EVENT_ROLE_CHANGE, new_role)
else: else:
self.connection_roles[peer_address] = new_role logger.warning("Role change to unknown connection %s", peer_address)
# [Classic only] # [Classic only]
@host_event_handler @host_event_handler
@try_with_connection_from_address @try_with_connection_from_address
def on_role_change_failure( def on_role_change_failure(
self, connection: Connection, address: hci.Address, error: int self, connection: Optional[Connection], address: hci.Address, error: int
): ):
if connection: if connection:
connection.emit(connection.EVENT_ROLE_CHANGE_FAILURE, error) connection.emit(connection.EVENT_ROLE_CHANGE_FAILURE, error)