diff options
| author | fengweihao <[email protected]> | 2023-11-29 18:30:54 +0800 |
|---|---|---|
| committer | fengweihao <[email protected]> | 2023-11-29 18:30:54 +0800 |
| commit | f1bf75367902e1e1ad20a96a6ed1aed528f89d6d (patch) | |
| tree | 5d5cfea65edac1f4cf71b1a5f914c69697bb698d /plugin/business/tsg-http/src/tsg_http.cpp | |
| parent | 72f7290ccd41bc70c9ab29e9f05a575bb6fc0b8b (diff) | |
bugfix: 适配编译表和分组表结构变更，修改本地JSON配置v4.8.49-20231130
Diffstat (limited to 'plugin/business/tsg-http/src/tsg_http.cpp')
| -rw-r--r-- | plugin/business/tsg-http/src/tsg_http.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugin/business/tsg-http/src/tsg_http.cpp b/plugin/business/tsg-http/src/tsg_http.cpp index 6d91e8b..fe61ec2 100644 --- a/plugin/business/tsg-http/src/tsg_http.cpp +++ b/plugin/business/tsg-http/src/tsg_http.cpp @@ -435,7 +435,7 @@ char* str_unescape(char* s) void policy_action_param_new(const char *table_name, int table_id, const char* key, const char* table_line, void **ad, long argl, void* argp) { - int ret=0; + int ret=0, group_num=0; long long config_id=0; int service_id=0, action=0; int do_log=0,do_blacklist=0,is_valid=0; @@ -443,8 +443,8 @@ void policy_action_param_new(const char *table_name, int table_id, const char* k char srv_def_large[8192]={0}; struct policy_action_param* param=NULL; - ret=sscanf(table_line, "%lld\t%d\t%d\t%d\t%d\t%s\t%s\t%d", &config_id, &service_id, &action, &do_blacklist, &do_log,effective_range, srv_def_large, &is_valid); - if(ret!=8) + ret=sscanf(table_line, "%lld\t%d\t%d\t%d\t%d\t%s\t%s\t%d\t%d", &config_id, &service_id, &action, &do_blacklist, &do_log, effective_range, srv_def_large, &group_num, &is_valid); + if(ret!=9) { TFE_LOG_ERROR(g_proxy_rt->local_logger, "ctrl policy table parse failed, ret:%d, %s", ret, table_line); return; @@ -1100,8 +1100,8 @@ int proxy_policy_init(const char* profile_path, const char* static_section, cons table_name[PXY_CTRL_SOURCE_ADDR] = "ATTR_SOURCE_ADDR"; table_name[PXY_CTRL_DESTINATION_ADDR]="ATTR_DESTINATION_ADDR"; table_name[PXY_CTRL_HTTP_URL] = "ATTR_HTTP_URL"; - table_name[PXY_CTRL_HTTP_FQDN] = "ATTR_HTTP_HOST"; - table_name[PXY_CTRL_HTTP_FQDN_CAT] = "ATTR_HTTP_HOST_CAT"; + table_name[PXY_CTRL_HTTP_FQDN] = "ATTR_HTTP_HOST_VIRTUAL"; + table_name[PXY_CTRL_HTTP_FQDN_CAT] = "ATTR_HTTP_HOST_CAT_VIRTUAL"; table_name[PXY_CTRL_HTTP_REQ_HDR] = "ATTR_HTTP_REQ_HDR"; table_name[PXY_CTRL_HTTP_REQ_BODY] = "ATTR_HTTP_REQ_BODY"; table_name[PXY_CTRL_HTTP_RES_HDR] = "ATTR_HTTP_RES_HDR"; |