espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ble_mesh_not_ignore_msg_in_fast_prov' into 'master'

Browse Source 
ble_mesh: Not ignore msg when fast prov is enabled

Closes BLEMESH-196

See merge request espressif/esp-idf!8698
This commit is contained in:
Island
2020-05-12 20:36:41 +08:00
parent b0a096495a d937b415e3
commit 1d22f17da3
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1393,6 +1393,14 @@ static bool ready_to_recv(void)
static bool ignore_net_msg(u16_t src, u16_t dst) 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) && if (IS_ENABLED(CONFIG_BLE_MESH_PROVISIONER) &&
bt_mesh_is_provisioner_en() && bt_mesh_is_provisioner_en() &&
BLE_MESH_ADDR_IS_UNICAST(dst) && BLE_MESH_ADDR_IS_UNICAST(dst) &&
@@ -1403,6 +1411,7 @@ static bool ignore_net_msg(u16_t src, u16_t dst)
* be ignored. * be ignored.
*/ */
if (!bt_mesh_provisioner_get_node_with_addr(src)) { if (!bt_mesh_provisioner_get_node_with_addr(src)) {
BT_INFO("Not found node address 0x%04x", src);
return true; return true;
} }
} }