Skip to content

Commit 65c61a1

Browse files
pan-paul-szczepanek-arm
pan-
authored and
paul-szczepanek-arm
committed
BLE: Remove uses of tr_as_array in favour of to_string.
1 parent c674990 commit 65c61a1

File tree

4 files changed

+25
-31
lines changed

4 files changed

+25
-31
lines changed

‎connectivity/FEATURE_BLE/source/common/ble_trace_helpers.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ const char* att_client_callback_event_to_string(uint8_t code);
3939
const char* att_error_code_to_string(uint8_t code);
4040
#endif //MBED_CONF_MBED_TRACE_ENABLE
4141

42-
template<typename T>
43-
const char* tr_as_array(T item)
44-
{
45-
return (mbed_trace_array)((const uint8_t*)&item, sizeof(item));
46-
}
47-
4842
template<size_t size>
4943
const char* to_string(const ble::byte_array_t<size> &array)
5044
{

‎connectivity/FEATURE_BLE/source/generic/FileSecurityDb.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void FileSecurityDb::set_entry_local_ltk(
186186

187187
entry->flags.ltk_sent = true;
188188

189-
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), tr_as_array(ltk));
189+
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), to_string(ltk));
190190
db_write(&ltk, entry->file_offset + DB_STORE_OFFSET_LOCAL_KEYS_LTK);
191191
}
192192

@@ -201,7 +201,7 @@ void FileSecurityDb::set_entry_local_ediv_rand(
201201
return;
202202
}
203203

204-
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
204+
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
205205
db_write(&ediv, entry->file_offset + DB_STORE_OFFSET_LOCAL_KEYS_EDIV);
206206
db_write(&rand, entry->file_offset + DB_STORE_OFFSET_LOCAL_KEYS_RAND);
207207
}
@@ -222,7 +222,7 @@ void FileSecurityDb::set_entry_peer_ltk(
222222

223223
entry->flags.ltk_stored = true;
224224

225-
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), tr_as_array(ltk));
225+
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), to_string(ltk));
226226
db_write(&ltk, entry->file_offset + DB_STORE_OFFSET_PEER_KEYS_LTK);
227227
}
228228

@@ -237,7 +237,7 @@ void FileSecurityDb::set_entry_peer_ediv_rand(
237237
return;
238238
}
239239

240-
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
240+
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
241241
db_write(&ediv, entry->file_offset + DB_STORE_OFFSET_PEER_KEYS_EDIV);
242242
db_write(&rand, entry->file_offset + DB_STORE_OFFSET_PEER_KEYS_RAND);
243243
}
@@ -254,7 +254,7 @@ void FileSecurityDb::set_entry_peer_irk(
254254

255255
entry->flags.irk_stored = true;
256256

257-
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), tr_as_array(irk));
257+
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), to_string(irk));
258258
db_write(&irk, entry->file_offset + DB_STORE_OFFSET_PEER_IDENTITY_IRK);
259259
}
260260

@@ -269,7 +269,7 @@ void FileSecurityDb::set_entry_peer_bdaddr(
269269
return;
270270
}
271271

272-
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", tr_as_array(peer_address));
272+
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", to_string(peer_address));
273273
db_write(&peer_address, entry->file_offset + DB_STORE_OFFSET_PEER_IDENTITY_ADDRESS);
274274
db_write(&address_is_public, entry->file_offset + DB_STORE_OFFSET_PEER_IDENTITY_ADDRESS_IS_PUBLIC);
275275
}
@@ -286,7 +286,7 @@ void FileSecurityDb::set_entry_peer_csrk(
286286

287287
entry->flags.csrk_stored = true;
288288

289-
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), tr_as_array(csrk));
289+
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), to_string(csrk));
290290
db_write(&csrk, entry->file_offset + DB_STORE_OFFSET_PEER_SIGNING);
291291
}
292292

@@ -307,7 +307,7 @@ void FileSecurityDb::set_local_csrk(
307307
{
308308
this->SecurityDb::set_local_csrk(csrk);
309309

310-
tr_info("Write DB: local csrk %s", tr_as_array(csrk));
310+
tr_info("Write DB: local csrk %s", to_string(csrk));
311311
db_write(&_local_csrk, DB_OFFSET_LOCAL_CSRK);
312312
}
313313

@@ -319,7 +319,7 @@ void FileSecurityDb::set_local_identity(
319319
{
320320
this->SecurityDb::set_local_identity(irk, identity_address, public_address);
321321

322-
tr_info("Write DB: %s peer address %s", public_address? "public" : "private", tr_as_array(identity_address));
322+
tr_info("Write DB: %s peer address %s", public_address? "public" : "private", to_string(identity_address));
323323
db_write(&_local_identity, DB_OFFSET_LOCAL_IDENTITY);
324324
}
325325

‎connectivity/FEATURE_BLE/source/generic/KVStoreSecurityDb.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ void KVStoreSecurityDb::set_entry_local_ltk(
150150
SecurityEntryKeys_t* current_entry = read_in_entry_local_keys(db_handle);
151151
current_entry->ltk = ltk;
152152

153-
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), tr_as_array(ltk));
153+
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), to_string(ltk));
154154
db_write_entry(current_entry, DB_ENTRY_LOCAL_KEYS, get_index(entry));
155155
}
156156

@@ -169,7 +169,7 @@ void KVStoreSecurityDb::set_entry_local_ediv_rand(
169169
current_entry->ediv = ediv;
170170
current_entry->rand = rand;
171171

172-
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
172+
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
173173
db_write_entry(current_entry, DB_ENTRY_LOCAL_KEYS, get_index(entry));
174174
}
175175

@@ -192,7 +192,7 @@ void KVStoreSecurityDb::set_entry_peer_ltk(
192192
SecurityEntryKeys_t* current_entry = read_in_entry_peer_keys(db_handle);
193193
current_entry->ltk = ltk;
194194

195-
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), tr_as_array(ltk));
195+
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), to_string(ltk));
196196
db_write_entry(current_entry, DB_ENTRY_PEER_KEYS, get_index(entry));
197197
}
198198

@@ -211,7 +211,7 @@ void KVStoreSecurityDb::set_entry_peer_ediv_rand(
211211
current_entry->ediv = ediv;
212212
current_entry->rand = rand;
213213

214-
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
214+
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
215215
db_write_entry(current_entry, DB_ENTRY_PEER_KEYS, get_index(entry));
216216
}
217217

@@ -230,7 +230,7 @@ void KVStoreSecurityDb::set_entry_peer_irk(
230230
SecurityEntryIdentity_t* current_entry = read_in_entry_peer_identity(db_handle);
231231
current_entry->irk = irk;
232232

233-
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), tr_as_array(irk));
233+
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), to_string(irk));
234234
db_write_entry(current_entry, DB_ENTRY_PEER_IDENTITY, get_index(entry));
235235
}
236236

@@ -249,7 +249,7 @@ void KVStoreSecurityDb::set_entry_peer_bdaddr(
249249
current_entry->identity_address = peer_address;
250250
current_entry->identity_address_is_public = address_is_public;
251251

252-
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", tr_as_array(peer_address));
252+
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", to_string(peer_address));
253253
db_write_entry(current_entry, DB_ENTRY_PEER_IDENTITY, get_index(entry));
254254
}
255255

@@ -268,7 +268,7 @@ void KVStoreSecurityDb::set_entry_peer_csrk(
268268
SecurityEntrySigning_t* current_entry = read_in_entry_peer_signing(db_handle);
269269
current_entry->csrk = csrk;
270270

271-
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), tr_as_array(csrk));
271+
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), to_string(csrk));
272272
db_write_entry(current_entry, DB_ENTRY_PEER_SIGNING, get_index(entry));
273273
}
274274

@@ -288,7 +288,7 @@ void KVStoreSecurityDb::set_local_csrk(
288288
)
289289
{
290290
this->SecurityDb::set_local_csrk(csrk);
291-
tr_info("Write DB: local csrk %s", tr_as_array(csrk));
291+
tr_info("Write DB: local csrk %s", to_string(csrk));
292292
db_write(&_local_csrk, DB_LOCAL_CSRK);
293293
}
294294

@@ -299,7 +299,7 @@ void KVStoreSecurityDb::set_local_identity(
299299
)
300300
{
301301
this->SecurityDb::set_local_identity(irk, identity_address, public_address);
302-
tr_info("Write DB: %s peer address %s", public_address? "public" : "private", tr_as_array(identity_address));
302+
tr_info("Write DB: %s peer address %s", public_address? "public" : "private", to_string(identity_address));
303303
db_write(&_local_identity, DB_LOCAL_IDENTITY);
304304
}
305305

‎connectivity/FEATURE_BLE/source/generic/MemorySecurityDb.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class MemorySecurityDb : public SecurityDb {
7676
) override {
7777
entry_t *entry = as_entry(db_handle);
7878
if (entry) {
79-
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), tr_as_array(ltk));
79+
tr_info("Write DB entry %d: local ltk %s", get_index(db_handle), to_string(ltk));
8080
entry->flags.ltk_sent = true;
8181
entry->local_keys.ltk = ltk;
8282
}
@@ -89,7 +89,7 @@ class MemorySecurityDb : public SecurityDb {
8989
) override {
9090
entry_t *entry = as_entry(db_handle);
9191
if (entry) {
92-
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
92+
tr_info("Write DB entry %d: local ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
9393
entry->local_keys.ediv = ediv;
9494
entry->local_keys.rand = rand;
9595
}
@@ -105,7 +105,7 @@ class MemorySecurityDb : public SecurityDb {
105105
) override {
106106
entry_t *entry = as_entry(db_handle);
107107
if (entry) {
108-
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), tr_as_array(ltk));
108+
tr_info("Write DB entry %d: peer ltk %s", get_index(db_handle), to_string(ltk));
109109
entry->peer_keys.ltk = ltk;
110110
entry->flags.ltk_stored = true;
111111
}
@@ -118,7 +118,7 @@ class MemorySecurityDb : public SecurityDb {
118118
) override {
119119
entry_t *entry = as_entry(db_handle);
120120
if (entry) {
121-
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), tr_as_array(ediv), tr_as_array(rand));
121+
tr_info("Write DB entry %d: peer ediv %s rand %s", get_index(db_handle), to_string(ediv), to_string(rand));
122122
entry->peer_keys.ediv = ediv;
123123
entry->peer_keys.rand = rand;
124124
}
@@ -130,7 +130,7 @@ class MemorySecurityDb : public SecurityDb {
130130
) override {
131131
entry_t *entry = as_entry(db_handle);
132132
if (entry) {
133-
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), tr_as_array(irk));
133+
tr_info("Write DB entry %d: peer irk %s", get_index(db_handle), to_string(irk));
134134
entry->peer_identity.irk = irk;
135135
entry->flags.irk_stored = true;
136136
}
@@ -143,7 +143,7 @@ class MemorySecurityDb : public SecurityDb {
143143
) override {
144144
entry_t *entry = as_entry(db_handle);
145145
if (entry) {
146-
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", tr_as_array(peer_address));
146+
tr_info("Write DB entry %d: %s peer address %s", get_index(db_handle), address_is_public? "public" : "private", to_string(peer_address));
147147
entry->peer_identity.identity_address = peer_address;
148148
entry->peer_identity.identity_address_is_public = address_is_public;
149149
}
@@ -155,7 +155,7 @@ class MemorySecurityDb : public SecurityDb {
155155
) override {
156156
entry_t *entry = as_entry(db_handle);
157157
if (entry) {
158-
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), tr_as_array(csrk));
158+
tr_info("Write DB entry %d: peer csrk %s", get_index(db_handle), to_string(csrk));
159159
entry->flags.csrk_stored = true;
160160
entry->peer_signing.csrk = csrk;
161161
}

0 commit comments

Comments
 (0)