Reworked layer 4 flow length naming/calculation.

 * nDPIsrvd services usually do not care about layer4 data length,
   payload length is quite more essential for further processing

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

1 files changed, 4 insertions, 4 deletions

diff --git a/test/results/mpeg.pcap.out b/test/results/mpeg.pcap.out
index ad75726d0..aa0706adf 100644
--- a/test/results/mpeg.pcap.out
+++ b/test/results/mpeg.pcap.out
@@ -1,13 +1,13 @@
 00472{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"mpeg.pcap","alias":"nDPId-test","max-flows-per-thread":2048,"max-idle-flows-per-thread":256,"tick-resolution":1000,"reader-thread-count":1,"idle-scan-period":10000,"generic-max-idle-time":600000,"icmp-max-idle-time":30000,"udp-max-idle-time":180000,"tcp-max-idle-time":7440000,"tcp-max-post-end-flow-time":120000,"max-packets-per-flow-to-send":15,"max-packets-per-flow-to-process":255}
-00471{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1434379491040,"flow_last_seen":0,"flow_tot_l4_data_len":44,"flow_min_l4_data_len":44,"flow_max_l4_data_len":44,"flow_avg_l4_data_len":44,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00479{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1434379491040,"flow_last_seen":0,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":0,"flow_tot_l4_payload_len":0,"flow_avg_l4_payload_len":0,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
 00437{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":40018,"pkt_caplen":78,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":78,"pkt_l4_len":44,"pkt":"yGyHABajPBXCt3IOCABFAABAOE9AAEAGJUTAqFCgLmWdd9n8AFBP68YoAAAAALAC\/\/\/OTgAAAgQFtAEDAwUBAQgKFSiGAAAAAAAEAgAA"}
 00435{"flow_id":1,"flow_packet_id":2,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":117076,"pkt_caplen":76,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":76,"pkt_l4_len":40,"pkt":"PBXCt3IOyGyHABajCABFAAA8AABAADIGa5cuZZ13wKhQoABQ2fyPIjpcT+vGKaAScSAIFwAAAgQFqAQCCAoAu5vaFSiGAAEDAwhf8g=="}
 00419{"flow_id":1,"flow_packet_id":3,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":117149,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"yGyHABajPBXCt3IOCABFAAA02wVAAEAGgpnAqFCgLmWdd9n8AFBP68YpjyI6XYAQECCXiwAAAQEIChUohk0Au5va"}
 00622{"flow_id":1,"flow_packet_id":4,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":4,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":117217,"pkt_caplen":214,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":214,"pkt_l4_len":180,"pkt":"yGyHABajPBXCt3IOCABFAADI62NAAEAGcafAqFCgLmWdd9n8AFBP68YpjyI6XYAYECBs0gAAAQEIChUohk0Au5vaR0VUIC8wLm1wMyBIVFRQLzEuMQ0KVXNlci1BZ2VudDogV2dldC8xLjE2LjMgKGRhcndpbjE0LjEuMCkNCkFjY2VwdDogKi8qDQpBY2NlcHQtRW5jb2Rpbmc6IGlkZW50aXR5DQpIb3N0OiBsdWNhLm50b3Aub3JnDQpDb25uZWN0aW9uOiBLZWVwLUFsaXZlDQoNCg=="}
-00652{"flow_event_id":5,"flow_event_name":"detected","thread_id":0,"packet_id":4,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":4,"flow_first_seen":1434379491040,"flow_last_seen":1434379491117,"flow_tot_l4_data_len":296,"flow_min_l4_data_len":32,"flow_max_l4_data_len":180,"flow_avg_l4_data_len":74,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","ndpi": {"proto":"HTTP.ntop","breed":"Safe","category":"Network"},"http": {"hostname":"luca.ntop.org","url":"luca.ntop.org\/0.mp3","code":0,"content_type":"","user_agent":"Wget\/1.16.3 (darwin14.1.0)"}}
+00663{"flow_event_id":5,"flow_event_name":"detected","thread_id":0,"packet_id":4,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":4,"flow_first_seen":1434379491040,"flow_last_seen":1434379491117,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":148,"flow_tot_l4_payload_len":148,"flow_avg_l4_payload_len":37,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","ndpi": {"proto":"HTTP.ntop","breed":"Safe","category":"Network"},"http": {"hostname":"luca.ntop.org","url":"luca.ntop.org\/0.mp3","code":0,"content_type":"","user_agent":"Wget\/1.16.3 (darwin14.1.0)"}}
 00423{"flow_id":1,"flow_packet_id":5,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":5,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":158095,"pkt_caplen":68,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":68,"pkt_l4_len":32,"pkt":"PBXCt3IOyGyHABajCABFAAA0obBAADIGye4uZZ13wKhQoABQ2fyPIjpdT+vGvYAQAHamjgAAAQEICgC7m+0VKIZNJ8A="}
 02409{"flow_id":1,"flow_packet_id":6,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":6,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":158121,"pkt_caplen":1502,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1502,"pkt_l4_len":1468,"pkt":"PBXCt3IOyGyHABajCABFAAXQobFAADIGxFEuZZ13wKhQoABQ2fyPIjpdT+vGvYAQAHbYowAAAQEICgC7m+4VKIZNSFRUUC8xLjEgMjAwIE9LDQpEYXRlOiBNb24sIDE1IEp1biAyMDE1IDE0OjQ0OjUwIEdNVA0KU2VydmVyOiBBcGFjaGUvMi40LjcgKFVidW50dSkNCkxhc3QtTW9kaWZpZWQ6IE1vbiwgMTUgSnVuIDIwMTUgMTQ6NDQ6MDkgR01UDQpFVGFnOiAiMjJlMC01MTg4ZjdkOTFkMDU4Ig0KQWNjZXB0LVJhbmdlczogYnl0ZXMNCkNvbnRlbnQtTGVuZ3RoOiA4OTI4DQpLZWVwLUFsaXZlOiB0aW1lb3V0PTUsIG1heD0xMDANCkNvbm5lY3Rpb246IEtlZXAtQWxpdmUNCkNvbnRlbnQtVHlwZTogYXVkaW8vbXBlZw0KDQr\/84jEADkEaLwBlKAA8DyLQP2F8D5TAOqk8D0AAPHB\/A6CMAOWB3Hn+B3VAH0BAe2OB4lv\/gfkGB8JQHTRABzAPC\/\/\/A4hsAdeB0GQHNQABwAOy5\/\/wOwnA9oEDzQgOeiADiAd16BwDP\/\/4BacDmMAOKaAHWAdFmB1EoHpAgeJ8B0UX\/\/\/4AcgDvvQN0XAPLgcZUBrRgDHQDanwNcPAU9gbhABqRX\/\/\/\/4DGgDYnQDioIkYGOBGpXJwUsJIIJkRHscAgF\/\/\/\/\/\/4dgNvCxUFBYBQQQCEMDbxSwoggmIAiHhthPEgQccI2xmP\/\/wxkGgA3jEH\/GlhDKhrP+6j2Iniv\/9c7zpKAVXAKBiPzcAUYDc0DZg\/EpiA4pcYAGAMAYJ6D\/84jEL0akakAJmKACdlCAE\/+Fk4YLDgwxQWgLbAM2SAzaAG8oGmDfiAAmwQAAyAIaJEwMcBAwQoCrsCiUBpCDe\/fk4QAcAAw8R+fAw4MG8QCwALPAEAgovCAkGjf8GwWHvhYWDd4yYwRC4yZYAeNAzoIDiMAN46CiAFA4EpAGvJgmE\/\/DLgnAVYYAE+BqgS8L7jKh85bHMChcA0SBiyQEkwEogmwDIBwCDgGaIgRFBqsS7\/\/jmGi1IJvZP4lARYPcHeT4ncmioUS4b\/\/\/\/6r+gyajRJE3NSLvpF04iblwkjA1GgS5EyUFpEKBlkigxf+T5wnPx5E\/ENVASG7MWhxomMiavReUCMBau0eT3Vfs1XUyuMM2UXQSNeZ4MjYCkiP\/84jEJ0X0Klyj2HgB0p4BHEUJQJKQGU9Q6zPCVgd1GToxDGQseoEAEya4z04ECLkMAXILwSUcRYx5n0bivT5fA0yyCUnls2SVAN5Yg31QefHoZwlUYRI0j\/E+BmnijyiUyGjBOgMQgIlwrRmE4YXwDqLCMgJaNEwEW\/EZFeQQtoZyEGSzCxHqG4okPonCZvXOpNELLAeUyHDJLkHsfaRcWQm6AJOKQculEa5bDtQ8n6w5rCWhJNBQpZ2FJTv1Y+cNUfxmOtKYtfOq0\/\/\/\/\/\/\/\/\/\/1\/vGdZ+MbveryM8risZv3Cc67\/hMlJJZ5WPcz+FitW9thtVc6o3XnxWeUJSAHCa9FUozINCr1OHVOCZGh6cFPBqVYYDkbwwGz1pjAWnT\/84jEIjwsHmlA09bfPKwfjK5w45kKi5ci4qxBlhUJexnJ1VFSgzNCXlvQwuDpSsqtPJXM8AuScRBQD\/QWB\/N8jQXRbOY6zLL+SslLITImijVbOcDNIb6HH6upJYiuPMqW1X6N5rJ+NA8SHB6IEegTx7Ky9MdR0bSEA6HommBoAygkO0e2nEiCDwKItJAGwJATDQOC4PIiDcIo68fTBQPZPIQ6Tx3mowYIIudSJJTp5qdljLXbF13vuP\/\/\/\/\/\/\/\/\/v4j7mvjimxXVzMOOHaqmrXDNly65ZLXzChpi6tQNKHYV2aj4mSAa6GLvWBA0y8VMGAVPOIvNHRJF\/YalyqZlmKkl2YLWOpujF7cj4TQT0VGCkEEKYyCaIYsJTScI="}
-00674{"flow_event_id":6,"flow_event_name":"detection-update","thread_id":0,"packet_id":6,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":6,"flow_first_seen":1434379491040,"flow_last_seen":1434379491158,"flow_tot_l4_data_len":1796,"flow_min_l4_data_len":32,"flow_max_l4_data_len":1468,"flow_avg_l4_data_len":299,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","ndpi": {"proto":"HTTP.ntop","breed":"Safe","category":"Media"},"http": {"hostname":"luca.ntop.org","url":"luca.ntop.org\/0.mp3","code":200,"content_type":"audio\/mpeg","user_agent":"Wget\/1.16.3 (darwin14.1.0)"}}
+00685{"flow_event_id":6,"flow_event_name":"detection-update","thread_id":0,"packet_id":6,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":6,"flow_first_seen":1434379491040,"flow_last_seen":1434379491158,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1436,"flow_tot_l4_payload_len":1584,"flow_avg_l4_payload_len":264,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","ndpi": {"proto":"HTTP.ntop","breed":"Safe","category":"Media"},"http": {"hostname":"luca.ntop.org","url":"luca.ntop.org\/0.mp3","code":200,"content_type":"audio\/mpeg","user_agent":"Wget\/1.16.3 (darwin14.1.0)"}}
 02444{"flow_id":1,"flow_packet_id":7,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":7,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":158441,"pkt_caplen":1502,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1502,"pkt_l4_len":1468,"pkt":"PBXCt3IOyGyHABajCABFAAXQobJAADIGxFAuZZ13wKhQoABQ2fyPIj\/5T+vGvYAQAHZBbwAAAQEICgC7m+4VKIZNXHvS\/\/OIxEQ94+5sANve3Qk2fneqyU2SLZGOMr1QStRuMM16MSwhY7hnuy3pA5kIUdzsQxC4pdi2jJSheFacBc1hSPisQafXSmbT3V9jtOeFEQKeIFGUSMgHioC\/nnz6TN0ofqvTiEbVTahS0pzfULw7FZGmYWVVN55rhoVbM9PGcvbE5MarX48KVueXfzvr3rb69M7i\/fxr\/\/\/\/\/\/\/\/\/\/\/\/4\/znOcf096Zx83s8rTF\/fMePPFjwN+JmeBPRRtMKihwhuqsqpHgELc1uwuO2rzS8LNB4NHKzpLZRpdh968oiq2l0iSxMqoo1O3SKCM\/Os74l0sV87KXc42ZhIQjGxrPU8oS5N4nCEoQkDuMI7VAcqFVbVIjYaoipVsWC6pQhZbYR\/\/OIxF88lBpwANPe3f600tKrTKTfOTSq0ulENfuDC3IA5T2Ux3qk6T7ZtrEd4fLMiDJYCxQWOOaSdXQ62dC3M\/mpIneoHKEkSxLlJsdFIt0X8Gkv6blGjzrotl7RqhZX0SeaGtJ6ZUR4759aLbdtZvrOsY\/\/\/\/\/\/\/\/\/\/\/\/\/x6\/ec4x\/nHtDz4kmYfznUHUlGOubw75vaDXVPre94g\/qNqaqWQm7L0JIuqlAJF4HVIYOGu3EoU7y26F\/mYvvADsNxzIa1kOXcyhJ2pUqnHEVxXx4ByIrRzJGMd0E60ah7KaaKXleomM6VawqtYNJdrSE1ZITa3oa4IcPtjsbxc2+HpFmYX8x10qzZUS4VDIS97vD89k\/He8\/W9jjxXFW4TzxD\/\/OIxH88xB50ANve3ZGF+TCAgoYYa5O6GrUMY508hKEOjsSo9Bpoo7zSWlawbJupHFeUKnOVKMqucVK3FQ\/hsKna37Np67qzM6pb7Zxi+Nwa5vj0\/\/\/\/\/\/\/\/\/\/\/\/9P771b++tfzQrwcZt603Ht9uEW9YOKRr21jcP6tmDH1SJJAkhyZlTCV5HDZnurFB1NSG0CwYqM4SM0eSgUCWiAl7vuk6i4i+k\/CrJ2dLmhJUo8gh0qRVIOYyzGIMr2shA6FIdqEoYgDlUS20ukgsHcyJFw0XyzAc5xp5YLuyqRVPmwu7VGOQvl3MQkDYImQQlYt4nYha8HOS8xEIssOaCUyvVrGpEISaFMcVExzja1IZZfUjCSKFoYdS6YR2j1aNJ4wq\/\/OIxJ8+vAZ0ANPe3QfITMnG9V0YlUs7TxfXjC8Z5nDFUaW5WBhJ84YypUtZ3DThHs14pCia3Be19filt5\/1\/\/\/\/\/\/\/\/\/\/8f\/Ocb+\/i28+WuKb+bbrm0a2n0NQwYtv8fP8lpvB9RwSZPFjlMW1ymCBCaqZpEflPOW8YkAjCcMMjn0OBTCXsBALM84JPJhZTIYu7qSwCLisekD+sJk1HKoW6MhcZ+JVNzsGvs2KBJ6vy3TLztbyiEmkrh2JT8Ino20OvK4Gizls5XXHb0ConMrZ1J3aelFULQFWKUKSsHqKkkREsApRsqNeGyDxvAINEcTffxy+DTL2BsDlOQuRzCGp1DlRk7HNF5MRkbsHJGTlIMiijMU0V64MNrsl3NPvoi\/\/OIxLc7k554AuZev6IMRxUVYuWzU8kn+Hv\/rjf3\/jH\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/3rO\/r\/\/NN\/WJ6Ukkds0WYwQ6xllnNXZkVTEEVJnN00+OBYwvNE8mx3HuGgaYzKgnZgwHNJryZMkRkWDZ6VUsQlYBIlEptx+OMoYtNvPdjNZlU7Zwrx9pDrz\/fl82zFnViXyV545fl9+cfuNww82c5K5NNtaq6dKgkFVnFG9Mdq0zGYtIHqf9x0uwbUk7DzyvIkqqmEGiPiGCbCIB7ANEGXx2Ea40AQAKsVoLeaikhlxTRApTMCIG6JHE4dKhOkYOeO81MScK45bjKFAgJTOkwOa5iiYmoxhdJ1IuF5AppMU1ux1b0aLWVb\/\/\/\/\/0="}
 00419{"flow_id":1,"flow_packet_id":8,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":8,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":158466,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"yGyHABajPBXCt3IOCABFAAA0lnBAAEAGxy7AqFCgLmWdd9n8AFBP68a9jyJFlYAQD9OL0AAAAQEIChUohnUAu5vu"}
 02404{"flow_id":1,"flow_packet_id":9,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":9,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":159288,"pkt_caplen":1502,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1502,"pkt_l4_len":1468,"pkt":"PBXCt3IOyGyHABajCABFAAXQobNAADIGxE8uZZ13wKhQoABQ2fyPIkWVT+vGvYAQAHaj4AAAAQEICgC7m+4VKIZNT9ejTqSUmv\/ziMTZOxvyeALmYt+ZS02SrQ2eozUggk6Rm6mdTXgLamdsPlS7GmjIWJMqJDRW9w4MJgeYGVp4kzAgGo2I25GCCAbIQiyVbobeQqATPywcZgao8DMUjw5UvKWOQtNl5hRKgtJtwHNdtTahWI1hhSxhQIzrCXOI0BTlLlRWCdO8lq1hSVd520ZQwxMJWhdbrmEDGEEAYawGHXZYo\/ZhAjKmLOo2ZQA0gI1yUzBsBBUFLAACE1QzI4HCo6LhC\/ICnAbaAeIsAjojQxuDQAtOCwoUuING0O8ZJhmxSJQFyEqT47SkQ01E+l8aZAy8RYig3S4dEJDMnRelMvmRJi+J4UGJxE6oJzMixodLhfYixikTRiXEicSTOlVJq6DtS\/\/\/\/\/\/ziMT\/SVw+aADmpNzvU+u1aC0tNRsipUyoH0TqDJInjFEqTa6lIompsk5ubqMkkGcmS9UVyUShwmKmIzuctSA8P4Eli9zBACMwPIzCAE6YDSkAoLMwQI0USV2RyXIzmfgodKF12CPiYEaVBDNpXKYSgkHgCooZvN3QFqxo4yiVw4z1sRfVy3AWDMYSMsCIAKhLLAqFMaRMmFBgRpLyusmmXTBQhAdI3xWDGQoUOBwdLlnjOnAHQZYDmGDoUu\/NJpp3F2lbnMbdrMNNjRVbg15mUSBNBFByXh\/BEGwwCIfS4EoRDg1iITQBR2kAP4HyIBoQxsNg3MUx5LB7Ho8ZkAQqBakfw8DQIg\/nFR2k0hVjrzBR47zcjOXOtpqi1pXNNf\/ziMTsRDv+cALmlt3z8\/8f\/\/\/\/\/\/\/\/31\/+xvy6Fbb8y5VjN98ctbT2LwfrdxdSS4LIFMRCxkwkxDTxYjhgJeFx0pDAYoNiDdsVK0wt2Y5U5uQ\/jQobdbqCMzfNBpK2MMoEI007cDMUwW7QCkoFAJgA8Zch+3SGScepXLlJhyppQZhAqyXnJARlJBujphgKvGZRpsxngsvZK8iiyRCSrTUOL8sxl4GEFsUtVQy1WdCBE5MJX1d1Y87btt8zFqa3JJI5fBMqkMFS+AZQIIsD0A6PjpFAfhGNATASDcQz4IpCkQdID8dgYhEPghAuB4+wXE0Wj0cHokEUfBqOEkgh6NyY4fw\/kIf3FbQ1WeXmhSVptY9Jz2qOrl6E3tf93\/\/\/\/\/\/ziMTuQ1QObALmlt3\/\/\/\/xHzP0+K4c9rocy+mVMcms7vVYgzZb\/UiQtqJJKl7OE6zESzR2F+DvNWBm7dyqJGOfIY8q1vssKZvXmz7g8iM+XqYaPmYwZtJQtNw1TmCGBoQ2WmZazC6Fw0wsgEg5tGwITwuImOkAYFLndxBOFCsChwsDtyGQ0yMvA1GZkMrIXUFwBRUoD0hbTlK3oExYKaczhBcCgaTZZ1dMYtqEmDgrusPY22Fz44uV+W1gKMP5CnFkr6WYOfeVRRjbvrvaeqTqZEEuVEITBJamyKVRhxykP4ix\/mi\/PVCWoWJDG5UmETxzcsIe\/JcS6ApFwn2FCVlnazmXsTK3cdduUZTzwrQJ+9pHZtViR6QMyZvr1zr6xv\/ziMTzR3w2aADe3t3\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/+t0+Le1c73j3r\/u8P2i+99a1753rOcf2iT\/GrScvHLIk1uNlQHOR3h5DL\/v6+5iB0eCSSd\/5YBCQ4JvMiEUm08CEDM9qTh0YiEn3zMORDgzQFCzTlSEAGYyLhwqxyGqohAwoFBAdqEo7lAuYsGoVTLKDABgxgfGghH1oqS4AFzGw4uk\/SchexS19VAYfclYNpkudtciPjB2BJFLiVOvZJFQaanWtKwSXrbrHduOU8erxeilVmAYrG46Sy8CBgA6QJDjcRUgSy8PCo2GhAmggB7GsuDAEwqeRh2NHWUHjQtOnR0EUdxWHgwRskExQ8VvLTh1U6arHFbOObqI="}
@@ -17,5 +17,5 @@
 00422{"flow_id":1,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":13,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":160493,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"yGyHABajPBXCt3IOCABFAAA0OtBAAEAGIs\/AqFCgLmWdd9n8AFBP68a9jyJWaYAQD9N6+gAAAQEIChUohncAu5vu"}
 02410{"flow_id":1,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":14,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":161455,"pkt_caplen":1502,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1502,"pkt_l4_len":1468,"pkt":"PBXCt3IOyGyHABajCABFAAXQobZAADIGxEwuZZ13wKhQoABQ2fyPIlZpT+vGvYAQAHYVzwAAAQEICgC7m+4VKIZNLxLPeV6nXf99nXeO25UCRqFtev\/ziMRJO5QiBADGFt1lt4y3ehfS44MRlUZk0\/QSGda240tmYffh2bdBF\/+QOm3WNxqGqtFF7kXpF3w5JJLasR8f6G46XDvNgTw\/jrNCWHgdLiQKRuBMPQJpeViHlZLHaQRubj4OAR3lR5pxUgz9nAT02BoeH861yJDJqpqLnDZdsov6SiunTETxNqV1\/f03ubiL4\/ZO5vNO2Oe58\/NT9sbstsTsiYfXbava633U0yc8xUOqgmG0p0vweE5ZxMoqMKQbHRWKP88aib0q4YisEyhW161usTYmzBnkw8DwL4pHUM8SCC4KNzaDsR4+S7jrN1OoxQJdCz8WziOBVsxrRlc4KJTlsPByV8RWrLpDD+YTROcm7GcCQOuOTGDIpUNN4\/\/ziMRtPNQuAAFZeAHREFghNDAT5kYD4hryhTrgzQFe+bDjeG4ikupFGvo7W0PmpGUititkjmZKeQ5UVlgR4VmVTr8qsc8wNNLZRj0\/iN0SLPmFa3rmFDvbN5vL\/G1mtveud+n9vu28at7e9\/PJjyXz96pvW77l1nEX+2c2zfFvvP1Wv1bWq4pW1L51TOd6iZp4sOqka4awxYfMEEMKaetRlRfEDRneTGJYFAjAHNSIq+oUQ5YHmizEozPOUSVbBIOIABeiHzApAVKMQDYuZMIYYac0yIIlHpuZcNPtW5NwGB0HTCjgw4aAsNMUOCCN55S09d7dlLBCMFC4oGjRhyQVMgUKqUtcCSQMFmbFxJxPdxsquwwwYUYXpdgaKig8yP\/ziMSMYDxqQAGZ0AAAM0rGShghoOYAlO9pMTM0oBoFLtkkMRR330cRcZRkN2PMuJAAxZLdCJGgDBK4HGgSRMYQLnEzg2z8WPAqUFUjTI3Qy5+F+RuowNOusoODWJfYiRCyA3bMyZ0xRhiZjAI4SDj8CLBkA03gJ+jRgScMMAzNxAMBTxiAoQZffXXPWIfuWOf3v\/5IAXcwpaXF1LAP79XK3+HmMGEAFDxSldambDGuValHc\/nf\/\/+3rC3UsajFi5DE5LOd\/87uVV7pZD0uj8BP\/DLdG3Za0dWNMTms61Wo6j6uq4bkM\/aQriRX2cpzMnZ5L\/z\/\/\/\/bgwOCP\/\/\/28W9T0UP9CxommOwv4kA9atYSULbikxC4oaI\/RymILguS\/\/ziMQeQzRCbAGPeACiwRsgAFVmDTRpPxbQgAZR2jNPUcZvjhEBAbGkvyomMonApBfSatJASCi4C9Yj+QxwEKQCbMQ\/wgbgb6HhoF7YiYo8TwLUUaLHwc6CPOQgxiFMdZnjwTT0RVVLgmqhbRlF6JnBLsc5JImUoPSfp1HDYti5N8kRdFoXc1z1Oct68YaoK5BOCgfFzLycNFs1ilJmXEykWtPAXxzxj+TekmuDLgt8ZHLpRU3PWlf\/+XCq7gKWLSbWfv\/q+NBdtjZv5\/\/\/\/+Pu\/zLWDFr8Xh6ff7\/rf0nplvs+jTRIO\/\/j69neL7h3+WbO9VtL\/\/\/PU7lgfQCIwLqQcmaKFuPwqj\/IQS4\/pAj4uhfEKb0ePERgQNVJeEcyFP\/ziMQkQVRqaAOPeABmJZS3OFOk3JopmdDW1SGaQVJCBMCWThiAe1CklbCjOIBWAXk7VBhFxoAwGWFYWFhUJhE9SqeEjDjDeIEBoF6GoPspCaCKJEfhC24fQapihl9UxQnOiyTn4ZygIMOAhBzixnsxEOD9HmepBkE+hp2DAjVJSQYlxNl0p47AbIaa6QoeLU1pcyUuhh9nMV6PbbdEi2ktq3OUKNms6uY8rqLErr1\/\/UMVWxdfNcbx\/\/WvzX\/OM6\/\/\/x8b\/3eese00eST2\/z6+2\/6Z9rRVbuL\/86x\/86xn\/P3a38uP\/\/559f\/\/5e1VdFUrLY4uZlzRQIUzHSubqqV1Zp\/pWnKXhf8="}
 01235{"flow_id":1,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":15,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":161458,"pkt_caplen":665,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":665,"pkt_l4_len":631,"pkt":"PBXCt3IOyGyHABajCABFAAKLobdAADIGx5AuZZ13wKhQoABQ2fyPIlwFT+vGvYAYAHY9pgAAAQEICgC7m+4VKIZNQSlxWCwU16Cy6pgGmFF2UpCoOqaxROb\/84jEMUn8QdgB2MAAQDNNj0WmX9nE0jCg1oW6XOMYC+UXazArSkxoOZUxKXtZdVuwJAYxJ0vUkMkUsZxr8pf2Xd1TWplcpd0tq2zSVivzEnelaPJeGH0EqKMOJfJ1MbMTThFAckaYAloVczkNQ9Gn1ZyzmHajtNaXcy6DEvkinWgFdrLaR2n9jMMv7LaBgSEpAM4rpKBKDMSi0RYasWHpl2Xdh2zWhp\/rM1Gpda3SxmM5VaWl5qtTWsdZVsu1YzGbVWlpbP1qamx1lll3dWly\/eOOP5ZY\/\/\/rLLL8ssvx5+X\/+OP5U1NytTZfjz9Y\/rLLLcpjNrdLS2cf\/94444\/WppVS4kxBTUUzLjgyqqqqqqqqqqqqqqqqqqqqqqqqqqr\/84jEAAAAA0gAAAAATEFNRTMuODKqqqqqqqqqqqqqqqpMQU1FMy44Mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo="}
-00490{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":19,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":19,"flow_first_seen":1434379491040,"flow_last_seen":1434379491221,"flow_tot_l4_data_len":9991,"flow_min_l4_data_len":32,"flow_max_l4_data_len":1468,"flow_avg_l4_data_len":525,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00501{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":19,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":19,"flow_first_seen":1434379491040,"flow_last_seen":1434379491221,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1436,"flow_tot_l4_payload_len":9363,"flow_avg_l4_payload_len":492,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
 00124{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":19,"source":"mpeg.pcap","alias":"nDPId-test"}