diff options
| author | fengweihao <[email protected]> | 2023-08-09 15:39:34 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2023-08-09 15:39:34 +0800 |
| commit | 194a645fb25b555c87e67364d3d25f67b72d6388 (patch) | |
| tree | 906140a99ae848a6007519ff7a23e0db0f16b13f | |
| parent | a0e647a963e1ca9ce1092bab99629e5397986fdc (diff) | |
TSG-16563 安全策略支持monitor动作与其他动作可同时执行v3.0.17-20230811
| -rw-r--r-- | platform/src/verify_matcher.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp index e455c9f..d67aed0 100644 --- a/platform/src/verify_matcher.cpp +++ b/platform/src/verify_matcher.cpp @@ -858,12 +858,6 @@ static enum policy_action decide_ctrl_action(int vsys_id, int compile_table_id, return PG_ACTION_WHITELIST; } - size_t monit_enable=1; - if(compile_table_id == TSG_TABLE_SECURITY && n_monit != n_hit) - { - monit_enable=0; - } - exist_enforce_num = *n_enforce; if (multiple_hit_actions(prior_action)) { @@ -875,7 +869,7 @@ static enum policy_action decide_ctrl_action(int vsys_id, int compile_table_id, } *enforce_rules = (struct rule_data_ctx *) realloc(*enforce_rules, sizeof(struct rule_data_ctx ) * (*n_enforce)); - if (multiple_hit_actions(prior_action) && monit_enable) + if (multiple_hit_actions(prior_action)) { memcpy(*enforce_rules + exist_enforce_num, monit_rule, n_monit * sizeof(struct rule_data_ctx )); } @@ -883,10 +877,7 @@ static enum policy_action decide_ctrl_action(int vsys_id, int compile_table_id, { memmove(*enforce_rules+1, *enforce_rules, exist_enforce_num*sizeof(struct rule_data_ctx )); memcpy(*enforce_rules, prior_rule, sizeof(struct rule_data_ctx )); - if(monit_enable) - { - memcpy(*enforce_rules + exist_enforce_num + 1, monit_rule, n_monit * sizeof(struct rule_data_ctx )); - } + memcpy(*enforce_rules + exist_enforce_num + 1, monit_rule, n_monit * sizeof(struct rule_data_ctx )); } return prior_action; } |
