Support non-directed address generation offload

google · Dec 30, 2023 · fffe24d · fffe24d
1 parent 8ccfc90
commit fffe24d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/bumble/device.py b/bumble/device.py
@@ -1586,6 +1586,16 @@ async def refresh_resolving_list(self) -> None:
         if self.address_resolution_offload:
             await self.send_command(HCI_LE_Clear_Resolving_List_Command())
 
+            # Add an empty entry for non-directed address generation.
+            await self.send_command(
+                HCI_LE_Add_Device_To_Resolving_List_Command(
+                    peer_identity_address_type=Address.ANY.address_type,
+                    peer_identity_address=Address.ANY,
+                    peer_irk=bytes(16),
+                    local_irk=self.irk,
+                )
+            )
+
             for irk, address in resolving_keys:
                 await self.send_command(
                     HCI_LE_Add_Device_To_Resolving_List_Command(

diff --git a/bumble/smp.py b/bumble/smp.py
@@ -1991,10 +1991,8 @@ async def on_pairing(
     ) -> None:
         # Store the keys in the key store
         if self.device.keystore and identity_address is not None:
-            self.device.abort_on(
-                'flush', self.device.update_keys(str(identity_address), keys)
-            )
-
+            # Make sure on_pairing emits after key update.
+            await self.device.update_keys(str(identity_address), keys)
         # Notify the device
         self.device.on_pairing(session.connection, identity_address, keys, session.sc)