aioble/security: Add support for CCCD bonding.

pi-anl · pi-anl · commit 68646dcac235 · 2021-11-18T16:40:22.000+11:00
diff --git a/micropython/bluetooth/aioble/aioble/security.py b/micropython/bluetooth/aioble/aioble/security.py
@@ -35,8 +35,8 @@
 limit_peers = None
 
 SEC_TYPES_SELF = (10, )
-SEC_TYPES_PEER = (1, 2, 3, 4)
-
+SEC_TYPES_PEER = (1, 2, 4)
+SEC_TYPES_CCCD = (3, )
 
 # Must call this before stack startup.
 def load_secrets(path=None):
@@ -124,7 +124,7 @@ def _log_peers(heading=""):
     if core.log_level <= 2:
         return
     log_info("secrets:", heading)
-    for sec_type in SEC_TYPES_PEER:
+    for sec_type in SEC_TYPES_PEER + SEC_TYPES_CCCD:
         log_info("-", sec_type)
 
         if sec_type not in _secrets:
@@ -171,8 +171,12 @@ def _security_irq(event, data):
             _secrets[sec_type] = []
         secrets = _secrets[sec_type]
         
-        # Delete existing secrets matching the type and key.
-        removed = _remove_entry(sec_type, key)
+        # Delete existing secrets matching the type and key as required.
+        # There should only every be one SEC_TYPES_PEER per addr, but 
+        # multiple entries are allowed for SEC_TYPES_CCCD
+        removed = False
+        if is_deleting or sec_type not in SEC_TYPES_CCCD:
+            removed = _remove_entry(sec_type, key)
 
         if is_deleting and not removed:
             # Delete mode, but no entries were deleted
@@ -216,6 +220,9 @@ def _security_irq(event, data):
 
             for k, v in secrets:
                 if k == key:
+                    if index:
+                        index -= 1
+                        continue
                     return v
             return None
 
