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

forward resolving list init

pull/6932/head
paul-szczepanek-arm 2018-05-21 11:34:40 +01:00
parent cd9f12ab45
commit 17e8ed9401
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,13 +42,14 @@ ble_error_t GenericSecurityManager::init(
bool signing, bool signing,
const char* db_path const char* db_path
) { ) {
ble_error_t result = _pal.initialize(); ble_error_t result = _pal.initialize();
if (result != BLE_ERROR_NONE) { if (result != BLE_ERROR_NONE) {
return result; return result;
} }
result = init_database(db_path); result = init_database(db_path);
if (result != BLE_ERROR_NONE) { if (result != BLE_ERROR_NONE) {
return result; return result;
} }
@ -79,12 +80,17 @@ ble_error_t GenericSecurityManager::init(
init_signing(); init_signing();
} }
init_resolving_list();
_connection_monitor.set_connection_event_handler(this); _connection_monitor.set_connection_event_handler(this);
_signing_monitor.set_signing_event_handler(this); _signing_monitor.set_signing_event_handler(this);
_pal.set_event_handler(this); _pal.set_event_handler(this);
result = init_resolving_list();
if (result != BLE_ERROR_NONE) {
delete _db;
return result;
}
return BLE_ERROR_NONE; return BLE_ERROR_NONE;
} }
@ -766,9 +772,7 @@ ble_error_t GenericSecurityManager::oobReceived(
ble_error_t GenericSecurityManager::init_database( ble_error_t GenericSecurityManager::init_database(
const char *db_path const char *db_path
) { ) {
if (_db) { delete _db;
delete _db;
}
FILE* db_file = FileSecurityDb::open_db_file(db_path); FILE* db_file = FileSecurityDb::open_db_file(db_path);