Small fixes.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/test/results/hsrp2_ipv6.pcapng.out b/test/results/hsrp2_ipv6.pcapng.out
index 59847417b..40f39a0e0 100644
--- a/test/results/hsrp2_ipv6.pcapng.out
+++ b/test/results/hsrp2_ipv6.pcapng.out
@@ -1,17 +1,17 @@
 00463{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"hsrp2_ipv6.pcapng","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,"global_ts_msec":0}
 00549{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","packets-captured":1,"packets-processed":0,"total-skipped-flows":0,"total-l4-data-len":0,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":0,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":0,"total-idle-flows":0,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":2,"global_ts_msec":1589369101819}
-00569{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369101819,"flow_last_seen":1589369101819,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369101819,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
-00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1589369101819,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369101819,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAIAgQAAAAB"}
-00768{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369101819,"flow_last_seen":1589369101819,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369101819,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
-00569{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369104269,"flow_last_seen":1589369104269,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369104269,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
-00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":1,"flow_last_seen":1589369104269,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369104269,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAHAgQAAAAB"}
-00768{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369104269,"flow_last_seen":1589369104269,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369104269,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
-00571{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1589369122912,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":138,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":138,"pkt_l4_len":80,"thread_ts_msec":1589369122912,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAABQEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0AUK+YASgCAAQGABCqu8wAASAAAABpAAAnEAAATiD+gAAAAAAAAAAFc\/\/+oAAQBBwBAAAAAAAAAQAAAABR0exRqzRQmrLjMYjKT+47"}
-00571{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":4,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":2,"flow_last_seen":1589369125824,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":138,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":138,"pkt_l4_len":80,"thread_ts_msec":1589369125824,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAABQEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0AUAFOASgCAAQGABCqu8wAAiAAAABkAAAnEAAATiD+gAAAAAAAAAAFc\/\/+oAAQBBwBAAAAAAAAAgAAAAA6x1WuKROwiNJvQ30Zxepz"}
-00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":5,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1589369130453,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369130453,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAIAgQAAAAB"}
-00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":6,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":3,"flow_last_seen":1589369131526,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369131526,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAHAgQAAAAB"}
-00813{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":36,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":18,"flow_first_seen":1589369104269,"flow_last_seen":1589369235852,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":72,"flow_tot_l4_payload_len":900,"flow_avg_l4_payload_len":50,"midstream":0,"thread_ts_msec":1589369240383,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
-00814{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":36,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":18,"flow_first_seen":1589369101819,"flow_last_seen":1589369240383,"flow_idle_time":180000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":72,"flow_tot_l4_payload_len":1098,"flow_avg_l4_payload_len":61,"midstream":0,"thread_ts_msec":1589369240383,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00569{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369101819,"flow_last_seen":1589369101819,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369101819,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1589369101819,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369101819,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAIAgQAAAAB"}
+00768{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369101819,"flow_last_seen":1589369101819,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369101819,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00569{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369104269,"flow_last_seen":1589369104269,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369104269,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":1,"flow_last_seen":1589369104269,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369104269,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAHAgQAAAAB"}
+00768{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":2,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1589369104269,"flow_last_seen":1589369104269,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":6,"flow_tot_l4_payload_len":6,"flow_avg_l4_payload_len":6,"midstream":0,"thread_ts_msec":1589369104269,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00571{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1589369122912,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":138,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":138,"pkt_l4_len":80,"thread_ts_msec":1589369122912,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAABQEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0AUK+YASgCAAQGABCqu8wAASAAAABpAAAnEAAATiD+gAAAAAAAAAAFc\/\/+oAAQBBwBAAAAAAAAAQAAAABR0exRqzRQmrLjMYjKT+47"}
+00571{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":4,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":2,"flow_last_seen":1589369125824,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":138,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":138,"pkt_l4_len":80,"thread_ts_msec":1589369125824,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAABQEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0AUAFOASgCAAQGABCqu8wAAiAAAABkAAAnEAAATiD+gAAAAAAAAAAFc\/\/+oAAQBBwBAAAAAAAAAgAAAAA6x1WuKROwiNJvQ30Zxepz"}
+00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":5,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1589369130453,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369130453,"pkt":"MzMAAABmqrvMAAEggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAB\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAIAgQAAAAB"}
+00479{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":6,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_packet_id":3,"flow_last_seen":1589369131526,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":72,"pkt_type":34525,"pkt_l3_offset":18,"pkt_l4_offset":58,"pkt_len":72,"pkt_l4_len":14,"thread_ts_msec":1589369131526,"pkt":"MzMAAABmqrvMAAIggQAAEIbdbgAAAAAOEf\/+gAAAAAAAAAAAAAAAAAAC\/wIAAAAAAAAAAAAAAAAAZgftB+0ADvAHAgQAAAAB"}
+00813{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":36,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":18,"flow_first_seen":1589369104269,"flow_last_seen":1589369235852,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":72,"flow_tot_l4_payload_len":900,"flow_avg_l4_payload_len":50,"midstream":0,"thread_ts_msec":1589369240383,"l3_proto":"ip6","src_ip":"fe80::2","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
+00814{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":36,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":18,"flow_first_seen":1589369101819,"flow_last_seen":1589369240383,"flow_idle_time":200000,"flow_min_l4_payload_len":6,"flow_max_l4_payload_len":72,"flow_tot_l4_payload_len":1098,"flow_avg_l4_payload_len":61,"midstream":0,"thread_ts_msec":1589369240383,"l3_proto":"ip6","src_ip":"fe80::1","dst_ip":"ff02::66","src_port":2029,"dst_port":2029,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"flow_risk": {"5": {"risk":"Known Protocol on Non Standard Port","severity":"Medium","risk_score": {"total":260,"client":230,"server":30}}},"confidence": {"4":"DPI"},"proto":"HSRP","breed":"Acceptable","category":"Network"}}
 00558{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":36,"source":"hsrp2_ipv6.pcapng","alias":"nDPId-test","packets-captured":36,"packets-processed":36,"total-skipped-flows":0,"total-l4-data-len":1998,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":2,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":2,"total-idle-flows":2,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":15,"global_ts_msec":1589369240383}
 ~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
 ~~ packets captured/processed: 36/36