From a8a54f4f6f422d9eb70683c486ff83536ac29ba8 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Fri, 14 Oct 2022 16:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=8E=E5=AE=89=E5=85=A8=E7=AD=96=E7=95=A5us?= =?UTF-8?q?er=5Fregion=E4=B8=AD=E8=8E=B7=E5=8F=96Vsys=5Fid=E5=A1=AB?= =?UTF-8?q?=E5=85=85=E5=88=B0=E5=AE=89=E5=85=A8=E4=BA=8B=E4=BB=B6=E6=97=A5?= =?UTF-8?q?=E5=BF=97=EF=BC=8C=E6=97=A0=E7=AD=96=E7=95=A5=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=A1=AB=E5=85=85=E5=AE=B9=E5=99=A8=E5=88=86=E9=85=8D=E7=9A=84?= =?UTF-8?q?Vsys=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tsg_send_log.cpp | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp index f0c595c..585ec5c 100644 --- a/src/tsg_send_log.cpp +++ b/src/tsg_send_log.cpp @@ -1492,7 +1492,8 @@ static int set_xxxx_from_user_region(struct TLD_handle_t *_handle, struct tsg_lo } if(object==NULL) - { + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)(_instance->vsystem_id), TLD_TYPE_LONG); return 0; } @@ -1505,6 +1506,16 @@ static int set_xxxx_from_user_region(struct TLD_handle_t *_handle, struct tsg_lo } } + item=cJSON_GetObjectItem(object, "vsys_id"); + if(item!=NULL) + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)item->valueint, TLD_TYPE_LONG); + } + else + { + TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)_instance->vsystem_id, TLD_TYPE_LONG); + } + cJSON_Delete(object); object=NULL; @@ -2079,9 +2090,7 @@ int tsg_send_log(struct tsg_log_instance_t *instance, struct TLD_handle_t *handl { TLD_append(_handle, _instance->id2field[LOG_COMMON_DEVICE_TAG].name, (void *)(g_tsg_para.device_tag), TLD_TYPE_STRING); } - - TLD_append(_handle, _instance->id2field[LOG_COMMON_VSYSTEM_ID].name, (void *)(long)(_instance->vsystem_id), TLD_TYPE_LONG); - + set_application_behavior(_instance, _handle, log_msg->a_stream); for(i=0;iresult_num; i++)