diff options
| author | liuxueli <[email protected]> | 2020-11-18 10:09:58 +0600 |
|---|---|---|
| committer | liuxueli <[email protected]> | 2020-11-18 10:09:58 +0600 |
| commit | 5272dbefae2b6e35bb2105a5d414fa141e3c3552 (patch) | |
| tree | 46410d5b7725fbc5b41d721f55ad1bfa14b68e16 | |
| parent | 7a5aea443753141d659b967ae0f558633d851d86 (diff) | |
适配sapp根据streaminfo获取链接的全包长(负载+包头长度)v3.3.10
将DOH改为DoH
| -rw-r--r-- | bin/app_l7_proto_id.conf | 2 | ||||
| -rw-r--r-- | src/tsg_statistic.cpp | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/bin/app_l7_proto_id.conf b/bin/app_l7_proto_id.conf index 6be9dff..8a23b04 100644 --- a/bin/app_l7_proto_id.conf +++ b/bin/app_l7_proto_id.conf @@ -33,7 +33,7 @@ STRING OPENVPN 131 STRING STUN 132 STRING TEREDO 133 STRING DTLS 134 -STRING DOH 135 +STRING DoH 135 STRING ISAKMP 136 STRING MDNS 137 STRING NETBIOS 138 diff --git a/src/tsg_statistic.cpp b/src/tsg_statistic.cpp index 13d5d53..39ba745 100644 --- a/src/tsg_statistic.cpp +++ b/src/tsg_statistic.cpp @@ -70,7 +70,7 @@ int tsg_set_policy_flow(struct streaminfo *a_stream, Maat_rule_t *p_result, int traffic_info->con_num++; 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; 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; 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; 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->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; - acc->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; - acc->out_packets=(out->out_packets-acc->out_packets)>0 ? out->out_packets: acc->out_packets; + out->con_num=(out->con_num-acc->con_num)>0 ? out->con_num : acc->con_num; + out->in_bytes=(out->in_bytes-acc->in_bytes)>0 ? out->in_bytes: acc->in_bytes; + out->in_packets=(out->in_packets-acc->in_packets)>0 ? out->in_packets: acc->in_packets; + out->out_bytes=(out->out_bytes-acc->out_bytes)>0 ? out->out_bytes: acc->out_bytes; + 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; |