diff --git a/bin/kniconf/kni.conf b/bin/kniconf/kni.conf index 327b7fa..f18f81e 100644 --- a/bin/kniconf/kni.conf +++ b/bin/kniconf/kni.conf @@ -1,9 +1,16 @@ -[MOUDLE] +[Module] table_info_path=./kniconf/maat_table_info.conf -full_cfg_dir=/home/liuyang/run/sapp_run/config/index -inc_cfg_dir=/home/liuyang/run/sapp_run/config/inc/index +full_cfg_dir=/home/mesasoft/tango_rules/full/index +inc_cfg_dir=/home/mesasoft/tango_rules/inc/index logger_filepath=./log/kni.log -logger_level=10 +logger_level=30 -maat_json_switch=1 +default_work_mode=1 +#0:iris;1:json;2:redis +maat_readconf_mode=2 +redis_server=192.168.11.243 +redis_port=6379 +redis_db_index=4 +scandir_interval=1000 +effect_interval=60000 diff --git a/kni.c b/kni.c index 70b4bd5..432eab9 100644 --- a/kni.c +++ b/kni.c @@ -1218,13 +1218,13 @@ int kni_scan_whitelist_domain(char* domain,int domain_len,int thread_seq,scan_st struct Maat_rule_t maat_result[KNI_MAX_SAMENUM]; string_scan_num=Maat_full_scan_string(g_kni_maatinfo.maat_feather,g_kni_maatinfo.tableid_domain,CHARSET_GBK,domain,domain_len,maat_result,&found_pos,KNI_MAX_SAMENUM,&mid,thread_seq); -/* + if((g_kni_switch_info.maat_default_mode==KNI_DEFAULT_MODE_BYPASS)&&(string_scan_num==0)) { action=KNI_ACTION_WHITELIST; return action; } -*/ + for(i=0;i