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/heartbeat_filter_with_acceptlist_v3.3' into 'release/v3.3'

Browse Source 
ble_mesh: stack: Fix heartbeat filter with accept list (v3.3)

See merge request espressif/esp-idf!15687
This commit is contained in:
Jiang Jiang Jian 2021-12-01 14:20:59 +00:00
commit 3078e504e3
1 changed files with 59 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
components/bt/esp_ble_mesh/mesh_core/provisioner_main.c
View File

@ -1691,55 +1691,65 @@ int bt_mesh_provisioner_set_heartbeat_filter_info(uint8_t op, uint16_t src, uint
} }
} }
static bool filter_with_rejectlist(struct heartbeat_filter *filter, static bool filter_with_rejectlist(uint16_t hb_src, uint16_t hb_dst)
uint16_t hb_src, uint16_t hb_dst)
{ {
switch (filter->type) { int i;
case HEARTBEAT_FILTER_WITH_SRC:
if (hb_src == filter->src) { for (i = 0; i < ARRAY_SIZE(hb_rx.filter); i++) {
return true; struct heartbeat_filter *filter = &hb_rx.filter[i];
switch (filter->type) {
case HEARTBEAT_FILTER_WITH_SRC:
if (hb_src == filter->src) {
return true;
}
break;
case HEARTBEAT_FILTER_WITH_DST:
if (hb_dst == filter->dst) {
return true;
}
break;
case HEARTBEAT_FILTER_WITH_BOTH:
if (hb_src == filter->src && hb_dst == filter->dst) {
return true;
}
break;
default:
BT_DBG("Unknown filter addr type 0x%02x", filter->type);
break;
} }
break;
case HEARTBEAT_FILTER_WITH_DST:
if (hb_dst == filter->dst) {
return true;
}
break;
case HEARTBEAT_FILTER_WITH_BOTH:
if (hb_src == filter->src && hb_dst == filter->dst) {
return true;
}
break;
default:
BT_WARN("Unknown filter addr type 0x%02x", filter->type);
break;
} }
return false; return false;
} }
static bool filter_with_acceptlist(struct heartbeat_filter *filter, static bool filter_with_acceptlist(uint16_t hb_src, uint16_t hb_dst)
uint16_t hb_src, uint16_t hb_dst)
{ {
switch (filter->type) { int i;
case HEARTBEAT_FILTER_WITH_SRC:
if (hb_src == filter->src) { for (i = 0; i < ARRAY_SIZE(hb_rx.filter); i++) {
return false; struct heartbeat_filter *filter = &hb_rx.filter[i];
switch (filter->type) {
case HEARTBEAT_FILTER_WITH_SRC:
if (hb_src == filter->src) {
return false;
}
break;
case HEARTBEAT_FILTER_WITH_DST:
if (hb_dst == filter->dst) {
return false;
}
break;
case HEARTBEAT_FILTER_WITH_BOTH:
if (hb_src == filter->src && hb_dst == filter->dst) {
return false;
}
break;
default:
BT_DBG("Unknown filter addr type 0x%02x", filter->type);
break;
} }
break;
case HEARTBEAT_FILTER_WITH_DST:
if (hb_dst == filter->dst) {
return false;
}
break;
case HEARTBEAT_FILTER_WITH_BOTH:
if (hb_src == filter->src && hb_dst == filter->dst) {
return false;
}
break;
default:
BT_WARN("Unknown filter addr type 0x%02x", filter->type);
return false;
} }
return true; return true;
@ -1749,26 +1759,20 @@ void bt_mesh_provisioner_heartbeat(uint16_t hb_src, uint16_t hb_dst,
uint8_t init_ttl, uint8_t rx_ttl, uint8_t init_ttl, uint8_t rx_ttl,
uint8_t hops, uint16_t feat, int8_t rssi) uint8_t hops, uint16_t feat, int8_t rssi)
{ {
int i;
if (hb_rx.cb == NULL) { if (hb_rx.cb == NULL) {
BT_DBG("Receiving heartbeat is not enabled"); BT_DBG("Receiving heartbeat is not enabled");
return; return;
} }
for (i = 0; i < ARRAY_SIZE(hb_rx.filter); i++) { if (hb_rx.type == HEARTBEAT_FILTER_REJECTLIST) {
struct heartbeat_filter *filter = &hb_rx.filter[i]; if (filter_with_rejectlist(hb_src, hb_dst)) {
BT_INFO("Filtered by rejectlist, src 0x%04x, dst 0x%04x", hb_src, hb_dst);
if (hb_rx.type == HEARTBEAT_FILTER_REJECTLIST) { return;
if (filter_with_rejectlist(filter, hb_src, hb_dst)) { }
BT_DBG("Filtered by rejectlist, src 0x%04x, dst 0x%04x", hb_src, hb_dst); } else {
return; if (filter_with_acceptlist(hb_src, hb_dst)) {
} BT_INFO("Filtered by acceptlist, src 0x%04x, dst 0x%04x", hb_src, hb_dst);
} else { return;
if (filter_with_acceptlist(filter, hb_src, hb_dst)) {
BT_DBG("Filtered by acceptlist, src 0x%04x, dst 0x%04x", hb_src, hb_dst);
return;
}
} }
} }