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

Merge branch 'Branch_v1.0.4' into develop-20.05.01

Browse Source 
# Conflicts:
#	src/tsg_entry.cpp
安全事件日志中填写“设备编号”字段(https://jira.geedge.net/browse/TSG-1722)
This commit is contained in:
liuxueli
2020-05-25 15:02:59 +08:00
parent cbcabe06b3 a03e59cadd
commit 76c0b51246
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tsg_send_log.cpp
View File

@@ -19,7 +19,7 @@
#include "tsg_send_log.h"
#include "tsg_send_log_internal.h"
char TSG_SEND_LOG_VERSION_20200427=0;
char TSG_SEND_LOG_VERSION_20200522=0;
struct tsg_log_instance_t *g_tsg_log_instance;
@@ -487,6 +487,7 @@ int tsg_send_log(struct tsg_log_instance_t *instance, struct TLD_handle_t *handl
TLD_append_streaminfo(instance, handle, log_msg->a_stream);
TLD_append(_handle, _instance->id2field[LOG_COMMON_SLED_IP].name, (void *)(_instance->local_ip_str), TLD_TYPE_STRING);
TLD_append(_handle, _instance->id2field[LOG_COMMON_DEVICE_ID].name, (void *)(g_tsg_para.device_sn), TLD_TYPE_STRING);
for(i=0;i<log_msg->result_num; i++)
{