ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Do not pass peer resolvable address in connection event handler

pull/6932/head
Vincent Coubard 2018-05-21 10:17:44 +01:00
parent c3bcd10cfd
commit 28766bd873
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/FEATURE_BLE/ble/generic/GenericSecurityManager.h
View File

@ -385,8 +385,7 @@ private:
const BLEProtocol::AddressBytes_t peer_address, const BLEProtocol::AddressBytes_t peer_address,
BLEProtocol::AddressType_t local_address_type, BLEProtocol::AddressType_t local_address_type,
const BLEProtocol::AddressBytes_t local_address, const BLEProtocol::AddressBytes_t local_address,
const Gap::ConnectionParams_t *connection_params, const Gap::ConnectionParams_t *connection_params
const BLEProtocol::AddressBytes_t resolved_peer_address
); );
/** /**

3
features/FEATURE_BLE/ble/pal/ConnectionEventMonitor.h
View File

@ -58,8 +58,7 @@ public:
const BLEProtocol::AddressBytes_t peer_address, const BLEProtocol::AddressBytes_t peer_address,
BLEProtocol::AddressType_t local_address_type, BLEProtocol::AddressType_t local_address_type,
const BLEProtocol::AddressBytes_t local_address, const BLEProtocol::AddressBytes_t local_address,
const ::Gap::ConnectionParams_t *connection_params, const ::Gap::ConnectionParams_t *connection_params
const BLEProtocol::AddressBytes_t resolved_peer_address
) = 0; ) = 0;
/** /**

8
features/FEATURE_BLE/source/generic/GenericSecurityManager.cpp
View File

@ -968,8 +968,7 @@ void GenericSecurityManager::on_connected(
const BLEProtocol::AddressBytes_t peer_address, const BLEProtocol::AddressBytes_t peer_address,
BLEProtocol::AddressType_t local_address_type, BLEProtocol::AddressType_t local_address_type,
const BLEProtocol::AddressBytes_t local_address, const BLEProtocol::AddressBytes_t local_address,
const Gap::ConnectionParams_t *connection_params, const Gap::ConnectionParams_t *connection_params
const BLEProtocol::AddressBytes_t resolved_peer_address
) { ) {
MBED_ASSERT(_db); MBED_ASSERT(_db);
ControlBlock_t *cb = acquire_control_block(connection); ControlBlock_t *cb = acquire_control_block(connection);
@ -981,11 +980,6 @@ void GenericSecurityManager::on_connected(
cb->local_address = local_address; cb->local_address = local_address;
cb->is_master = (role == Gap::CENTRAL); cb->is_master = (role == Gap::CENTRAL);
// normalize the address
if (resolved_peer_address && resolved_peer_address != ble::address_t()) {
peer_address = resolved_peer_address;
}
// get the associated db handle and the distribution flags if any // get the associated db handle and the distribution flags if any
cb->db_entry = _db->open_entry(peer_address_type, peer_address); cb->db_entry = _db->open_entry(peer_address_type, peer_address);

3
features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NRF52/source/nRF5xGap.cpp
View File

@ -1393,8 +1393,7 @@ void nRF5xGap::on_connection(Gap::Handle_t handle, const ble_gap_evt_connected_t
peer_address, peer_address,
own_addr_type, own_addr_type,
own_address.data(), own_address.data(),
reinterpret_cast<const ConnectionParams_t *>(&(evt.conn_params)), reinterpret_cast<const ConnectionParams_t *>(&(evt.conn_params))
peer_resolvable_address
); );
} }