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

BLE: Improve DB entry lookup. 

The DB entry lookup now looks at the identity address and/or connection address to find a DB entry associated to an address.

If the entry has not been found in the DB and a new entry is returned then the connection address is not stored for private addresses.
pull/6932/head
Vincent Coubard 2018-04-17 14:14:53 +01:00
parent a3bb18d724
commit f905d2a4d4
1 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
features/FEATURE_BLE/ble/pal/MemorySecurityDB.h
View File

@ -274,14 +274,46 @@ public:
const address_t &peer_address const address_t &peer_address
) { ) {
const bool peer_address_public = const bool peer_address_public =
(peer_address_type == BLEProtocol::AddressType::PUBLIC); (peer_address_type == BLEProtocol::AddressType::PUBLIC) ||
(peer_address_type == BLEProtocol::AddressType::PUBLIC_IDENTITY);
for (size_t i = 0; i < MAX_ENTRIES; i++) { for (size_t i = 0; i < MAX_ENTRIES; i++) {
if (_entries[i].state == ENTRY_FREE) { entry_t& e = _entries[i];
if (e.state == ENTRY_FREE) {
continue; continue;
} else if (peer_address == _entries[i].peer_identity.identity_address } else {
&& _entries[i].flags.peer_address_is_public == peer_address_public) { if (peer_address_type == BLEProtocol::AddressType::PUBLIC_IDENTITY &&
return &_entries[i]; e.flags.irk_stored == false
) {
continue;
}
// lookup for the identity address then the connection address.
if (e.flags.irk_stored &&
e.peer_identity.identity_address == peer_address &&
e.peer_identity.identity_address_is_public == peer_address_public
) {
return &e;
// lookup for connection address used during bonding
} else if (e.flags.peer_address == peer_address &&
e.flags.peer_address_is_public == peer_address_public
) {
return &e;
}
}
}
// determine if the address in input is private or not.
bool is_private_address = false;
if (peer_address_type == BLEProtocol::AddressType::RANDOM) {
::Gap::RandomAddressType_t random_type(::Gap::RandomAddressType_t::STATIC);
ble_error_t err = ::Gap::getRandomAddressType(peer_address.data(), &random_type);
if (err) {
return NULL;
}
if (random_type != ::Gap::RandomAddressType_t::STATIC) {
is_private_address = true;
} }
} }
@ -289,8 +321,14 @@ public:
for (size_t i = 0; i < MAX_ENTRIES; i++) { for (size_t i = 0; i < MAX_ENTRIES; i++) {
if (_entries[i].state == ENTRY_FREE) { if (_entries[i].state == ENTRY_FREE) {
_entries[i] = entry_t(); _entries[i] = entry_t();
_entries[i].flags.peer_address = peer_address; // do not store private addresses in the flags; just store public
_entries[i].flags.peer_address_is_public = peer_address_public; // or random static address so it can be reused latter.
if (is_private_address == false) {
_entries[i].flags.peer_address = peer_address;
_entries[i].flags.peer_address_is_public = peer_address_public;
} else {
_entries[i].flags.peer_address = address_t();
}
_entries[i].state = ENTRY_RESERVED; _entries[i].state = ENTRY_RESERVED;
return &_entries[i]; return &_entries[i];
} }