Added layer4 payload length bins.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/test/results/softether.pcap.out b/test/results/softether.pcap.out
index 831ab3026..9be46887c 100644
--- a/test/results/softether.pcap.out
+++ b/test/results/softether.pcap.out
@@ -54,7 +54,7 @@
 00562{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":116,"source":"softether.pcap","alias":"nDPId-test","packets-captured":116,"packets-processed":115,"total-skipped-flows":0,"total-l4-payload-len":9429,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":6,"total-detection-updates":6,"total-updates":3,"current-active-flows":1,"total-active-flows":6,"total-idle-flows":5,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":54,"global_ts_usec":1657906301393000}
 00913{"flow_event_id":4,"flow_event_name":"update","thread_id":0,"packet_id":118,"source":"softether.pcap","alias":"nDPId-test","flow_id":6,"flow_state":"finished","flow_src_packets_processed":9,"flow_dst_packets_processed":8,"flow_first_seen":1657762868392000,"flow_src_last_pkt_time":1657906301393000,"flow_dst_last_pkt_time":1657906301648000,"flow_idle_time":200000000,"flow_src_min_l4_payload_len":1,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":480,"flow_dst_max_l4_payload_len":328,"flow_src_tot_l4_payload_len":488,"flow_dst_tot_l4_payload_len":524,"midstream":0,"thread_ts_usec":1657906301648000,"l3_proto":"ip4","src_ip":"192.168.2.100","dst_ip":"130.158.6.113","src_port":51381,"dst_port":5004,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"Softether","proto_id":"290","encrypted":1,"breed":"Acceptable","category_id":2,"category":"VPN"}}
 00563{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":131,"source":"softether.pcap","alias":"nDPId-test","packets-captured":131,"packets-processed":130,"total-skipped-flows":0,"total-l4-payload-len":10412,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":6,"total-detection-updates":6,"total-updates":4,"current-active-flows":1,"total-active-flows":6,"total-idle-flows":5,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":56,"global_ts_usec":1657907318692000}
-01387{"flow_event_id":5,"flow_event_name":"analyse","thread_id":0,"packet_id":132,"source":"softether.pcap","alias":"nDPId-test","flow_id":6,"flow_state":"finished","flow_src_packets_processed":17,"flow_dst_packets_processed":15,"flow_first_seen":1657762868392000,"flow_src_last_pkt_time":1657907318692000,"flow_dst_last_pkt_time":1657907318946000,"flow_idle_time":200000000,"flow_src_min_l4_payload_len":1,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":480,"flow_dst_max_l4_payload_len":328,"flow_src_tot_l4_payload_len":975,"flow_dst_tot_l4_payload_len":1020,"midstream":0,"thread_ts_usec":1657907318946000,"l3_proto":"ip4","src_ip":"192.168.2.100","dst_ip":"130.158.6.113","src_port":51381,"dst_port":5004,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"data_analysis": {"iat": {"flow_min":257000,"flow_avg":36711136.0,"flow_max":1566080232,"flow_stddev":451865472.0,"c_to_s_min":5427000,"c_to_s_avg":169773696.0,"c_to_s_max":1540291232,"c_to_s_stddev":407981152.0,"s_to_c_min":257000,"s_to_c_avg":181108896.0,"s_to_c_max":1566080232,"s_to_c_stddev":428569632.0},"pktlen": {"c_to_s_min":43,"c_to_s_avg":99.4,"c_to_s_max":522,"c_to_s_stddev":154.3,"s_to_c_min":70,"s_to_c_avg":110.0,"s_to_c_max":370,"s_to_c_stddev":102.0}},"ndpi": {"confidence": {"6":"DPI"},"proto":"Softether","proto_id":"290","encrypted":1,"breed":"Acceptable","category_id":2,"category":"VPN"}}
+01615{"flow_event_id":5,"flow_event_name":"analyse","thread_id":0,"packet_id":132,"source":"softether.pcap","alias":"nDPId-test","flow_id":6,"flow_state":"finished","flow_src_packets_processed":17,"flow_dst_packets_processed":15,"flow_first_seen":1657762868392000,"flow_src_last_pkt_time":1657907318692000,"flow_dst_last_pkt_time":1657907318946000,"flow_idle_time":200000000,"flow_src_min_l4_payload_len":1,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":480,"flow_dst_max_l4_payload_len":328,"flow_src_tot_l4_payload_len":975,"flow_dst_tot_l4_payload_len":1020,"midstream":0,"thread_ts_usec":1657907318946000,"l3_proto":"ip4","src_ip":"192.168.2.100","dst_ip":"130.158.6.113","src_port":51381,"dst_port":5004,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"data_analysis": {"iat": {"flow_min":257000,"flow_avg":36711136.0,"flow_max":1566080232,"flow_stddev":451865472.0,"c_to_s_min":5427000,"c_to_s_avg":169773696.0,"c_to_s_max":1540291232,"c_to_s_stddev":407981152.0,"s_to_c_min":257000,"s_to_c_avg":181108896.0,"s_to_c_max":1566080232,"s_to_c_stddev":428569632.0},"pktlen": {"c_to_s_min":43,"c_to_s_avg":99.4,"c_to_s_max":522,"c_to_s_stddev":154.3,"s_to_c_min":70,"s_to_c_avg":110.0,"s_to_c_max":370,"s_to_c_stddev":102.0},"bins": {"c_to_s": [15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"s_to_c": [13,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]}},"ndpi": {"confidence": {"6":"DPI"},"proto":"Softether","proto_id":"290","encrypted":1,"breed":"Acceptable","category_id":2,"category":"VPN"}}
 00916{"flow_event_id":4,"flow_event_name":"update","thread_id":0,"packet_id":133,"source":"softether.pcap","alias":"nDPId-test","flow_id":6,"flow_state":"finished","flow_src_packets_processed":17,"flow_dst_packets_processed":15,"flow_first_seen":1657762868392000,"flow_src_last_pkt_time":1657907318692000,"flow_dst_last_pkt_time":1657907318946000,"flow_idle_time":200000000,"flow_src_min_l4_payload_len":1,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":480,"flow_dst_max_l4_payload_len":328,"flow_src_tot_l4_payload_len":975,"flow_dst_tot_l4_payload_len":1020,"midstream":0,"thread_ts_usec":1657907318946000,"l3_proto":"ip4","src_ip":"192.168.2.100","dst_ip":"130.158.6.113","src_port":51381,"dst_port":5004,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"Softether","proto_id":"290","encrypted":1,"breed":"Acceptable","category_id":2,"category":"VPN"}}
 00563{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":146,"source":"softether.pcap","alias":"nDPId-test","packets-captured":146,"packets-processed":145,"total-skipped-flows":0,"total-l4-payload-len":11395,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":6,"total-detection-updates":6,"total-updates":5,"current-active-flows":1,"total-active-flows":6,"total-idle-flows":5,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":59,"global_ts_usec":1657959489569000}
 00917{"flow_event_id":4,"flow_event_name":"update","thread_id":0,"packet_id":148,"source":"softether.pcap","alias":"nDPId-test","flow_id":6,"flow_state":"finished","flow_src_packets_processed":25,"flow_dst_packets_processed":22,"flow_first_seen":1657762868392000,"flow_src_last_pkt_time":1657959489569000,"flow_dst_last_pkt_time":1657959489824000,"flow_idle_time":200000000,"flow_src_min_l4_payload_len":1,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":480,"flow_dst_max_l4_payload_len":328,"flow_src_tot_l4_payload_len":1462,"flow_dst_tot_l4_payload_len":1516,"midstream":0,"thread_ts_usec":1657959489824000,"l3_proto":"ip4","src_ip":"192.168.2.100","dst_ip":"130.158.6.113","src_port":51381,"dst_port":5004,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"Softether","proto_id":"290","encrypted":1,"breed":"Acceptable","category_id":2,"category":"VPN"}}
@@ -71,10 +71,10 @@
 ~~ total active/idle flows...: 6/6
 ~~ total timeout flows.......: 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~ total memory allocated....: 6051182 bytes
-~~ total memory freed........: 6051182 bytes
-~~ total allocations/frees...: 121720/121720
+~~ total memory allocated....: 6051950 bytes
+~~ total memory freed........: 6051950 bytes
+~~ total allocations/frees...: 121732/121732
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~ json string min len.......: 480 chars
-~~ json string max len.......: 1392 chars
-~~ json string avg len.......: 935 chars
+~~ json string max len.......: 1620 chars
+~~ json string avg len.......: 1049 chars