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

rename terminology "clause" to "condition"

Browse Source
This commit is contained in:
root
2024-08-22 07:35:53 +00:00
parent f660e6b2ac
commit e538f5bb52
20 changed files with 682 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/inc_internal/maat_rule.h
View File

@@ -77,7 +77,7 @@ int group2rule_runtime_update(void *g2c_runtime, void *g2c_schema,
const char *table_name, const char *line,
int valid_column);
long long group2rule_runtime_not_clause_count(void *g2c_runtime);
long long group2rule_runtime_not_condition_count(void *g2c_runtime);
long long group2rule_runtime_rule_count(void *g2c_runtime);

46
src/json2iris.c
View File

@@ -644,7 +644,7 @@ write_region_rule(cJSON *region_json, int rule_id, int group_id,
static int
write_group2rule_line(int *group_ids, size_t n_group_id,
int rule_id, int group_not_flag,
int clause_index, const char *attribute,
int condition_index, const char *attribute,
struct iris_description *p_iris,
struct iris_table *g2c_table)
{
@@ -670,10 +670,10 @@ write_group2rule_line(int *group_ids, size_t n_group_id,
}
group_id_str[strlen(group_id_str) - 1] = '\0';
snprintf(buff, sizeof(buff), "%s\t%d\t%d\t%s\t%d\t1\n", group_id_str,
rule_id, group_not_flag, attribute, clause_index);
rule_id, group_not_flag, attribute, condition_index);
} else {
snprintf(buff, sizeof(buff), "%d\t%d\t%d\t%s\t%d\t1\n", group_ids[0],
rule_id, group_not_flag, attribute, clause_index);
rule_id, group_not_flag, attribute, condition_index);
}
table->write_pos += memcat(&(table->buff), table->write_pos,
@@ -754,7 +754,7 @@ write_group_rule(cJSON *group_json, int parent_id,
{
int ret = 0;
int group_not_flag = 0;
int clause_index = 0;
int condition_index = 0;
const char *group_name = NULL;
char group_name_array[32][MAX_NAME_STR_LEN];
size_t group_name_cnt = 0;
@@ -804,11 +804,11 @@ write_group_rule(cJSON *group_json, int parent_id,
group_not_flag = item->valueint;
}
item = cJSON_GetObjectItem(group_json, "clause_index");
item = cJSON_GetObjectItem(group_json, "condition_index");
if (NULL == item || item->type != cJSON_Number) {
clause_index = Nth_group;
condition_index = Nth_group;
} else {
clause_index = item->valueint;
condition_index = item->valueint;
}
item = cJSON_GetObjectItem(group_json, "g2c_table_name");
@@ -833,7 +833,7 @@ write_group_rule(cJSON *group_json, int parent_id,
}
assert(parent_type == PARENT_TYPE_RULE);
ret = write_group2rule_line(group_ids, group_name_cnt, parent_id,
group_not_flag, clause_index,
group_not_flag, condition_index,
attribute, p_iris, g2c_table);
} else {
@@ -894,7 +894,7 @@ write_group_rule(cJSON *group_json, int parent_id,
if (parent_type == PARENT_TYPE_RULE) {
ret = write_group2rule_line(&(group_info->group_id), 1, parent_id,
group_not_flag, clause_index,
group_not_flag, condition_index,
attribute, p_iris, g2c_table);
if (ret < 0) {
log_fatal(logger, MODULE_JSON2IRIS,
@@ -923,34 +923,34 @@ write_rule_line(cJSON *rule, struct iris_description *p_iris,
cJSON *group_array = cJSON_GetObjectItem(rule, "groups");
int group_num = cJSON_GetArraySize(group_array);
int *clause_ids = ALLOC(int, group_num);
int clause_num = 0;
int *condition_ids = ALLOC(int, group_num);
int condition_num = 0;
cJSON *group_obj = NULL;
cJSON_ArrayForEach(group_obj, group_array) {
item = cJSON_GetObjectItem(group_obj, "clause_index");
item = cJSON_GetObjectItem(group_obj, "condition_index");
if (item) {
int i = 0;
int clause_index = item->valueint;
for (i = 0; i < clause_num; i++) {
if (clause_ids[i] == clause_index) {
int condition_index = item->valueint;
for (i = 0; i < condition_num; i++) {
if (condition_ids[i] == condition_index) {
break;
}
}
if (i == clause_num) {
clause_ids[clause_num] = clause_index;
clause_num++;
if (i == condition_num) {
condition_ids[condition_num] = condition_index;
condition_num++;
}
}
}
FREE(clause_ids);
FREE(condition_ids);
if (clause_num == 0) {
clause_num = group_num;
if (condition_num == 0) {
condition_num = group_num;
}
cJSON_AddNumberToObject(rule, "clause_num", clause_num);
cJSON_AddNumberToObject(rule, "condition_num", condition_num);
struct translate_command rule_cmd[MAX_COLUMN_NUM];
memset(rule_cmd, 0, sizeof(rule_cmd));
@@ -987,7 +987,7 @@ write_rule_line(cJSON *rule, struct iris_description *p_iris,
rule_cmd[cmd_cnt].json_type = cJSON_String;
cmd_cnt++;
rule_cmd[cmd_cnt].json_string = "clause_num";
rule_cmd[cmd_cnt].json_string = "condition_num";
rule_cmd[cmd_cnt].json_type = cJSON_Number;
cmd_cnt++;

812
src/maat_rule.c
View File

File diff suppressed because it is too large Load Diff

14
src/maat_stat.c
View File

@@ -29,7 +29,7 @@ enum MAAT_FS_STATUS {
STATUS_TABLE_NUM,
STATUS_PLUGIN_CACHE_NUM,
STATUS_PLUGIN_ACC_NUM,
STATUS_CLAUSE_REF_NOT_NUM,
STATUS_CONDITION_REF_NOT_NUM,
STATUS_GROUP_REF_EXCL_NUM, //group reference exclude group num
STATUS_HIT_RULE_NUM,
STATUS_MAAT_STATE_NUM,
@@ -75,8 +75,8 @@ static void fs_global_metric_register(struct maat_stat *stat)
stat->g_metric_id[STATUS_PLUGIN_ACC_NUM] =
fieldstat_easy_register_counter(stat->fs_handle, "plug_acc_num");
stat->g_metric_id[STATUS_CLAUSE_REF_NOT_NUM] =
fieldstat_easy_register_counter(stat->fs_handle, "NOT_clause_num");
stat->g_metric_id[STATUS_CONDITION_REF_NOT_NUM] =
fieldstat_easy_register_counter(stat->fs_handle, "NOT_condition_num");
stat->g_metric_id[STATUS_GROUP_REF_EXCL_NUM] =
fieldstat_easy_register_counter(stat->fs_handle, "excl_grp");
@@ -244,7 +244,7 @@ static void fs_table_row_refresh(struct maat_stat *stat, int perf_on)
long long total_rule_num = 0, total_scan_bytes = 0, total_update_err = 0;
long long total_scan_times = 0, total_hit_times = 0, total_scan_cpu_time = 0;
long long total_regv6_num = 0, total_hit_item_num = 0, total_hit_pattern_num = 0;
long long g2c_not_clause_num = 0, g2g_excl_rule_num = 0;
long long g2c_not_condition_num = 0, g2g_excl_rule_num = 0;
struct field cell_tag = {
.key = "TBL",
.type = FIELD_VALUE_CSTRING
@@ -273,7 +273,7 @@ static void fs_table_row_refresh(struct maat_stat *stat, int perf_on)
plugin_rule_num += plugin_runtime_rule_count(runtime);
break;
case TABLE_TYPE_GROUP2RULE:
g2c_not_clause_num += group2rule_runtime_not_clause_count(runtime);
g2c_not_condition_num += group2rule_runtime_not_condition_count(runtime);
break;
case TABLE_TYPE_GROUP2GROUP:
g2g_excl_rule_num += group2group_runtime_exclude_rule_count(runtime);
@@ -415,8 +415,8 @@ static void fs_table_row_refresh(struct maat_stat *stat, int perf_on)
NULL, 0, plugin_rule_num);
fieldstat_easy_counter_set(stat->fs_handle, 0,
stat->g_metric_id[STATUS_CLAUSE_REF_NOT_NUM],
NULL, 0, g2c_not_clause_num);
stat->g_metric_id[STATUS_CONDITION_REF_NOT_NUM],
NULL, 0, g2c_not_condition_num);
fieldstat_easy_counter_set(stat->fs_handle, 0,
stat->g_metric_id[STATUS_GROUP_REF_EXCL_NUM],