From 40b198187ee7d42b4f3dd3cb426843be3eea7afa Mon Sep 17 00:00:00 2001 From: fengweihao Date: Thu, 21 Nov 2019 19:35:16 +0800 Subject: [PATCH] =?UTF-8?q?TSG-91=20=E7=AD=96=E7=95=A5=E5=AF=B9=E8=B1=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8Breq=5Fhdr=E5=92=8Cres=5Fhdr=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=BAhttp=5Fsignature?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/business/pangu-http/src/pangu_http.cpp | 4 ++-- plugin/business/pangu-http/src/pangu_logger.cpp | 2 +- resource/pangu/table_info.conf | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugin/business/pangu-http/src/pangu_http.cpp b/plugin/business/pangu-http/src/pangu_http.cpp index f124cdf..c98f3a2 100644 --- a/plugin/business/pangu-http/src/pangu_http.cpp +++ b/plugin/business/pangu-http/src/pangu_http.cpp @@ -848,9 +848,9 @@ int pangu_policy_init(const char* profile_path, const char* static_section, cons table_name[PXY_CTRL_IP] = "PXY_CTRL_IP"; table_name[PXY_CTRL_HTTP_URL] = "PXY_CTRL_HTTP_URL"; table_name[PXY_CTRL_HTTP_FQDN] = "TSG_OBJ_FQDN"; - table_name[PXY_CTRL_HTTP_REQ_HDR] = "PXY_CTRL_HTTP_REQ_HDR"; + table_name[PXY_CTRL_HTTP_REQ_HDR] = "TSG_OBJ_HTTP_SIGNATURE"; table_name[PXY_CTRL_HTTP_REQ_BODY] = "TSG_OBJ_CONTENT"; - table_name[PXY_CTRL_HTTP_RES_HDR] = "PXY_CTRL_HTTP_RES_HDR"; + table_name[PXY_CTRL_HTTP_RES_HDR] = "TSG_OBJ_HTTP_SIGNATURE"; table_name[PXY_CTRL_HTTP_RES_BODY] = "TSG_OBJ_CONTENT"; table_name[PXY_CTRL_SUBSCRIBE_ID] = "PXY_CTRL_SUBSCRIBE_ID"; for (int i = 0; i < __SCAN_TABLE_MAX; i++) diff --git a/plugin/business/pangu-http/src/pangu_logger.cpp b/plugin/business/pangu-http/src/pangu_logger.cpp index f4c7714..86daaa9 100644 --- a/plugin/business/pangu-http/src/pangu_logger.cpp +++ b/plugin/business/pangu-http/src/pangu_logger.cpp @@ -216,7 +216,7 @@ int pangu_send_log(struct pangu_logger* handle, const struct pangu_log* log_msg) struct tfe_cmsg * cmsg = tfe_stream_get0_cmsg(log_msg->stream); if (cmsg!=NULL) { - int ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_STREAM_TRACE_ID, (unsigned char *) &opt_val, sizeof(opt_val), &opt_out_size); + int ret=tfe_cmsg_get_value(cmsg, TFE_CMSG_STREAM_TRACE_ID, (unsigned char *) &opt_val, sizeof(opt_val), &opt_out_size); if (ret==0) { cJSON_AddNumberToObject(common_obj, "common_stream_trace_id", opt_val); diff --git a/resource/pangu/table_info.conf b/resource/pangu/table_info.conf index e2f4371..3fac254 100644 --- a/resource/pangu/table_info.conf +++ b/resource/pangu/table_info.conf @@ -29,6 +29,7 @@ 6 PXY_CTRL_HTTP_REQ_BODY expr UTF8 GBK/UNICODE/UTF8 yes 128 quickoff 7 PXY_CTRL_HTTP_RES_HDR expr_plus UTF8 UTF8 yes 0 quickoff 7 TSG_OBJ_RES_HDR expr_plus UTF8 UTF8 yes 0 quickoff +7 TSG_OBJ_HTTP_SIGNATURE expr_plus UTF8 UTF8 yes 0 quickoff 8 PXY_CTRL_HTTP_RES_BODY expr UTF8 GBK/UNICODE/UTF8 yes 128 quickoff 8 TSG_OBJ_CONTENT expr UTF8 GBK/UNICODE/UTF8 yes 128 quickoff 9 PXY_CTRL_SUBSCRIBE_ID expr UTF8 UTF8 yes 0 quickon