gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix clause update bug and stream scan bug

Browse Source
This commit is contained in:
liuwentan
2023-03-29 14:29:34 +08:00
parent cca03b6faf
commit 658625fde3
6 changed files with 141 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
scanner/adapter_hs/adapter_hs.cpp
View File

@@ -522,8 +522,6 @@ int matched_event_cb(unsigned int id, unsigned long long from,
}
int ret = 0;
long long start_offset = -1;
long long end_offset = -1;
struct pattern_attribute pat_attr = matched_pat->ref_hs_attr[id];
switch (pat_attr.match_mode) {
case HS_MATCH_MODE_EXACTLY:
@@ -532,20 +530,28 @@ int matched_event_cb(unsigned int id, unsigned long long from,
}
break;
case HS_MATCH_MODE_SUB:
if (pat_attr.offset.start == -1 &&
pat_attr.offset.end == -1) {
ret = 1;
break;
}
if (pat_attr.offset.start == -1) {
start_offset = 0;
} else {
start_offset = pat_attr.offset.start;
if ((long long)(to - 1) <= pat_attr.offset.end) {
ret = 1;
break;
}
}
if (pat_attr.offset.end == -1) {
end_offset = matched_pat->scan_data_len;
} else {
end_offset = pat_attr.offset.end;
if ((long long)from >= pat_attr.offset.start) {
ret = 1;
break;
}
}
if (start_offset <= (long long)from &&
end_offset >= (long long)(to - 1)) {
if ((long long)from >= pat_attr.offset.start &&
(long long)(to - 1) <= pat_attr.offset.end) {
ret = 1;
}
break;