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

TSG-13040: 修复app_identity_info日志字段未正常记录所有APP的识别过程信息的问题，本次修改后app_identity_info仅展示用户自定义及内置特征识别APP的过程。

Browse Source
This commit is contained in:
liuxueli
2022-12-12 11:34:44 +08:00
parent 72bb4479ca
commit f5acead84a
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tsg_send_log.cpp
View File

@@ -616,19 +616,20 @@ static int set_packet_bytes(struct tsg_log_instance_t *_instance, struct TLD_han
static int set_app_identify_info(struct TLD_handle_t *_handle, char *field_name, struct gather_app_result *result) static int set_app_identify_info(struct TLD_handle_t *_handle, char *field_name, struct gather_app_result *result)
{ {
int i=0,j=0,ret=0; int i=0,j=0,ret=0;
int add_app_flag=0;
char app_name[512]={0}; char app_name[512]={0};
Value array(kArrayType); Value array(kArrayType);
for(i=ORIGIN_USER_DEFINE; i<ORIGIN_MAX; i++) for(i=ORIGIN_USER_DEFINE; i<ORIGIN_MAX; i++)
{ {
if(result[i].app_num<=0) if(result[i].app_num<=0 || i==ORIGIN_QM_ENGINE)
{ {
continue; continue;
} }
Value object(kObjectType);
for(j=0; j<result[i].app_num; j++) for(j=0; j<result[i].app_num; j++)
{ {
Value object(kObjectType);
ret=tsg_app_id2name(result[i].attributes[j].app_id, app_name, sizeof(app_name), 0); ret=tsg_app_id2name(result[i].attributes[j].app_id, app_name, sizeof(app_name), 0);
if(ret>0) if(ret>0)
{ {
@@ -639,12 +640,16 @@ static int set_app_identify_info(struct TLD_handle_t *_handle, char *field_name,
object.AddMember("app_name", result[i].attributes[j].app_id, _handle->document->GetAllocator()); object.AddMember("app_name", result[i].attributes[j].app_id, _handle->document->GetAllocator());
} }
object.AddMember("packet_sequence",result[i].attributes[j].packet_sequence, _handle->document->GetAllocator()); object.AddMember("packet_sequence",result[i].attributes[j].packet_sequence, _handle->document->GetAllocator());
}
array.PushBack(object, _handle->document->GetAllocator()); array.PushBack(object, _handle->document->GetAllocator());
add_app_flag=1;
}
} }
if(add_app_flag==1)
{
TLD_append(_handle, field_name, &array, TLD_TYPE_OBJECT); TLD_append(_handle, field_name, &array, TLD_TYPE_OBJECT);
}
return 1; return 1;
} }