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

maat json在处理默认值时,未能清空valuedouble，导致对effective_rage拼写错误的兼容性问题。

Browse Source
This commit is contained in:
zhengchao
2017-09-13 11:40:56 +08:00
parent c7af487e41
commit d05902f95c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entry/Maat_rule.cpp
View File

@@ -30,7 +30,7 @@
#include "stream_fuzzy_hash.h" #include "stream_fuzzy_hash.h"
#include "gram_index_engine.h" #include "gram_index_engine.h"
int MAAT_FRAME_VERSION_2_0_20170911=1; int MAAT_FRAME_VERSION_2_0_20170913=1;
const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin", const char* CHARSET_STRING[]={"NONE","gbk","big5","unicode","utf8","bin",
"unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""}; "unicode_ascii_esc","unicode_ascii_aligned","unicode_ncr_dec","unicode_ncr_hex","url_encode_gb2312","url_encode_utf8",""};

2
src/entry/config_monitor.cpp
View File

@@ -7,7 +7,7 @@
#include <string.h> #include <string.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#define module_config_monitor (module_name_str("CONFIG_MONITOR")) #define module_config_monitor (module_name_str("MAAT_FILE_MONITOR"))
#define CM_UPDATE_TYPE_ERR -1 #define CM_UPDATE_TYPE_ERR -1

3
src/entry/json2iris.cpp
View File

@@ -192,7 +192,8 @@ int direct_write_rule(cJSON* json,MESA_htable_handle str2int,struct traslate_com
if(item==NULL&&cmd[i].empty_allowed==1) if(item==NULL&&cmd[i].empty_allowed==1)
{ {
dummy.valuestring=(char*)cmd[i].default_string; dummy.valuestring=(char*)cmd[i].default_string;
dummy.valueint=cmd[i].default_int; dummy.valueint=cmd[i].default_int;
dummy.valuedouble=cmd[i].default_int;
dummy.type=cmd[i].json_type; dummy.type=cmd[i].json_type;
item=&dummy; item=&dummy;