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

修复设置MAAT_OPT_SCAN_DETAIL未生效的bug；在rulescan不返回命中位置时，不填充hit_detail。

Browse Source
This commit is contained in:
zhengchao
2016-03-11 15:45:26 +08:00
parent 4006771fca
commit b8ad5c8d8e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/entry/Maat_api.cpp
View File

@@ -434,6 +434,7 @@ Maat_feather_t Maat_feather(int max_thread_num,const char* table_info_path,void*
feather->garbage_q=MESA_lqueue_create(0,0); feather->garbage_q=MESA_lqueue_create(0,0);
feather->effect_interval_ms=60*1000; feather->effect_interval_ms=60*1000;
feather->scan_interval_ms=1*1000; feather->scan_interval_ms=1*1000;
feather->rule_scan_type=2;
feather->thread_call_cnt=aligment_int64_array_alloc(max_thread_num); feather->thread_call_cnt=aligment_int64_array_alloc(max_thread_num);
return feather; return feather;
} }
@@ -541,7 +542,6 @@ int Maat_initiate_feather(Maat_feather_t feather)
_feather->scanner=_feather->update_tmp_scanner; _feather->scanner=_feather->update_tmp_scanner;
_feather->update_tmp_scanner=NULL; _feather->update_tmp_scanner=NULL;
_feather->still_working=1; _feather->still_working=1;
_feather->rule_scan_type=2;
if(_feather->scanner!=NULL) if(_feather->scanner!=NULL)
{ {
_feather->maat_version=_feather->scanner->version; _feather->maat_version=_feather->scanner->version;
@@ -794,7 +794,7 @@ int Maat_full_scan_string_detail(Maat_feather_t feather,int table_id
region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag), region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag),
hit_region_cnt, hit_region_cnt,
result,compile_result,rule_num); result,compile_result,rule_num);
if(hit_detail!=NULL) if(hit_detail!=NULL||_feather->rule_scan_type==0)
{ {
*detail_ret=fill_region_hit_detail(data,_mid->inner, *detail_ret=fill_region_hit_detail(data,_mid->inner,
region_result,hit_region_cnt, region_result,hit_region_cnt,
@@ -1193,7 +1193,7 @@ int Maat_stream_scan_string_detail(stream_para_t* stream_para
region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag), region_result,sizeof(scan_result_t),offsetof(scan_result_t, tag),
hit_region_cnt, hit_region_cnt,
result,compile_result,rule_num); result,compile_result,rule_num);
if(hit_detail!=NULL) if(hit_detail!=NULL||sp->feather->rule_scan_type==0)
{ {
if(sp->scan_buff!=NULL) if(sp->scan_buff!=NULL)
{ {

2
src/entry/Maat_rule.cpp
View File

@@ -26,7 +26,7 @@
#include "mesa_fuzzy.h" #include "mesa_fuzzy.h"
#include "great_index_engine.h" #include "great_index_engine.h"
int MAAT_FRAME_VERSION_1_5_20160211=1; int MAAT_FRAME_VERSION_1_5_20160311=1;
const char *maat_module="MAAT Frame"; const char *maat_module="MAAT Frame";
const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"}; const char* CHARSET_STRING[]={"CHARSET_NONE","GBK","BIG5","UNICODE","UTF-8"};