Skip to content

Commit d50eb66

Browse files
RainerSeventeenforx157
RainerSeventeen
authored and
forx157
committed
fix(ble_mesh): fixed issues with incorrect logs format and position
1 parent 0ea53ef commit d50eb66

File tree

5 files changed

+45
-42
lines changed

5 files changed

+45
-42
lines changed

‎components/bt/esp_ble_mesh/core/cfg_cli.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ static void comp_data_status(struct bt_mesh_model *model,
237237
BT_DBG("CompDataStatus");
238238
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
239239
ctx->net_idx, ctx->app_idx, ctx->addr);
240-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
240+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
241241

242242
status.page = net_buf_simple_pull_u8(buf);
243243
status.comp_data = bt_mesh_alloc_buf(buf->len);
@@ -260,7 +260,7 @@ static void state_status_u8(struct bt_mesh_model *model,
260260
BT_DBG("StateStatusU8");
261261
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
262262
ctx->net_idx, ctx->app_idx, ctx->addr);
263-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
263+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
264264

265265
status = net_buf_simple_pull_u8(buf);
266266

@@ -312,7 +312,7 @@ static void relay_status(struct bt_mesh_model *model,
312312
BT_DBG("RelayStatus");
313313
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
314314
ctx->net_idx, ctx->app_idx, ctx->addr);
315-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
315+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
316316

317317
status.relay = net_buf_simple_pull_u8(buf);
318318
status.retransmit = net_buf_simple_pull_u8(buf);
@@ -329,7 +329,7 @@ static void net_key_status(struct bt_mesh_model *model,
329329
BT_DBG("NetKeyStatus");
330330
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
331331
ctx->net_idx, ctx->app_idx, ctx->addr);
332-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
332+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
333333

334334
status.status = net_buf_simple_pull_u8(buf);
335335
status.net_idx = net_buf_simple_pull_le16(buf) & 0xfff;
@@ -346,7 +346,7 @@ static void app_key_status(struct bt_mesh_model *model,
346346
BT_DBG("AppKeyStatus");
347347
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
348348
ctx->net_idx, ctx->app_idx, ctx->addr);
349-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
349+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
350350

351351
status.status = net_buf_simple_pull_u8(buf);
352352
key_idx_unpack(buf, &status.net_idx, &status.app_idx);
@@ -363,7 +363,7 @@ static void mod_app_status(struct bt_mesh_model *model,
363363
BT_DBG("ModAppStatus");
364364
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
365365
ctx->net_idx, ctx->app_idx, ctx->addr);
366-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
366+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
367367

368368
status.status = net_buf_simple_pull_u8(buf);
369369
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -387,7 +387,7 @@ static void mod_pub_status(struct bt_mesh_model *model,
387387
BT_DBG("ModPubStatus");
388388
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
389389
ctx->net_idx, ctx->app_idx, ctx->addr);
390-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
390+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
391391

392392
status.status = net_buf_simple_pull_u8(buf);
393393
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -417,7 +417,7 @@ static void mod_sub_status(struct bt_mesh_model *model,
417417
BT_DBG("ModSubStatus");
418418
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
419419
ctx->net_idx, ctx->app_idx, ctx->addr);
420-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
420+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
421421

422422
status.status = net_buf_simple_pull_u8(buf);
423423
status.elem_addr = net_buf_simple_pull_le16(buf);
@@ -441,7 +441,7 @@ static void hb_sub_status(struct bt_mesh_model *model,
441441
BT_DBG("HbSubStatus");
442442
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
443443
ctx->net_idx, ctx->app_idx, ctx->addr);
444-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
444+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
445445

446446
status.status = net_buf_simple_pull_u8(buf);
447447
status.src = net_buf_simple_pull_le16(buf);
@@ -463,7 +463,7 @@ static void hb_pub_status(struct bt_mesh_model *model,
463463
BT_DBG("HbPubStatus");
464464
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
465465
ctx->net_idx, ctx->app_idx, ctx->addr);
466-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
466+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
467467

468468
status.status = net_buf_simple_pull_u8(buf);
469469
status.dst = net_buf_simple_pull_le16(buf);
@@ -483,7 +483,7 @@ static void node_reset_status(struct bt_mesh_model *model,
483483
BT_DBG("NodeResetStatus");
484484
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
485485
ctx->net_idx, ctx->app_idx, ctx->addr);
486-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
486+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
487487

488488
cfg_client_recv_status(model, ctx, NULL, 0);
489489
}
@@ -497,7 +497,7 @@ static void mod_sub_list(struct bt_mesh_model *model,
497497
BT_DBG("ModSubList");
498498
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
499499
ctx->net_idx, ctx->app_idx, ctx->addr);
500-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
500+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
501501

502502
list.status = net_buf_simple_pull_u8(buf);
503503
list.elem_addr = net_buf_simple_pull_le16(buf);
@@ -527,7 +527,7 @@ static void net_key_list(struct bt_mesh_model *model,
527527
BT_DBG("NetKeyList");
528528
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
529529
ctx->net_idx, ctx->app_idx, ctx->addr);
530-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
530+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
531531

532532
list.net_idx = bt_mesh_alloc_buf(buf->len);
533533
if (!list.net_idx) {
@@ -548,7 +548,7 @@ static void app_key_list(struct bt_mesh_model *model,
548548
BT_DBG("AppKeyList");
549549
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
550550
ctx->net_idx, ctx->app_idx, ctx->addr);
551-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
551+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
552552

553553
list.status = net_buf_simple_pull_u8(buf);
554554
list.net_idx = net_buf_simple_pull_le16(buf);
@@ -571,7 +571,7 @@ static void node_id_status(struct bt_mesh_model *model,
571571
BT_DBG("NodeIDStatus");
572572
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
573573
ctx->net_idx, ctx->app_idx, ctx->addr);
574-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
574+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
575575

576576
status.status = net_buf_simple_pull_u8(buf);
577577
status.net_idx = net_buf_simple_pull_le16(buf);
@@ -589,7 +589,7 @@ static void mod_app_list(struct bt_mesh_model *model,
589589
BT_DBG("ModAppList");
590590
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
591591
ctx->net_idx, ctx->app_idx, ctx->addr);
592-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
592+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
593593

594594
list.status = net_buf_simple_pull_u8(buf);
595595
list.elem_addr = net_buf_simple_pull_le16(buf);
@@ -619,7 +619,7 @@ static void kr_phase_status(struct bt_mesh_model *model,
619619
BT_DBG("KrPhaseStatus");
620620
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
621621
ctx->net_idx, ctx->app_idx, ctx->addr);
622-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
622+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
623623

624624
status.status = net_buf_simple_pull_u8(buf);
625625
status.net_idx = net_buf_simple_pull_le16(buf);
@@ -637,7 +637,7 @@ static void lpn_pollto_status(struct bt_mesh_model *model,
637637
BT_DBG("LPNPollToStatus");
638638
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
639639
ctx->net_idx, ctx->app_idx, ctx->addr);
640-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
640+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
641641

642642
status.lpn_addr = net_buf_simple_pull_le16(buf);
643643
status.timeout = net_buf_simple_pull_u8(buf);

‎components/bt/esp_ble_mesh/core/cfg_srv.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void get_comp_data(struct net_buf_simple *buf,
144144
}
145145
}
146146

147-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
147+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
148148
}
149149

150150
static int fetch_comp_data(struct net_buf_simple *buf,
@@ -213,7 +213,7 @@ static void comp_data_get(struct bt_mesh_model *model,
213213
BT_DBG("CompDataGet");
214214
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
215215
ctx->net_idx, ctx->app_idx, ctx->addr);
216-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
216+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
217217

218218
/* TODO:
219219
*
@@ -817,7 +817,7 @@ static void beacon_get(struct bt_mesh_model *model,
817817
BT_DBG("BeaconGet");
818818
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
819819
ctx->net_idx, ctx->app_idx, ctx->addr);
820-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
820+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
821821

822822
bt_mesh_model_msg_init(&msg, OP_BEACON_STATUS);
823823
net_buf_simple_add_u8(&msg, bt_mesh_secure_beacon_get());
@@ -837,7 +837,7 @@ static void beacon_set(struct bt_mesh_model *model,
837837
BT_DBG("BeaconSet");
838838
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
839839
ctx->net_idx, ctx->app_idx, ctx->addr);
840-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
840+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
841841

842842
if (!cfg) {
843843
BT_WARN("No Configuration Server context available");
@@ -877,7 +877,7 @@ static void default_ttl_get(struct bt_mesh_model *model,
877877
BT_DBG("DefaultTTLGet");
878878
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
879879
ctx->net_idx, ctx->app_idx, ctx->addr);
880-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
880+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
881881

882882
bt_mesh_model_msg_init(&msg, OP_DEFAULT_TTL_STATUS);
883883
net_buf_simple_add_u8(&msg, bt_mesh_default_ttl_get());
@@ -897,7 +897,7 @@ static void default_ttl_set(struct bt_mesh_model *model,
897897
BT_DBG("DefaultTTLSet");
898898
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
899899
ctx->net_idx, ctx->app_idx, ctx->addr);
900-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
900+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
901901

902902
if (!cfg) {
903903
BT_WARN("No Configuration Server context available");
@@ -944,7 +944,7 @@ static void gatt_proxy_get(struct bt_mesh_model *model,
944944
BT_DBG("GattProxyGet");
945945
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
946946
ctx->net_idx, ctx->app_idx, ctx->addr);
947-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
947+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
948948

949949
send_gatt_proxy_status(model, ctx);
950950
}
@@ -958,7 +958,7 @@ static void gatt_proxy_set(struct bt_mesh_model *model,
958958
BT_DBG("GattProxySet");
959959
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
960960
ctx->net_idx, ctx->app_idx, ctx->addr);
961-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
961+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
962962

963963
if (buf->data[0] != 0x00 && buf->data[0] != 0x01) {
964964
BT_WARN("Invalid GATT Proxy value 0x%02x", buf->data[0]);
@@ -1021,7 +1021,7 @@ static void net_transmit_get(struct bt_mesh_model *model,
10211021
BT_DBG("NetTransmitGet");
10221022
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
10231023
ctx->net_idx, ctx->app_idx, ctx->addr);
1024-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
1024+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
10251025

10261026
bt_mesh_model_msg_init(&msg, OP_NET_TRANSMIT_STATUS);
10271027
net_buf_simple_add_u8(&msg, bt_mesh_net_transmit_get());
@@ -1041,7 +1041,7 @@ static void net_transmit_set(struct bt_mesh_model *model,
10411041
BT_DBG("NetTransmitSet");
10421042
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
10431043
ctx->net_idx, ctx->app_idx, ctx->addr);
1044-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
1044+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
10451045

10461046
BT_DBG("Transmit 0x%02x Count %u Interval %u",
10471047
buf->data[0],
@@ -1075,7 +1075,7 @@ static void relay_get(struct bt_mesh_model *model,
10751075
BT_DBG("RelayGet");
10761076
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
10771077
ctx->net_idx, ctx->app_idx, ctx->addr);
1078-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
1078+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
10791079

10801080
bt_mesh_model_msg_init(&msg, OP_RELAY_STATUS);
10811081
net_buf_simple_add_u8(&msg, bt_mesh_relay_get());
@@ -1096,7 +1096,7 @@ static void relay_set(struct bt_mesh_model *model,
10961096
BT_DBG("RelaySet");
10971097
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
10981098
ctx->net_idx, ctx->app_idx, ctx->addr);
1099-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
1099+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
11001100

11011101
if (!cfg) {
11021102
BT_WARN("No Configuration Server context available");
@@ -2777,7 +2777,7 @@ static void node_identity_get(struct bt_mesh_model *model,
27772777
BT_DBG("NodeIdentityGet");
27782778
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
27792779
ctx->net_idx, ctx->app_idx, ctx->addr);
2780-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
2780+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
27812781

27822782
idx = net_buf_simple_pull_le16(buf);
27832783
if (idx > 0xfff) {
@@ -2817,7 +2817,7 @@ static void node_identity_set(struct bt_mesh_model *model,
28172817
BT_DBG("NodeIdentitySet");
28182818
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
28192819
ctx->net_idx, ctx->app_idx, ctx->addr);
2820-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
2820+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
28212821

28222822
idx = net_buf_simple_pull_le16(buf);
28232823
if (idx > 0xfff) {
@@ -3098,7 +3098,7 @@ static void node_reset(struct bt_mesh_model *model,
30983098
BT_DBG("NodeReset");
30993099
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
31003100
ctx->net_idx, ctx->app_idx, ctx->addr);
3101-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
3101+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
31023102

31033103
bt_mesh_model_msg_init(&msg, OP_NODE_RESET_STATUS);
31043104

@@ -3137,7 +3137,7 @@ static void friend_get(struct bt_mesh_model *model,
31373137
BT_DBG("FrndGet");
31383138
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
31393139
ctx->net_idx, ctx->app_idx, ctx->addr);
3140-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
3140+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
31413141

31423142
send_friend_status(model, ctx);
31433143
}
@@ -3151,7 +3151,7 @@ static void friend_set(struct bt_mesh_model *model,
31513151
BT_DBG("FrndSet");
31523152
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
31533153
ctx->net_idx, ctx->app_idx, ctx->addr);
3154-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
3154+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
31553155

31563156
if (buf->data[0] != 0x00 && buf->data[0] != 0x01) {
31573157
BT_WARN("Invalid Friend value 0x%02x", buf->data[0]);

‎components/bt/esp_ble_mesh/core/friend.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ static bool friend_sub_exist(struct bt_mesh_friend *frnd, uint16_t addr)
354354
{
355355
int i;
356356

357-
BT_DBG("IsFrndSubExist, Addr 0x%04x");
357+
BT_DBG("IsFrndSubExist, Addr 0x%04x", addr);
358358

359359
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
360360
if (frnd->sub_list[i] == addr) {
@@ -369,7 +369,7 @@ static void friend_sub_add(struct bt_mesh_friend *frnd, uint16_t addr)
369369
{
370370
int i;
371371

372-
BT_DBG("FrndSubAdd, Addr 0x%04x");
372+
BT_DBG("FrndSubAdd, Addr 0x%04x", addr);
373373

374374
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
375375
if (frnd->sub_list[i] == BLE_MESH_ADDR_UNASSIGNED) {
@@ -385,7 +385,7 @@ static void friend_sub_rem(struct bt_mesh_friend *frnd, uint16_t addr)
385385
{
386386
int i;
387387

388-
BT_DBG("FrndSubRem, Addr 0x%04x");
388+
BT_DBG("FrndSubRem, Addr 0x%04x", addr);
389389

390390
for (i = 0; i < ARRAY_SIZE(frnd->sub_list); i++) {
391391
if (frnd->sub_list[i] == addr) {

‎components/bt/esp_ble_mesh/core/health_cli.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static void health_fault_status(struct bt_mesh_model *model,
138138
BT_DBG("HealthFaultStatus");
139139
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
140140
ctx->net_idx, ctx->app_idx, ctx->addr);
141-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
141+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
142142

143143
status.test_id = net_buf_simple_pull_u8(buf);
144144
status.cid = net_buf_simple_pull_le16(buf);
@@ -162,7 +162,7 @@ static void health_current_status(struct bt_mesh_model *model,
162162
BT_DBG("HealthCurrentStatus");
163163
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
164164
ctx->net_idx, ctx->app_idx, ctx->addr);
165-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
165+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
166166

167167
status.test_id = net_buf_simple_pull_u8(buf);
168168
status.cid = net_buf_simple_pull_le16(buf);
@@ -186,7 +186,7 @@ static void health_period_status(struct bt_mesh_model *model,
186186
BT_DBG("HealthPeriodStatus");
187187
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
188188
ctx->net_idx, ctx->app_idx, ctx->addr);
189-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
189+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
190190

191191
status = net_buf_simple_pull_u8(buf);
192192

@@ -202,7 +202,7 @@ static void health_attention_status(struct bt_mesh_model *model,
202202
BT_DBG("HealthAttentionStatus");
203203
BT_DBG("NetIdx 0x%04x AppIdx 0x%04x Src 0x%04x",
204204
ctx->net_idx, ctx->app_idx, ctx->addr);
205-
BT_DBG("Len %u: %s", bt_hex(buf->data, buf->len));
205+
BT_DBG("Len %u: %s", buf->len, bt_hex(buf->data, buf->len));
206206

207207
status = net_buf_simple_pull_u8(buf);
208208

‎components/bt/esp_ble_mesh/core/net.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,6 +2012,9 @@ void bt_mesh_net_recv(struct net_buf_simple *data, int8_t rssi,
20122012
/* Save the state so the buffer can later be relayed */
20132013
net_buf_simple_save(&buf, &state);
20142014

2015+
BT_DBG("NetRecv, Src 0x%04x Dst 0x%04x Rssi %d NetIf %u",
2016+
rx->ctx.addr, rx->ctx.recv_dst, rx->ctx.recv_rssi, net_if);
2017+
20152018
BT_BQB(BLE_MESH_BQB_TEST_LOG_LEVEL_PRIMARY_ID_NODE | \
20162019
BLE_MESH_BQB_TEST_LOG_LEVEL_SUB_ID_NET,
20172020
"\nNetRecv: ctl: %d, src: %d, dst: %d, ttl: %d, data: 0x%s",

0 commit comments

Comments
 (0)