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

从安全策略user_region中获取Vsys_id填充到安全事件日志，无策略日志填充容器分配的Vsys_id

Browse Source
This commit is contained in:
liuxueli
2022-10-14 16:12:55 +08:00
parent 8758d0b375
commit a8a54f4f6f
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/tsg_send_log.cpp
View File

@@ -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;i<log_msg->result_num; i++)