From 50bf60cc3fb7f50aa4e8a3b4d96805187d61c77b Mon Sep 17 00:00:00 2001 From: fengweihao Date: Tue, 19 Dec 2023 14:44:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=AC=94=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E9=80=A0=E6=88=90fqdn=5Fcat=E5=91=BD=E4=B8=AD=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E4=B8=AD=E5=AD=98=E5=9C=A8=E5=BC=82=E5=B8=B8=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/include/verify_policy.h | 1 - platform/src/verify_matcher.cpp | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/common/include/verify_policy.h b/common/include/verify_policy.h index cd5c258..fb76e79 100644 --- a/common/include/verify_policy.h +++ b/common/include/verify_policy.h @@ -114,7 +114,6 @@ struct fqdn_category_id { int fqdn_cat_num; long long int group_id[8]; - unsigned int fqdn_cat_id[8]; }; struct request_query_obj diff --git a/platform/src/verify_matcher.cpp b/platform/src/verify_matcher.cpp index c8e4cae..651aa9c 100644 --- a/platform/src/verify_matcher.cpp +++ b/platform/src/verify_matcher.cpp @@ -1543,12 +1543,11 @@ int get_fqdn_category_id(long long *result, const char *fqdn, int table_id, int { if(i < 8) { - if(http_hit_policy_match((int *)(query_obj->fqdn_user.fqdn_cat_id), j, (int)fqdn_cat_user[i]->fqdn_cat_id)) + if(http_hit_policy_match((int *)(query_obj->fqdn_user.group_id), j, (int)fqdn_cat_user[i]->group_id)) { continue; } - query_obj->fqdn_user.fqdn_cat_id[i] = fqdn_cat_user[i]->fqdn_cat_id; - query_obj->fqdn_user.group_id[i] = fqdn_cat_user[i]->group_id; + query_obj->fqdn_user.group_id[j] = fqdn_cat_user[i]->group_id; j++; } fqdn_cat_table_free(fqdn_cat_user[i]); @@ -1560,12 +1559,11 @@ int get_fqdn_category_id(long long *result, const char *fqdn, int table_id, int { if(i < 8) { - if(http_hit_policy_match((int *)(query_obj->fqdn_builtin.fqdn_cat_id), k, (int)fqdn_cat_built[i]->fqdn_cat_id)) + if(http_hit_policy_match((int *)(query_obj->fqdn_builtin.group_id), k, (int)fqdn_cat_built[i]->group_id)) { continue; } - query_obj->fqdn_builtin.fqdn_cat_id[i] = fqdn_cat_built[i]->fqdn_cat_id; - query_obj->fqdn_builtin.group_id[i] = fqdn_cat_built[i]->group_id; + query_obj->fqdn_builtin.group_id[k] = fqdn_cat_built[i]->group_id; k++; } fqdn_cat_table_free(fqdn_cat_built[i]);