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

适配sapp根据streaminfo获取链接的全包长(负载+包头长度)

Browse Source 
将DOH改为DoH
This commit is contained in:
liuxueli
2020-11-18 10:09:58 +06:00
parent 7a5aea4437
commit 5272dbefae
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/app_l7_proto_id.conf
View File

@@ -33,7 +33,7 @@ STRING OPENVPN 131
STRING STUN 132 STRING STUN 132
STRING TEREDO 133 STRING TEREDO 133
STRING DTLS 134 STRING DTLS 134
STRING DOH 135 STRING DoH 135
STRING ISAKMP 136 STRING ISAKMP 136
STRING MDNS 137 STRING MDNS 137
STRING NETBIOS 138 STRING NETBIOS 138

16
src/tsg_statistic.cpp
View File

@@ -70,7 +70,7 @@ int tsg_set_policy_flow(struct streaminfo *a_stream, Maat_rule_t *p_result, int
traffic_info->con_num++; traffic_info->con_num++;
value=0; value=0;
MESA_get_stream_opt(a_stream, MSO_TOTAL_INBOUND_BYTE, (void *)&value, &value_len); MESA_get_stream_opt(a_stream, MSO_TOTAL_INBOUND_BYTE_RAW, (void *)&value, &value_len);
traffic_info->in_bytes+=value; traffic_info->in_bytes+=value;
value=0; value=0;
@@ -78,7 +78,7 @@ int tsg_set_policy_flow(struct streaminfo *a_stream, Maat_rule_t *p_result, int
traffic_info->in_packets+=value; traffic_info->in_packets+=value;
value=0; value=0;
MESA_get_stream_opt(a_stream, MSO_TOTAL_OUTBOUND_BYTE, (void *)&value, &value_len); MESA_get_stream_opt(a_stream, MSO_TOTAL_OUTBOUND_BYTE_RAW, (void *)&value, &value_len);
traffic_info->out_bytes+=value; traffic_info->out_bytes+=value;
value=0; value=0;
@@ -102,11 +102,13 @@ static int _get_traffic_info(struct _traffic_info *total, struct _traffic_info *
acc=&g_tsg_statis_para.default_total_info; acc=&g_tsg_statis_para.default_total_info;
acc->con_num=(out->con_num-acc->con_num)>0 ? out->con_num : acc->con_num; out->con_num=(out->con_num-acc->con_num)>0 ? out->con_num : acc->con_num;
acc->in_bytes=(out->in_bytes-acc->in_bytes)>0 ? out->in_bytes: acc->in_bytes; out->in_bytes=(out->in_bytes-acc->in_bytes)>0 ? out->in_bytes: acc->in_bytes;
acc->in_packets=(out->in_packets-acc->in_packets)>0 ? out->in_packets: acc->in_packets; out->in_packets=(out->in_packets-acc->in_packets)>0 ? out->in_packets: acc->in_packets;
acc->out_bytes=(out->out_bytes-acc->out_bytes)>0 ? out->out_bytes: acc->out_bytes; out->out_bytes=(out->out_bytes-acc->out_bytes)>0 ? out->out_bytes: acc->out_bytes;
acc->out_packets=(out->out_packets-acc->out_packets)>0 ? out->out_packets: acc->out_packets; out->out_packets=(out->out_packets-acc->out_packets)>0 ? out->out_packets: acc->out_packets;
memcpy(acc, out, sizeof(struct _traffic_info));
} }
return 0; return 0;