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/kismet.pcap.out b/test/results/kismet.pcap.out
index ee0d0b149..c00f54f63 100644
--- a/test/results/kismet.pcap.out
+++ b/test/results/kismet.pcap.out
@@ -5,7 +5,7 @@
 00525{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_src_last_pkt_time":1144004385285325,"flow_dst_last_pkt_time":1144004385285353,"flow_idle_time":3285032704,"pkt_oversize":false,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"thread_ts_usec":1144004385285353,"pkt":"AAAAAAAAAAAAAAAACABFAAA0AABAAIAG\/MF\/AAABfwAAAQnFhRGzPp6Js2uR14ASf\/+QygAAAgRADAEBBAIBAwMC"}
 00507{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_src_last_pkt_time":1144004385285367,"flow_dst_last_pkt_time":1144004385285353,"flow_idle_time":3285032704,"pkt_oversize":false,"pkt_caplen":54,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":54,"pkt_l4_len":20,"thread_ts_usec":1144004385285367,"pkt":"AAAAAAAAAAAAAAAACABFAAAoPIdAAIAGwEZ\/AAABfwAAAYURCcWza5HXsz6eilAQIABr7wAA"}
 00858{"flow_event_id":7,"flow_event_name":"detected","thread_id":0,"packet_id":4,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_src_packets_processed":2,"flow_dst_packets_processed":2,"flow_first_seen":1144004385285325,"flow_src_last_pkt_time":1144004385285367,"flow_dst_last_pkt_time":1144004385285561,"flow_idle_time":3285032704,"flow_src_min_l4_payload_len":0,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":0,"flow_dst_max_l4_payload_len":199,"flow_src_tot_l4_payload_len":0,"flow_dst_tot_l4_payload_len":199,"midstream":0,"thread_ts_usec":1144004385285561,"l3_proto":"ip4","src_ip":"127.0.0.1","dst_ip":"127.0.0.1","src_port":34065,"dst_port":2501,"l4_proto":"tcp","ndpi": {"confidence": {"6":"DPI"},"proto":"Kismet","proto_id":"309","encrypted":0,"breed":"Acceptable","category_id":14,"category":"Network"}}
-01342{"flow_event_id":5,"flow_event_name":"analyse","thread_id":0,"packet_id":32,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_src_packets_processed":16,"flow_dst_packets_processed":16,"flow_first_seen":1144004385285325,"flow_src_last_pkt_time":1144004397698680,"flow_dst_last_pkt_time":1144004398798485,"flow_idle_time":3285032704,"flow_src_min_l4_payload_len":0,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":1045,"flow_dst_max_l4_payload_len":199,"flow_src_tot_l4_payload_len":1045,"flow_dst_tot_l4_payload_len":1777,"midstream":0,"thread_ts_usec":1144004398798485,"l3_proto":"ip4","src_ip":"127.0.0.1","dst_ip":"127.0.0.1","src_port":34065,"dst_port":2501,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"data_analysis": {"iat": {"flow_min":28,"flow_avg":836339.2,"flow_max":1099852,"flow_stddev":406205.2,"c_to_s_min":42,"c_to_s_avg":827557.0,"c_to_s_max":1099852,"c_to_s_stddev":410011.1,"s_to_c_min":28,"s_to_c_avg":844572.5,"s_to_c_max":1099849,"s_to_c_stddev":402430.6},"pktlen": {"c_to_s_min":54,"c_to_s_avg":120.1,"c_to_s_max":1099,"c_to_s_stddev":252.8,"s_to_c_min":54,"s_to_c_avg":165.8,"s_to_c_max":253,"s_to_c_stddev":53.7}},"ndpi": {"confidence": {"6":"DPI"},"proto":"Kismet","proto_id":"309","encrypted":0,"breed":"Acceptable","category_id":14,"category":"Network"}}
+01570{"flow_event_id":5,"flow_event_name":"analyse","thread_id":0,"packet_id":32,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_src_packets_processed":16,"flow_dst_packets_processed":16,"flow_first_seen":1144004385285325,"flow_src_last_pkt_time":1144004397698680,"flow_dst_last_pkt_time":1144004398798485,"flow_idle_time":3285032704,"flow_src_min_l4_payload_len":0,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":1045,"flow_dst_max_l4_payload_len":199,"flow_src_tot_l4_payload_len":1045,"flow_dst_tot_l4_payload_len":1777,"midstream":0,"thread_ts_usec":1144004398798485,"l3_proto":"ip4","src_ip":"127.0.0.1","dst_ip":"127.0.0.1","src_port":34065,"dst_port":2501,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"data_analysis": {"iat": {"flow_min":28,"flow_avg":836339.2,"flow_max":1099852,"flow_stddev":406205.2,"c_to_s_min":42,"c_to_s_avg":827557.0,"c_to_s_max":1099852,"c_to_s_stddev":410011.1,"s_to_c_min":28,"s_to_c_avg":844572.5,"s_to_c_max":1099849,"s_to_c_stddev":402430.6},"pktlen": {"c_to_s_min":54,"c_to_s_avg":120.1,"c_to_s_max":1099,"c_to_s_stddev":252.8,"s_to_c_min":54,"s_to_c_avg":165.8,"s_to_c_max":253,"s_to_c_stddev":53.7},"bins": {"c_to_s": [15,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,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"s_to_c": [3,0,1,0,11,0,1,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,0,0,0,0]}},"ndpi": {"confidence": {"6":"DPI"},"proto":"Kismet","proto_id":"309","encrypted":0,"breed":"Acceptable","category_id":14,"category":"Network"}}
 00907{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":35,"source":"kismet.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_src_packets_processed":18,"flow_dst_packets_processed":17,"flow_first_seen":1144004385285325,"flow_src_last_pkt_time":1144004399898338,"flow_dst_last_pkt_time":1144004399898316,"flow_idle_time":3285032704,"flow_src_min_l4_payload_len":0,"flow_dst_min_l4_payload_len":0,"flow_src_max_l4_payload_len":1045,"flow_dst_max_l4_payload_len":199,"flow_src_tot_l4_payload_len":1045,"flow_dst_tot_l4_payload_len":1912,"midstream":0,"thread_ts_usec":1144004399898338,"l3_proto":"ip4","src_ip":"127.0.0.1","dst_ip":"127.0.0.1","src_port":34065,"dst_port":2501,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"Kismet","proto_id":"309","encrypted":0,"breed":"Acceptable","category_id":14,"category":"Network"}}
 00558{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":35,"source":"kismet.pcap","alias":"nDPId-test","packets-captured":35,"packets-processed":35,"total-skipped-flows":0,"total-l4-payload-len":2957,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":1,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":1,"total-idle-flows":1,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":10,"global_ts_usec":1144004399898338}
 ~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
@@ -16,10 +16,10 @@
 ~~ total active/idle flows...: 1/1
 ~~ total timeout flows.......: 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~ total memory allocated....: 6039044 bytes
-~~ total memory freed........: 6039044 bytes
-~~ total allocations/frees...: 121523/121523
+~~ total memory allocated....: 6039172 bytes
+~~ total memory freed........: 6039172 bytes
+~~ total allocations/frees...: 121525/121525
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~ json string min len.......: 477 chars
-~~ json string max len.......: 1347 chars
-~~ json string avg len.......: 877 chars
+~~ json string max len.......: 1575 chars
+~~ json string avg len.......: 977 chars