Fix BLE close() deadlock from re-entrant disconnect callback · meshtastic/python@1ee4710 · GitHub

meshtastic / python Public

• Notifications You must be signed in to change notification settings
• Fork 345
• Star 837

• Code
• Issues 122
• Pull requests 24
• Actions
• Security and quality
• Insights

Additional navigation options

Commit 1ee4710

Browse filesBrowse the repository at this point in the historyBrowse files

ko7m

and

cursoragent

committed

Fix BLE close() deadlock from re-entrant disconnect callback

When close() disconnects the BLE device, Bleak fires the disconnected_callback which calls close() again. The second close() tries to disconnect while the first is still in progress, causing a deadlock. Add a _closing guard flag to prevent the re-entrant call. Co-authored-by: Cursor <cursoragent@cursor.com>

1 parent 0539a96 commit 1ee4710
Copy full SHA for 1ee4710

1 file changed

+5Lines changed: 5 additions & 0 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• meshtastic
  • ble_interface.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎meshtastic/ble_interface.py‎

Copy file name to clipboardExpand all lines: meshtastic/ble_interface.py

+5Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -56,6 +56,7 @@ def __init__( # pylint: disable=R0917
56	56	)
57	57
58	58	self.should_read = False
	59	+ self._closing = False
59	60
60	61	logger.debug("Threads starting")
61	62	self._want_receive = True
@@ -250,6 +251,10 @@ def _sendToRadioImpl(self, toRadio) -> None:
250	251	self.should_read = True
251	252
252	253	def close(self) -> None:
	254	+ if self._closing:
	255	+ return
	256	+ self._closing = True
	257	+
253	258	try:
254	259	MeshInterface.close(self)
255	260	except Exception as e:

0 commit comments

Comments

0 (0)