alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_health_current_status_recv_v3.3' into 'release/v3.3'

Browse Source 
ble_mesh: stack: Fix recv health current status incorrectly (v3.3)

See merge request espressif/esp-idf!10196
This commit is contained in:
Island 2020-08-31 11:15:13 +08:00
commit 41debcfbd2
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/bt/esp_ble_mesh/mesh_core/health_cli.c
View File

@ -141,6 +141,11 @@ static void health_client_cancel(struct bt_mesh_model *model,
bt_mesh_free_buf(val->fault_array); bt_mesh_free_buf(val->fault_array);
break; break;
} }
case OP_HEALTH_CURRENT_STATUS: {
struct bt_mesh_health_current_status *val = status;
bt_mesh_free_buf(val->fault_array);
break;
}
default: default:
break; break;
} }
@ -173,27 +178,23 @@ static void health_current_status(struct bt_mesh_model *model,
struct bt_mesh_msg_ctx *ctx, struct bt_mesh_msg_ctx *ctx,
struct net_buf_simple *buf) struct net_buf_simple *buf)
{ {
bt_mesh_client_node_t *node = NULL; struct bt_mesh_health_current_status status = {0};
u8_t test_id = 0U;
u16_t cid = 0U;
BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s", BT_DBG("net_idx 0x%04x app_idx 0x%04x src 0x%04x len %u: %s",
ctx->net_idx, ctx->app_idx, ctx->addr, buf->len, ctx->net_idx, ctx->app_idx, ctx->addr, buf->len,
bt_hex(buf->data, buf->len)); bt_hex(buf->data, buf->len));
/* Health current status is a publish message, sent to the user directly. */ status.test_id = net_buf_simple_pull_u8(buf);
if (!(node = bt_mesh_is_client_recv_publish_msg(model, ctx, buf, true))) { status.cid = net_buf_simple_pull_le16(buf);
status.fault_array = bt_mesh_alloc_buf(buf->len);
if (!status.fault_array) {
BT_ERR("%s, Out of memory", __func__);
return; return;
} }
test_id = net_buf_simple_pull_u8(buf); net_buf_simple_add_mem(status.fault_array, buf->data, buf->len);
cid = net_buf_simple_pull_le16(buf);
BT_DBG("Test ID 0x%02x Company ID 0x%04x Fault Count %u", health_client_cancel(model, ctx, &status, sizeof(struct bt_mesh_health_current_status));
test_id, cid, buf->len);
((void) test_id);
((void) cid);
} }
static void health_period_status(struct bt_mesh_model *model, static void health_period_status(struct bt_mesh_model *model,