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

fix json2iris bug

Browse Source
This commit is contained in:
liuwentan
2023-04-07 11:05:01 +08:00
parent fb3896c078
commit 4430c8e696
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/json2iris.c
View File

@@ -338,11 +338,11 @@ int direct_write_rule(cJSON *json, struct maat_kv_store *str2int,
{ {
int i = 0; int i = 0;
int ret = -1; int ret = -1;
cJSON dummy;
for (i = 0; i < cmd_cnt; i++) { for (i = 0; i < cmd_cnt; i++) {
cJSON *item = cJSON_GetObjectItem(json, cmd[i].json_string); cJSON *item = cJSON_GetObjectItem(json, cmd[i].json_string);
if (NULL == item && (1 == cmd[i].empty_allowed)) { if (NULL == item && (1 == cmd[i].empty_allowed)) {
cJSON dummy;
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.valuedouble = cmd[i].default_int;

2
tools/maat_redis_tool.cpp
View File

@@ -25,7 +25,7 @@ void maat_tool_print_usage(void)
printf("\t-h [host], redis IP, 127.0.0.1 as default.\n"); printf("\t-h [host], redis IP, 127.0.0.1 as default.\n");
printf("\t-p [port], redis port, 6379 as default.\n"); printf("\t-p [port], redis port, 6379 as default.\n");
printf("\t-n [db], redis db, 0 as default.\n"); printf("\t-n [db], redis db, 0 as default.\n");
printf("\t-d [dir], dump rules from redis to [dir], %s as default.\n",redis_dump_dir); printf("\t-d [dir], dump rules from redis to [dir], %s as default.\n", redis_dump_dir);
printf("\t-v [version], dump specific [version] from redis, dump latest version as default.\n"); printf("\t-v [version], dump specific [version] from redis, dump latest version as default.\n");
printf("\t-j [payload.json], add or delete rules as maat json. Must have field compile_table field, and plugin table's valid flag must be in the last column.\n"); printf("\t-j [payload.json], add or delete rules as maat json. Must have field compile_table field, and plugin table's valid flag must be in the last column.\n");
printf("\t-t [timeout], timeout config after t seconds, default is 0 which means never timeout.\n"); printf("\t-t [timeout], timeout config after t seconds, default is 0 which means never timeout.\n");