Merge pull request #4178 from nvlsianpu/getAddrFromPeerTab_sd_api_5

[NRF52840]: SecurityManager::getAddressesFromBondTable

Author: 0xc0170

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security.h

@@ -127,4 +127,20 @@ bool btle_matchAddressAndIrk(ble_gap_addr_t const * p_addr, ble_gap_irk_t const
  */
 void btle_generateResolvableAddress(const ble_gap_irk_t &irk, ble_gap_addr_t &address);
 
+#if (NRF_SD_BLE_API_VERSION >= 3)
+    /**
+     * @brief  Returns a list of addresses from peers in the stacks bond table.
+     *
+     * @param[in/out]   addresses
+     *                  (on input) @ref Gap::Whitelist_t structure where at
+     *                  most addresses.capacity addresses from bonded peers will
+     *                  be stored.
+     *                  (on output) A copy of the addresses from bonded peers.
+     *
+     * @retval BLE_ERROR_NONE         if successful.
+     * @retval BLE_ERROR_UNSPECIFIED  Bond data could not be found in flash or is inconsistent.
+     */
+    ble_error_t btle_getAddressesFromBondTable(Gap::Whitelist_t &addrList);
+#endif
+
 #endif /* _BTLE_SECURITY_H_ */

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/btle/btle_security_pm.cpp

@@ -434,4 +434,53 @@ btle_generateResolvableAddress(const ble_gap_irk_t &irk, ble_gap_addr_t &address
     /* Calculate the hash and store it in the top half of the address */
     ah(irk.irk, &address.addr[BLE_GAP_ADDR_LEN - 3], address.addr);
 }
+
+
+#if (NRF_SD_BLE_API_VERSION >= 3)
+ble_error_t btle_getAddressesFromBondTable(Gap::Whitelist_t &addrList)
+{
+    pm_peer_id_t           peer_id;
+    ret_code_t             ret;
+    pm_peer_data_bonding_t bond_data;
+
+    addrList.size = 0;
+    peer_id       = pm_next_peer_id_get(PM_PEER_ID_INVALID);
+
+    /**
+     * Fill addresses list:
+     * Copy addresses from bond table, or
+     * for every private resolvable address in the bond table generate the resolvable address.
+     */
+    while ((peer_id != PM_PEER_ID_INVALID) && (addrList.capacity > addrList.size)) {
+        memset(&bond_data, 0x00, sizeof(bond_data));
+
+        // Read peer data from flash.
+        ret = pm_peer_data_bonding_load(peer_id, &bond_data);
+
+        if ((ret == NRF_ERROR_NOT_FOUND) || (ret == NRF_ERROR_INVALID_PARAM)) {
+            // Peer data could not be found in flash or peer ID is not valid.
+            return BLE_ERROR_UNSPECIFIED;
+        }
+
+        if (bond_data.peer_ble_id.id_addr_info.addr_type == BLEProtocol::AddressType::RANDOM_PRIVATE_RESOLVABLE) {
+            btle_generateResolvableAddress(bond_data.peer_ble_id.id_info,
+                (ble_gap_addr_t &) addrList.addresses[addrList.size].address);
+        } else {
+            memcpy(&addrList.addresses[addrList.size].address,
+                   &bond_data.peer_ble_id.id_addr_info.addr,
+                   sizeof(addrList.addresses[0].address));
+        }
+
+        addrList.addresses[addrList.size].type = static_cast<BLEProtocol::AddressType_t> (bond_data.peer_ble_id.id_addr_info.addr_type);
+
+        addrList.size++;
+
+        // get next peer  id
+        peer_id = pm_next_peer_id_get(peer_id);
+    }
+
+    return BLE_ERROR_NONE;
+}
 #endif
+
+#endif // defined(S130) || defined(S132) || defined(S140)

features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF5/source/nRF5xSecurityManager.h

@@ -57,8 +57,6 @@ class nRF5xSecurityManager : public SecurityManager
      *
      * @return
      *           BLE_ERROR_NONE if successful.
-     *
-     * @todo check whether remove this function (because it is never called)
      */
     virtual ble_error_t getAddressesFromBondTable(Gap::Whitelist_t &addresses) const {
         uint8_t i;
@@ -114,7 +112,26 @@ class nRF5xSecurityManager : public SecurityManager
 
         return BLE_ERROR_NONE;
     }
-#endif
+#else // -> NRF_SD_BLE_API_VERSION >= 3
+    /**
+     * @brief  Returns a list of addresses from peers in the stacks bond table.
+     *
+     * @param[in/out]   addresses
+     *                  (on input) @ref Gap::Whitelist_t structure where at
+     *                  most addresses.capacity addresses from bonded peers will
+     *                  be stored.
+     *                  (on output) A copy of the addresses from bonded peers.
+     *
+     * @retval BLE_ERROR_NONE         if successful.
+     * @retval BLE_ERROR_UNSPECIFIED  Bond data could not be found in flash or is inconsistent.
+     */
+    virtual ble_error_t getAddressesFromBondTable(Gap::Whitelist_t &addresses) const {
+        return btle_getAddressesFromBondTable(addresses);
+    }
+#endif // #if  (NRF_SD_BLE_API_VERSION <= 2)
+
+
+
     /**
      * @brief  Clear nRF5xSecurityManager's state.
      *