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

修复命中mail白名单时，schema_type未填充的BUG

Browse Source
This commit is contained in:
liuxueli
2020-11-04 16:48:32 +06:00
parent d27a19790a
commit 2487e1214b
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/tsg_entry.cpp
View File

@@ -229,6 +229,15 @@ static char *schema_index2string(tsg_protocol_t proto)
case PROTO_SSH: case PROTO_SSH:
schema_field_value=(char *)"SSH"; schema_field_value=(char *)"SSH";
break; break;
case PROTO_IMAP:
schema_field_value=(char *)"MAIL";
break;
case PROTO_POP3:
schema_field_value=(char *)"MAIL";
break;
case PROTO_SMTP:
schema_field_value=(char *)"MAIL";
break;
default: default:
break; break;
} }
@@ -655,7 +664,7 @@ static int identify_application_protocol(struct streaminfo *a_stream, struct _id
if(g_tsg_para.proto_flag&(1<<PROTO_QUIC)) //quic if(g_tsg_para.proto_flag&(1<<PROTO_QUIC)) //quic
{ {
ret=quic_protocol_identify(a_stream, a_packet, identify_info->domain, sizeof(identify_info->domain)); ret=quic_protocol_identify(a_stream, a_packet, identify_info->domain, sizeof(identify_info->domain));
if(ret>0) if(ret>=0)
{ {
identify_info->proto=PROTO_QUIC; identify_info->proto=PROTO_QUIC;
identify_info->domain_len=ret; identify_info->domain_len=ret;
@@ -981,7 +990,7 @@ extern "C" char TSG_MASTER_UDP_ENTRY(struct streaminfo *a_udp, void **pme, int t
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1); FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_HIT_ADDR], 0, FS_OP_ADD, 1);
} }
if(PROTO_QUIC==identify_info.proto) if(PROTO_QUIC==identify_info.proto && identify_info.domain_len>0)
{ {
ret=tsg_scan_shared_policy(g_tsg_maat_feather, &identify_info, result+hit_num, MAX_RESULT_NUM-hit_num, &mid, thread_seq); ret=tsg_scan_shared_policy(g_tsg_maat_feather, &identify_info, result+hit_num, MAX_RESULT_NUM-hit_num, &mid, thread_seq);
if(ret>0) if(ret>0)