Merge pull request #52 from pan-/fix-privacy-nrf52

Fix privacy nrf52
ARMmbed · May 23, 2018 · f08ac2e · f08ac2e
2 parents fa9ab03 + db4d14c
commit f08ac2e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp
@@ -501,7 +501,11 @@ ble_error_t nRF5xGap::connect(
             return BLE_ERROR_INVALID_PARAM;
     }
 
-    return connect(peerAddr, legacy_address, connectionParams, scanParamsIn);
+    bool identity =
+        peerAddrType == peer_address_type_t::PUBLIC_IDENTITY ||
+        peerAddrType == peer_address_type_t::RANDOM_STATIC_IDENTITY;
+
+    return connect(peerAddr, legacy_address, connectionParams, scanParamsIn, identity);
 }
 
 
@@ -510,6 +514,16 @@ ble_error_t nRF5xGap::connect(
     LegacyAddressType_t peerAddrType,
     const ConnectionParams_t *connectionParams,
     const GapScanningParams *scanParamsIn
+) {
+    return connect(peerAddr, peerAddrType, connectionParams, scanParamsIn, false);
+}
+
+ble_error_t nRF5xGap::connect(
+    const Address_t peerAddr,
+    LegacyAddressType_t peerAddrType,
+    const ConnectionParams_t *connectionParams,
+    const GapScanningParams *scanParamsIn,
+    bool identity
 ) {
     ble_gap_addr_t addr;
     ble_gap_addr_t* addr_ptr = &addr;
@@ -585,23 +599,16 @@ ble_error_t nRF5xGap::connect(
 
     scanParams.use_whitelist = (whitelistAddressesSize) ? 1 : 0;
 
-    if ((addr.addr_type == 	BLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE)
-    	|| (addr.addr_type == 	BLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_NON_RESOLVABLE)) {
-        /* If a device is using Resolvable Private Addresses Section 1.3.2.2 (Core spec v4.2 volume 6 part B),
-        it shall also have an Identity Address that is either a Public or Random Static address type.”
-        To establish a connection, a static address must be provided by the application to the SoftDevice.
-        The SoftDevice resolves the address and connects to the right device if it is available. */
-        addr.addr_id_peer = 1;
-        addr.addr_type = BLE_GAP_ADDR_TYPE_PUBLIC;
-    } else {
-        addr.addr_id_peer = 0;
-    }
-
     if (_privacy_enabled) {
         bool enable_resolution =
             _central_privacy_configuration.resolution_strategy != CentralPrivacyConfiguration_t::DO_NOT_RESOLVE;
 
         update_identities_list(enable_resolution);
+
+        if (enable_resolution && identity) {
+            addr.addr_id_peer = 1;
+        }
+
         set_private_resolvable_address();
     }
 
@@ -1333,6 +1340,9 @@ void nRF5xGap::on_connection(Gap::Handle_t handle, const ble_gap_evt_connected_t
     memcpy(own_address, evt.own_addr.addr, sizeof(own_address));
 #else
     getAddress(&own_addr_type, own_address.data());
+    if (_privacy_enabled) {
+        own_addr_type = LegacyAddressType::RANDOM_PRIVATE_RESOLVABLE;
+    }
 #endif
 
 #if (NRF_SD_BLE_API_VERSION <= 2)
@@ -1422,7 +1432,9 @@ void nRF5xGap::on_advertising_packet(const ble_gap_evt_adv_report_t &evt) {
     bool peer_address_resolved = evt.peer_addr.addr_id_peer;
 
     if (_privacy_enabled &&
-         peer_address_resolved == false &&
+        evt.peer_addr.addr_type == BLE_GAP_ADDR_TYPE_RANDOM_PRIVATE_RESOLVABLE &&
+        peer_address_resolved == false &&
+        get_sm().get_resolving_list().size() > 0 &&
         _central_privacy_configuration.resolution_strategy == CentralPrivacyConfiguration_t::RESOLVE_AND_FILTER
     ) {
         return;

diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.h
@@ -88,6 +88,7 @@ class nRF5xGap : public ::Gap, public ble::pal::ConnectionEventMonitor {
     virtual ble_error_t stopAdvertising(void);
     virtual ble_error_t connect(const Address_t, ble::peer_address_type_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
     virtual ble_error_t connect(const Address_t, BLEProtocol::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams);
+            ble_error_t connect(const Address_t, BLEProtocol::AddressType_t peerAddrType, const ConnectionParams_t *connectionParams, const GapScanningParams *scanParams, bool identity);
     virtual ble_error_t disconnect(Handle_t connectionHandle, DisconnectionReason_t reason);
     virtual ble_error_t disconnect(DisconnectionReason_t reason);