michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: Shell: Move the name filter last

Browse source 
Moved the name filter last, as that it the most expensive
to use.

The address filter has almost been moved after the more
trivial checks.

Signed-off-by: Emil Gydesen <emil.gydesen@nordicsemi.no>
This commit is contained in:
Emil Gydesen 2022-12-15 20:05:52 +01:00 • committed by Fabio Baltieri
commit c27db9ed90
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
subsys/bluetooth/shell/bt.c
View file

@ -196,21 +196,21 @@ static void scan_recv(const struct bt_le_scan_recv_info *info,
char le_addr[BT_ADDR_LE_STR_LEN];
char name[NAME_LEN];
(void)memset(name, 0, sizeof(name));
bt_data_parse(buf, data_cb, name);
bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr));
if (scan_filter.name_set && !is_substring(scan_filter.name, name)) {
if (scan_filter.rssi_set && (scan_filter.rssi > info->rssi)) {
return;
}
bt_addr_le_to_str(info->addr, le_addr, sizeof(le_addr));
if (scan_filter.addr_set && !is_substring(scan_filter.addr, le_addr)) {
return;
}
if (scan_filter.rssi_set && (scan_filter.rssi > info->rssi)) {
(void)memset(name, 0, sizeof(name));
bt_data_parse(buf, data_cb, name);
if (scan_filter.name_set && !is_substring(scan_filter.name, name)) {
return;
}