BLE: Reintroduce changes to address types lost.

pan- · pan- · commit c99824892c86 · 2018-11-28T11:29:40.000Z
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGap.cpp
@@ -79,7 +79,7 @@ peer_address_type_t convert_nordic_address(uint8_t address) {
 }
 
 peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {
-    if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {
+    if (address == advertising_peer_address_type_t::PUBLIC) {
         return peer_address_type_t::PUBLIC_IDENTITY;
     } else {
         return peer_address_type_t::RANDOM_STATIC_IDENTITY;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.cpp
@@ -988,10 +988,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
                         );
 
                         advertising_peer_address_type_t
-                            address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS);
+                            address_type(advertising_peer_address_type_t::PUBLIC);
 
                         if (pairing_cb->peer_id_key.id_addr_info.addr_type) {
-                            address_type = advertising_peer_address_type_t::RANDOM_ADDRESS;
+                            address_type = advertising_peer_address_type_t::RANDOM;
                         }
 
                         handler->on_keys_distributed_bdaddr(
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xPalSecurityManager.h
@@ -90,7 +90,7 @@ class nRF5xSecurityManager : public ::ble::pal::SecurityManager {
     struct resolving_list_entry_t {
         resolving_list_entry_t() :
             peer_identity_address_type(
-                advertising_peer_address_type_t::PUBLIC_ADDRESS
+                advertising_peer_address_type_t::PUBLIC
             )
         { }
 
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGap.cpp
@@ -108,7 +108,7 @@ peer_address_type_t convert_nordic_address(bool identity, uint8_t address) {
 }
 
 peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {
-    if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {
+    if (address == advertising_peer_address_type_t::PUBLIC) {
         return peer_address_type_t::PUBLIC_IDENTITY;
     } else {
         return peer_address_type_t::RANDOM_STATIC_IDENTITY;
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xPalSecurityManager.cpp
@@ -1022,10 +1022,10 @@ bool nRF5xSecurityManager::sm_handler(const ble_evt_t *evt)
                         );
 
                         advertising_peer_address_type_t
-                            address_type(advertising_peer_address_type_t::PUBLIC_ADDRESS);
+                            address_type(advertising_peer_address_type_t::PUBLIC);
 
                         if (pairing_cb->peer_id_key.id_addr_info.addr_type) {
-                            address_type = advertising_peer_address_type_t::RANDOM_ADDRESS;
+                            address_type = advertising_peer_address_type_t::RANDOM;
                         }
 
                         handler->on_keys_distributed_bdaddr(

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ peer_address_type_t convert_nordic_address(uint8_t address) {`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {`
`82`		`- if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {`
	`82`	`+ if (address == advertising_peer_address_type_t::PUBLIC) {`
`83`	`83`	`return peer_address_type_t::PUBLIC_IDENTITY;`
`84`	`84`	`} else {`
`85`	`85`	`return peer_address_type_t::RANDOM_STATIC_IDENTITY;`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class nRF5xSecurityManager : public ::ble::pal::SecurityManager {`
`90`	`90`	`struct resolving_list_entry_t {`
`91`	`91`	`resolving_list_entry_t() :`
`92`	`92`	`peer_identity_address_type(`
`93`		`- advertising_peer_address_type_t::PUBLIC_ADDRESS`
	`93`	`+ advertising_peer_address_type_t::PUBLIC`
`94`	`94`	`)`
`95`	`95`	`{ }`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ peer_address_type_t convert_nordic_address(bool identity, uint8_t address) {`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`peer_address_type_t convert_identity_address(advertising_peer_address_type_t address) {`
`111`		`- if (address == advertising_peer_address_type_t::PUBLIC_ADDRESS) {`
	`111`	`+ if (address == advertising_peer_address_type_t::PUBLIC) {`
`112`	`112`	`return peer_address_type_t::PUBLIC_IDENTITY;`
`113`	`113`	`} else {`
`114`	`114`	`return peer_address_type_t::RANDOM_STATIC_IDENTITY;`