Serialize flow risk score / confidence.

 * bump libnDPI to 8b062295cc76a60e3905c054ce37bd17669464d1
 * removed ndpi_id_struct's

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

1 files changed, 33 insertions, 0 deletions

diff --git a/test/results/hsrp0.pcap.out b/test/results/hsrp0.pcap.out
new file mode 100644
index 000000000..65174716b
--- /dev/null
+++ b/test/results/hsrp0.pcap.out
@@ -0,0 +1,33 @@
+00437{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"hsrp0.pcap","alias":"nDPId-test","max-flows-per-thread":2048,"max-idle-flows-per-thread":64,"tick-resolution":1000,"reader-thread-count":1,"flow-scan-interval":10000,"generic-max-idle-time":600000,"icmp-max-idle-time":120000,"udp-max-idle-time":180000,"tcp-max-idle-time":7560000,"max-packets-per-flow-to-send":3,"max-packets-per-flow-to-process":32}
+00566{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551970888,"flow_last_seen":1126551970888,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551970888,"l3_proto":"ip4","src_ip":"10.28.168.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00456{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1126551970888,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":18,"pkt_l4_offset":38,"pkt_len":66,"pkt_l4_len":28,"ts_msec":1126551970888,"pkt":"AQBeAAACAAAMB6wKgQAACggARcAAMAAAAAABESXiChyo\/eAAAAIHwQfBABw\/0wAAEAMKWgoAY2lzY28AAAAKHKj+"}
+00625{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551970888,"flow_last_seen":1126551970888,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551970888,"l3_proto":"ip4","src_ip":"10.28.168.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00566{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":2,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971000,"l3_proto":"ip4","src_ip":"10.28.170.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00455{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":1,"flow_last_seen":1126551971000,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":18,"pkt_l4_offset":38,"pkt_len":66,"pkt_l4_len":28,"ts_msec":1126551971000,"pkt":"AQBeAAACAAAMB6wMgQAADAgARcAAMAAAAAABESPiChyq\/eAAAAIHwQfBABw50wAAEAMKWgwAY2lzY28AAAAKHKr+"}
+00625{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":2,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971000,"l3_proto":"ip4","src_ip":"10.28.170.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00566{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":3,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971000,"l3_proto":"ip4","src_ip":"10.28.171.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00455{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":1,"flow_last_seen":1126551971000,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":18,"pkt_l4_offset":38,"pkt_len":66,"pkt_l4_len":28,"ts_msec":1126551971000,"pkt":"AQBeAAACAAAMB6wNgQAADQgARcAAMAAAAAABESLiChyr\/eAAAAIHwQfBABw20wAAEAMKWg0AY2lzY28AAAAKHKv+"}
+00625{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":3,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971000,"l3_proto":"ip4","src_ip":"10.28.171.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00566{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":4,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971931,"flow_last_seen":1126551971931,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.168.252","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00456{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":4,"flow_packet_id":1,"flow_last_seen":1126551971931,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":18,"pkt_l4_offset":38,"pkt_len":66,"pkt_l4_len":28,"ts_msec":1126551971931,"pkt":"AQBeAAACABJ\/uh8CgQAACggARcAAMAAAAAABESXjChyo\/OAAAAIHwQfBABxH3gAACAMKUAoAY2lzY28AAAAKHKj+"}
+00625{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":4,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1126551971931,"flow_last_seen":1126551971931,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.168.252","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00664{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":3,"flow_state":"finished","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.171.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00664{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":1,"flow_first_seen":1126551971000,"flow_last_seen":1126551971000,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.170.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00664{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":4,"flow_state":"finished","flow_packets_processed":1,"flow_first_seen":1126551971931,"flow_last_seen":1126551971931,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.168.252","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00664{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":1,"flow_first_seen":1126551970888,"flow_last_seen":1126551970888,"flow_idle_time":180000,"flow_min_l4_payload_len":20,"flow_max_l4_payload_len":20,"flow_tot_l4_payload_len":20,"flow_avg_l4_payload_len":20,"midstream":0,"ts_msec":1126551971931,"l3_proto":"ip4","src_ip":"10.28.168.253","dst_ip":"224.0.0.2","src_port":1985,"dst_port":1985,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00153{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":4,"source":"hsrp0.pcap","alias":"nDPId-test","total-events-serialized":18}
+~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
+~~ packets captured/processed: 4/4
+~~ skipped flows.............: 0
+~~ total layer4 data length..: 80 bytes
+~~ total detected protocols..: 4
+~~ total active/idle flows...: 4/4
+~~ total timeout flows.......: 0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~ total memory allocated....: 4682514 bytes
+~~ total memory freed........: 4682514 bytes
+~~ total allocations/frees...: 101156/101156
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~ json string min len.......: 158 chars
+~~ json string max len.......: 669 chars
+~~ json string avg len.......: 483 chars