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

修复bug：上一版本引入，region更新不能反映到compile命中；

Browse Source 
改善Maat_hierarchy_compile_mid_udpate的处理性能。
This commit is contained in:
zhengchao
2021-07-20 20:55:52 +08:00
parent 524edff8be
commit 72ffbd9809
3 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/entry/Maat_hierarchy.cpp
View File

@@ -1225,6 +1225,7 @@ struct Maat_hierarchy_compile_mid
time_t hier_ver;
size_t this_scan_region_hit_cnt;
int not_clause_hitted_flag;
int is_no_count_scan;
size_t hit_path_cnt;
UT_array* _internal_hit_paths;
@@ -1395,6 +1396,7 @@ void Maat_hierarchy_compile_mid_udpate(struct Maat_hierarchy* hier, struct Maat_
mid->Nth_scan=Nth_scan;
utarray_clear(mid->this_scan_hit_clause_ids);
}
int ret=0;
ret=Maat_hierarchy_hit_path_add(mid->_internal_hit_paths, region_id, virtual_table_id, Nth_scan, Nth_region_result);
if(!ret)
@@ -1414,6 +1416,7 @@ void Maat_hierarchy_compile_mid_udpate(struct Maat_hierarchy* hier, struct Maat_
{
return;
}
size_t new_clause_idx=utarray_len(mid->this_scan_hit_clause_ids);
for(i=0; i<utarray_len(r2c_val->clause_ids); i++)
{
clause_id=(unsigned long long*)utarray_eltptr(r2c_val->clause_ids, i);
@@ -1421,10 +1424,18 @@ void Maat_hierarchy_compile_mid_udpate(struct Maat_hierarchy* hier, struct Maat_
{
continue;
}
utarray_push_back(mid->_all_hit_clause_array, clause_id);
utarray_sort(mid->_all_hit_clause_array, compare_clause_id);
utarray_push_back(mid->this_scan_hit_clause_ids, clause_id);
}
if(utarray_len(mid->this_scan_hit_clause_ids)-new_clause_idx)
{
utarray_reserve(mid->_all_hit_clause_array, utarray_len(mid->this_scan_hit_clause_ids)-new_clause_idx);
for(i=new_clause_idx; i<utarray_len(mid->this_scan_hit_clause_ids); i++)
{
clause_id=(unsigned long long *)utarray_eltptr(mid->this_scan_hit_clause_ids, i);
utarray_push_back(mid->_all_hit_clause_array, clause_id);
}
utarray_sort(mid->_all_hit_clause_array, compare_clause_id);
}
return;
}
static int Maat_hierarchy_compile_has_clause(struct Maat_hierarchy_compile* compile, unsigned long long clause_id)

29
src/entry/Maat_rule.cpp
View File

@@ -2328,23 +2328,22 @@ void do_scanner_update(struct Maat_scanner* scanner, int scan_thread_num, void*
int i=0, ret=0;
struct ip_matcher* old_ip_matcher=NULL;
struct FQDN_engine* old_fqdn_engine=NULL;
if(scanner->to_update_compile_cnt+scanner->to_update_group_cnt>0)
ret=Maat_hierarchy_rebuild(scanner->hier);
if(ret!=0)
{
ret=Maat_hierarchy_rebuild(scanner->hier);
if(ret!=0)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_module ,
"Version %d hierarchy rebuild failed.",
scanner->version);
}
else
{
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module ,
"Version %d hierarchy rebuild success, dedup string rule %lu.",
scanner->version,
scanner->dedup_expr_num);
}
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, maat_module ,
"Version %d hierarchy rebuild failed.",
scanner->version);
}
else
{
MESA_handle_runtime_log(logger,RLOG_LV_INFO,maat_module ,
"Version %d hierarchy rebuild success, dedup string rule %lu.",
scanner->version,
scanner->dedup_expr_num);
}
scanner->dedup_expr_num=0;
rulescan_batch_update(scanner->region,
scanner->region_update_q,