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

make number of db entries configurable

pull/13037/head
Paul Szczeanek 2020-06-03 17:07:47 +01:00
parent c7759fe505
commit d6a5bd2825
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
features/FEATURE_BLE/ble/generic/FileSecurityDb.h
View File

@ -34,8 +34,6 @@ private:
size_t file_offset; size_t file_offset;
}; };
static const size_t MAX_ENTRIES = 5;
static entry_t* as_entry(entry_handle_t db_handle) { static entry_t* as_entry(entry_handle_t db_handle) {
return reinterpret_cast<entry_t*>(db_handle); return reinterpret_cast<entry_t*>(db_handle);
} }
@ -146,7 +144,7 @@ private:
static FILE* erase_db_file(FILE* db_file); static FILE* erase_db_file(FILE* db_file);
private: private:
entry_t _entries[MAX_ENTRIES]; entry_t _entries[BLE_SECURITY_DATABASE_MAX_ENTRIES];
FILE *_db_file; FILE *_db_file;
uint8_t _buffer[sizeof(SecurityEntryKeys_t)]; uint8_t _buffer[sizeof(SecurityEntryKeys_t)];
}; };

8
features/FEATURE_BLE/ble/generic/MemorySecurityDb.h
View File

@ -34,8 +34,6 @@ private:
SecurityEntrySigning_t peer_signing; SecurityEntrySigning_t peer_signing;
}; };
static const size_t MAX_ENTRIES = 5;
static entry_t* as_entry(entry_handle_t db_handle) static entry_t* as_entry(entry_handle_t db_handle)
{ {
return reinterpret_cast<entry_t*>(db_handle); return reinterpret_cast<entry_t*>(db_handle);
@ -150,11 +148,11 @@ public:
private: private:
virtual uint8_t get_entry_count() { virtual uint8_t get_entry_count() {
return MAX_ENTRIES; return BLE_SECURITY_DATABASE_MAX_ENTRIES;
} }
virtual SecurityDistributionFlags_t* get_entry_handle_by_index(uint8_t index) { virtual SecurityDistributionFlags_t* get_entry_handle_by_index(uint8_t index) {
if (index < MAX_ENTRIES) { if (index < BLE_SECURITY_DATABASE_MAX_ENTRIES) {
return &_entries[index].flags; return &_entries[index].flags;
} else { } else {
return NULL; return NULL;
@ -187,7 +185,7 @@ private:
}; };
private: private:
entry_t _entries[MAX_ENTRIES]; entry_t _entries[BLE_SECURITY_DATABASE_MAX_ENTRIES];
}; };
} /* namespace pal */ } /* namespace pal */

5
features/FEATURE_BLE/mbed_lib.json
View File

@ -71,6 +71,11 @@
"help": "Include periodic advertising support, depends on the extended advertising feature.", "help": "Include periodic advertising support, depends on the extended advertising feature.",
"value": true, "value": true,
"macro_name": "BLE_FEATURE_PERIODIC_ADVERTISING" "macro_name": "BLE_FEATURE_PERIODIC_ADVERTISING"
},
"ble-security-database-max-entries": {
"help": "How many entries can be stored in the db, depends on security manager.",
"value": 5,
"macro_name": "BLE_SECURITY_DATABASE_MAX_ENTRIES"
} }
} }
} }

6
features/FEATURE_BLE/source/generic/FileSecurityDb.cpp
View File

@ -54,7 +54,7 @@ const uint16_t DB_VERSION = 1;
) )
#define DB_SIZE_STORES \ #define DB_SIZE_STORES \
(FileSecurityDb::MAX_ENTRIES * DB_SIZE_STORE) (BLE_SECURITY_DATABASE_MAX_ENTRIES * DB_SIZE_STORE)
#define DB_OFFSET_VERSION (0) #define DB_OFFSET_VERSION (0)
#define DB_OFFSET_RESTORE (DB_OFFSET_VERSION + sizeof(DB_VERSION)) #define DB_OFFSET_RESTORE (DB_OFFSET_VERSION + sizeof(DB_VERSION))
@ -308,11 +308,11 @@ void FileSecurityDb::set_restore(bool reload) {
/* helper functions */ /* helper functions */
uint8_t FileSecurityDb::get_entry_count() { uint8_t FileSecurityDb::get_entry_count() {
return MAX_ENTRIES; return BLE_SECURITY_DATABASE_MAX_ENTRIES;
} }
SecurityDistributionFlags_t* FileSecurityDb::get_entry_handle_by_index(uint8_t index) { SecurityDistributionFlags_t* FileSecurityDb::get_entry_handle_by_index(uint8_t index) {
if (index < MAX_ENTRIES) { if (index < BLE_SECURITY_DATABASE_MAX_ENTRIES) {
return &_entries[index].flags; return &_entries[index].flags;
} else { } else {
return NULL; return NULL;