djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ScanEntry prefix matching for all

This commit is contained in:
Dan Halbert 2020-06-15 16:35:51 -04:00
parent 9285252fbc
commit 81896930c7
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shared-module/_bleio/ScanEntry.c
View File

@ -56,12 +56,19 @@ bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t
if (prefixes_length == 0) {
return true;
}
if (len == 0) {
// Prefixes exist, but no data.
return false;
}
size_t i = 0;
while(i < prefixes_length) {
uint8_t prefix_length = prefixes[i];
i += 1;
size_t j = 0;
bool prefix_matched = false;
mp_printf(&mp_plat_print,"i %d\n", i); // XXX
while (j < len) {
mp_printf(&mp_plat_print," j %d\n", j); // XXX
uint8_t structure_length = data[j];
j += 1;
if (structure_length == 0) {
@ -71,13 +78,21 @@ bool bleio_scanentry_data_matches(const uint8_t* data, size_t len, const uint8_t
if (any) {
return true;
}
} else if (!any) {
return false;
prefix_matched = true;
mp_printf(&mp_plat_print," match\n"); // XXX
break;
}
j += structure_length;
}
// If all (!any), the current prefix must have matched at least one field.
if (!prefix_matched && !any) {
mp_printf(&mp_plat_print,"<prefix not matched\n"); // XXX
return false;
}
i += prefix_length;
}
// All prefixes matched some field (if !any), or none did (if any).
mp_printf(&mp_plat_print,"<all matched\n"); // XXX
return !any;
}