From 194a645fb25b555c87e67364d3d25f67b72d6388 Mon Sep 17 00:00:00 2001 From: fengweihao Date: Wed, 9 Aug 2023 15:39:34 +0800 Subject: [PATCH] =?UTF-8?q?TSG-16563=20=E5=AE=89=E5=85=A8=E7=AD=96?= =?UTF-8?q?=E7=95=A5=E6=94=AF=E6=8C=81monitor=E5=8A=A8=E4=BD=9C=E4=B8=8E?= =?UTF-8?q?=E5=85=B6=E4=BB=96=E5=8A=A8=E4=BD=9C=E5=8F=AF=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- platform/src/verify_matcher.cpp | 13 ++----------- 1 file 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; }