bump libnDPI to 7c19de49047a5731f3107ff17854e9afe839cc61

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

1 files changed, 7 insertions, 7 deletions

diff --git a/test/results/socks-http-example.pcap.out b/test/results/socks-http-example.pcap.out
index 9188607d3..8ca1c8266 100644
--- a/test/results/socks-http-example.pcap.out
+++ b/test/results/socks-http-example.pcap.out
@@ -4,18 +4,18 @@
 00494{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1386004309468,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":78,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":78,"pkt_l4_len":44,"thread_ts_msec":1386004309468,"pkt":"ABNyxPHhAB9b\/1HLCABFAABAxApAAEAGJ5MKtJy5CrSc+dEdBDiu6S7xAAAAALAC\/\/9AOQAAAgQFtAEDAwQBAQgKFh7eWwAAAAAEAgAA"}
 00488{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1386004309469,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"thread_ts_msec":1386004309469,"pkt":"AB9b\/1HLABNyxPHhCABFAAA8AABAAEAG66EKtJz5CrScuQQ40R2gPF01ruku8qASOJDLlAAAAgQFtAQCCApiX+0zFh7eWwEDAwc="}
 00476{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1386004309469,"flow_idle_time":7580000,"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_msec":1386004309469,"pkt":"ABNyxPHhAB9b\/1HLCABFAAA0BhZAAEAG5ZMKtJy5CrSc+dEdBDiu6S7yoDxdNoAQICsSxgAAAQEIChYe3ltiX+0z"}
-00647{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":6,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":6,"flow_first_seen":1386004309468,"flow_last_seen":1386004309473,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":9,"flow_tot_l4_payload_len":17,"flow_avg_l4_payload_len":2,"midstream":0,"thread_ts_msec":1386004309473,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53533,"dst_port":1080,"l4_proto":"tcp","ndpi": {"confidence": {"4":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
+00647{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":6,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":6,"flow_first_seen":1386004309468,"flow_last_seen":1386004309473,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":9,"flow_tot_l4_payload_len":17,"flow_avg_l4_payload_len":2,"midstream":0,"thread_ts_msec":1386004309473,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53533,"dst_port":1080,"l4_proto":"tcp","ndpi": {"confidence": {"6":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
 00591{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":15,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1386004312331,"flow_last_seen":1386004312331,"flow_idle_time":7580000,"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,"thread_ts_msec":1386004312331,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53534,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3}
 00495{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":15,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":1,"flow_last_seen":1386004312331,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":78,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":78,"pkt_l4_len":44,"thread_ts_msec":1386004312331,"pkt":"ABNyxPHhAB9b\/1HLCABFAABAPjdAAEAGrWYKtJy5CrSc+dEeBDi5gOhGAAAAALAC\/\/9xLQAAAgQFtAEDAwQBAQgKFh7peQAAAAAEAgAA"}
 00490{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":16,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":2,"flow_last_seen":1386004312331,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"thread_ts_msec":1386004312331,"pkt":"AB9b\/1HLABNyxPHhCABFAAA8AABAAEAG66EKtJz5CrScuQQ40R7KitgsuYDoR6ASOJBMFQAAAgQFtAQCCApiX\/hhFh7peQEDAwc="}
 00478{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":17,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":3,"flow_last_seen":1386004312331,"flow_idle_time":7580000,"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_msec":1386004312331,"pkt":"ABNyxPHhAB9b\/1HLCABFAAA0IDxAAEAGy20KtJy5CrSc+dEeBDi5gOhHyorYLYAQICuTRgAAAQEIChYe6XliX\/hh"}
-00649{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":20,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":6,"flow_first_seen":1386004312331,"flow_last_seen":1386004312379,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":25,"flow_tot_l4_payload_len":33,"flow_avg_l4_payload_len":5,"midstream":0,"thread_ts_msec":1386004312379,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53534,"dst_port":1080,"l4_proto":"tcp","ndpi": {"confidence": {"4":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
+00649{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":20,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":6,"flow_first_seen":1386004312331,"flow_last_seen":1386004312379,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":25,"flow_tot_l4_payload_len":33,"flow_avg_l4_payload_len":5,"midstream":0,"thread_ts_msec":1386004312379,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53534,"dst_port":1080,"l4_proto":"tcp","ndpi": {"confidence": {"6":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
 00591{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":30,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1386004317979,"flow_last_seen":1386004317979,"flow_idle_time":7580000,"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,"thread_ts_msec":1386004317979,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53535,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3}
 00498{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":30,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":1,"flow_last_seen":1386004317979,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":78,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":78,"pkt_l4_len":44,"thread_ts_msec":1386004317979,"pkt":"ABNyxPHhAB9b\/1HLCABFAABAZFdAAEAGh0YKtJy5CrSc+dEfBDg7J\/Q2AAAAALAC\/\/\/NpwAAAgQFtAEDAwQBAQgKFh7\/ZwAAAAAEAgAA"}
 00490{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":31,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":2,"flow_last_seen":1386004317980,"flow_idle_time":7580000,"pkt_oversize":false,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"thread_ts_msec":1386004317980,"pkt":"AB9b\/1HLABNyxPHhCABFAAA8AABAAEAG66EKtJz5CrScuQQ40R8tB48eOyf0N6ASOJB5EQAAAgQFtAQCCApiYA5xFh7\/ZwEDAwc="}
 00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":32,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":3,"flow_last_seen":1386004317980,"flow_idle_time":7580000,"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_msec":1386004317980,"pkt":"ABNyxPHhAB9b\/1HLCABFAAA0jiVAAEAGXYQKtJy5CrSc+dEfBDg7J\/Q3LQePH4AQICvAQgAAAQEIChYe\/2diYA5x"}
-00694{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":14,"flow_first_seen":1386004309468,"flow_last_seen":1386004309478,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1754,"flow_avg_l4_payload_len":125,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53533,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
-00694{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":15,"flow_first_seen":1386004312331,"flow_last_seen":1386004312384,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1770,"flow_avg_l4_payload_len":118,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53534,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
+00694{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":14,"flow_first_seen":1386004309468,"flow_last_seen":1386004309478,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1754,"flow_avg_l4_payload_len":125,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53533,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
+00694{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":15,"flow_first_seen":1386004312331,"flow_last_seen":1386004312384,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1770,"flow_avg_l4_payload_len":118,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53534,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
 00665{"flow_event_id":5,"flow_event_name":"guessed","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"info","flow_packets_processed":17,"flow_first_seen":1386004317979,"flow_last_seen":1386004317989,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1763,"flow_avg_l4_payload_len":103,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53535,"dst_port":1080,"l4_proto":"tcp","ndpi": {"confidence": {"1":"Match by port"},"proto":"SOCKS","breed":"Acceptable","category":"Web"}}
 00600{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"info","flow_packets_processed":17,"flow_first_seen":1386004317979,"flow_last_seen":1386004317989,"flow_idle_time":7580000,"flow_min_l4_payload_len":0,"flow_max_l4_payload_len":1448,"flow_tot_l4_payload_len":1763,"flow_avg_l4_payload_len":103,"midstream":0,"thread_ts_msec":1386004317989,"l3_proto":"ip4","src_ip":"10.180.156.185","dst_ip":"10.180.156.249","src_port":53535,"dst_port":1080,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":3}
 00567{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":46,"source":"socks-http-example.pcap","alias":"nDPId-test","packets-captured":46,"packets-processed":46,"total-skipped-flows":0,"total-l4-payload-len":5287,"total-not-detected-flows":0,"total-guessed-flows":1,"total-detected-flows":2,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":3,"total-idle-flows":3,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":21,"global_ts_msec":1386004317989}
@@ -27,9 +27,9 @@
 ~~ total active/idle flows...: 3/3
 ~~ total timeout flows.......: 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~ total memory allocated....: 5879041 bytes
-~~ total memory freed........: 5879041 bytes
-~~ total allocations/frees...: 118171/118171
+~~ total memory allocated....: 6012675 bytes
+~~ total memory freed........: 6012675 bytes
+~~ total allocations/frees...: 120933/120933
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~ json string min len.......: 474 chars
 ~~ json string max len.......: 699 chars