gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TSG-8451 common_stream_trace_id已超过long型，同安全策略修改trace_id为字符串

Browse Source
This commit is contained in:
fengweihao
2021-11-15 18:46:52 +08:00
parent e4ed3b0b28
commit 16b4a62942
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/business/doh/src/logger.cpp
View File

@@ -341,7 +341,7 @@ int doh_send_log(struct doh_conf *handle, const struct tfe_http_session *http, c
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) if (ret == 0)
{ {
cJSON_AddNumberToObject(common_obj, "common_stream_trace_id", atoll(opt_val)); cJSON_AddStringToObject(common_obj, "common_stream_trace_id", opt_val);
} }
ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size); ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size);
if (ret==0) if (ret==0)

2
plugin/business/pangu-http/src/pangu_logger.cpp
View File

@@ -160,7 +160,7 @@ int pangu_send_log(struct pangu_logger* handle, const struct pangu_log* log_msg)
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) if (ret==0)
{ {
cJSON_AddNumberToObject(common_obj, "common_stream_trace_id", atoll(opt_val)); cJSON_AddStringToObject(common_obj, "common_stream_trace_id", opt_val);
} }
ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size); ret = tfe_cmsg_get_value(cmsg, TFE_CMSG_COMMON_DIRECTION, (unsigned char *)&common_direction, sizeof(common_direction), &opt_out_size);
if (ret==0) if (ret==0)