(mynewt-nimble) branch master updated: nimble/ll: Use RPA from global local IRK on active scan

[janc]

This is an automated email from the ASF dual-hosted git repository.

janc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git


The following commit(s) were added to refs/heads/master by this push:
     new 3eacaf562 nimble/ll: Use RPA from global local IRK on active scan
3eacaf562 is described below

commit 3eacaf5624b40384993075d367a19f46a2c449b4
Author: Szymon Janc <szymon.j...@codecoup.pl>
AuthorDate: Wed Dec 18 17:23:51 2024 +0100

    nimble/ll: Use RPA from global local IRK on active scan
    
    Local IRK, if set, is used to generate local RPA in use cases where own
    address type was set to 0x02 or 0x03 but peer address is not added to
    resolving list.
    
    If no IRK is set (or set to all-zero), the controller uses NRPA.
---
 nimble/controller/src/ble_ll_scan_aux.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/nimble/controller/src/ble_ll_scan_aux.c 
b/nimble/controller/src/ble_ll_scan_aux.c
index 7b3b0a168..b61f729db 100644
--- a/nimble/controller/src/ble_ll_scan_aux.c
+++ b/nimble/controller/src/ble_ll_scan_aux.c
@@ -1150,11 +1150,12 @@ ble_ll_scan_aux_scan_req_tx_pdu_cb(uint8_t *dptr, void 
*arg, uint8_t *hdr_byte)
     uint8_t rpa[BLE_DEV_ADDR_LEN];
 #endif
     uint8_t hb;
+    uint8_t own_addr_type = ble_ll_scan_get_own_addr_type();
 
     hb = BLE_ADV_PDU_TYPE_SCAN_REQ;
 
     /* ScanA */
-    if (ble_ll_scan_get_own_addr_type() & 0x01) {
+    if (own_addr_type & 0x01) {
         hb |= BLE_ADV_PDU_HDR_TXADD_RAND;
         scana = g_random_addr;
     } else {
@@ -1162,7 +1163,7 @@ ble_ll_scan_aux_scan_req_tx_pdu_cb(uint8_t *dptr, void 
*arg, uint8_t *hdr_byte)
     }
 
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_PRIVACY)
-    if (ble_ll_scan_get_own_addr_type() & 0x02) {
+    if (own_addr_type & 0x02) {
         if (aux->rpa_index >=0) {
             rl = &g_ble_ll_resolv_list[aux->rpa_index];
         } else {
@@ -1171,15 +1172,20 @@ ble_ll_scan_aux_scan_req_tx_pdu_cb(uint8_t *dptr, void 
*arg, uint8_t *hdr_byte)
 
         /*
          * If device is on RL and we have local IRK, we use RPA generated using
-         * that IRK as ScanA. Otherwise we use NRPA as ScanA to prevent our
-         * device from being tracked when doing an active scan
+         * that IRK as ScanA. Otherwise we use NRPA or RPA from global local 
IRK
+         * as ScanA to prevent our device from being tracked when doing
+         * an active scan
          * ref: Core 5.2, Vol 6, Part B, section 6.3)
          */
         if (rl && rl->rl_has_local) {
             ble_ll_resolv_get_priv_addr(rl, 1, rpa);
             scana = rpa;
         } else {
-            scana = ble_ll_get_scan_nrpa();
+            if (ble_ll_resolv_local_rpa_get(own_addr_type & 0x01, rpa) == 0) {
+                scana = rpa;
+            } else {
+                scana = ble_ll_get_scan_nrpa();
+            }
         }
 
         hb |= BLE_ADV_PDU_HDR_TXADD_RAND;