Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_not_ignore_msg_in_fast_prov_v4.1' into 'release/v4.1'

Browse source 
ble_mesh: Not ignore msg when fast prov is enabled (v4.1)

See merge request espressif/esp-idf!8710
This commit is contained in:
Island 2020-05-13 18:15:06 +08:00
commit 204553ec6c
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
components/bt/esp_ble_mesh/mesh_core/net.c
View file

@ -1399,6 +1399,14 @@ static bool ready_to_recv(void)
static bool ignore_net_msg(u16_t src, u16_t dst)
{
if (IS_ENABLED(CONFIG_BLE_MESH_FAST_PROV)) {
/* When fast provisioning is enabled, the node addr
* message will be sent to the Primary Provisioner,
* which shall not be ignored here.
*/
return false;
}
if (IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
bt_mesh_is_provisioner_en() &&
BLE_MESH_ADDR_IS_UNICAST(dst) &&
@ -1409,6 +1417,7 @@ static bool ignore_net_msg(u16_t src, u16_t dst)
* be ignored.
*/
if (!bt_mesh_provisioner_get_node_with_addr(src)) {
BT_INFO("Not found node address 0x%04x", src);
return true;
}
}