Split `flow_packets_processed' into `flow_src_packets_processed' and `flow_dst_packets_processed'.

 * no use for `flow_avg_l4_payload_len' -> removed
 * test/run_tests.sh does not fail if git-worktree's are used

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

1 files changed, 7 insertions, 7 deletions

diff --git a/test/results/pim.pcap.out b/test/results/pim.pcap.out
index 40d6e1c37..8d2f511fe 100644
--- a/test/results/pim.pcap.out
+++ b/test/results/pim.pcap.out
@@ -1,11 +1,11 @@
 00454{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"pim.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,"global_ts_msec":0}
 00543{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","packets-captured":1,"packets-processed":0,"total-skipped-flows":0,"total-l4-payload-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":1655247781655}
-00540{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1655247781655,"flow_last_seen":1655247781655,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":54,"flow_tot_l4_payload_len":54,"flow_avg_l4_payload_len":54,"midstream":0,"thread_ts_msec":1655247781655,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"flow_datalink":1,"flow_max_packets":3}
+00546{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1655247781655,"flow_last_seen":1655247781655,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":54,"flow_tot_l4_payload_len":54,"midstream":0,"thread_ts_msec":1655247781655,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"flow_datalink":1,"flow_max_packets":3}
 00491{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1655247781655,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":88,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":88,"pkt_l4_len":54,"thread_ts_msec":1655247781655,"pkt":"AQBeAAANUC+oqN+8CABFwABKmKkAAAFns0PAqMvq4AAADSMAIEwBAMCoy+kAAgDSAQAAIOY+QvwAAQAAAQAHIAql5gIBAAAg5jwrAwABAAABAAcgCqXmAg=="}
-00601{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1655247781655,"flow_last_seen":1655247781655,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":54,"flow_tot_l4_payload_len":54,"flow_avg_l4_payload_len":54,"midstream":0,"thread_ts_msec":1655247781655,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"ndpi": {"confidence": {"6":"DPI"},"proto":"IP_PIM","breed":"Acceptable","category":"Network"}}
+00607{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1655247781655,"flow_last_seen":1655247781655,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":54,"flow_tot_l4_payload_len":54,"midstream":0,"thread_ts_msec":1655247781655,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"ndpi": {"confidence": {"6":"DPI"},"proto":"IP_PIM","breed":"Acceptable","category":"Network"}}
 00491{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1655247782655,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":88,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":88,"pkt_l4_len":54,"thread_ts_msec":1655247782655,"pkt":"AQBeAAANUC+oqN+8CABFwABKmKoAAAFns0LAqMvq4AAADSMAIFYBAMCoy+kAAgDSAQAAIOY+QvsAAQAAAQAHIAql5gIBAAAg5jwq+gABAAABAAcgCqXmAg=="}
 00491{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1655247783655,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":88,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":88,"pkt_l4_len":54,"thread_ts_msec":1655247783655,"pkt":"AQBeAAANUC+oqN+8CABFwABKmKsAAAFns0HAqMvq4AAADSMALUsBAMCoy+kAAgDSAQAAIOY+QvoAAQAAAQAHIAql5gIBAAAg5jweBgABAAABAAcgCqXmAg=="}
-00643{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":10,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":10,"flow_first_seen":1655247781655,"flow_last_seen":1655247790665,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":74,"flow_tot_l4_payload_len":580,"flow_avg_l4_payload_len":58,"midstream":0,"thread_ts_msec":1655247790665,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"IP_PIM","breed":"Acceptable","category":"Network"}}
+00649{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":10,"source":"pim.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_src_packets_processed":10,"flow_dst_packets_processed":0,"flow_first_seen":1655247781655,"flow_last_seen":1655247790665,"flow_idle_time":620000,"flow_min_l4_payload_len":54,"flow_max_l4_payload_len":74,"flow_tot_l4_payload_len":580,"midstream":0,"thread_ts_msec":1655247790665,"l3_proto":"ip4","src_ip":"192.168.203.234","dst_ip":"224.0.0.13","l4_proto":103,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"IP_PIM","breed":"Acceptable","category":"Network"}}
 00550{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":10,"source":"pim.pcap","alias":"nDPId-test","packets-captured":10,"packets-processed":10,"total-skipped-flows":0,"total-l4-payload-len":580,"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":9,"global_ts_msec":1655247790665}
 ~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
 ~~ packets captured/processed: 10/10
@@ -15,10 +15,10 @@
 ~~ total active/idle flows...: 1/1
 ~~ total timeout flows.......: 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~ total memory allocated....: 6003339 bytes
-~~ total memory freed........: 6003339 bytes
+~~ total memory allocated....: 6003347 bytes
+~~ total memory freed........: 6003347 bytes
 ~~ total allocations/frees...: 120885/120885
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~ json string min len.......: 459 chars
-~~ json string max len.......: 648 chars
-~~ json string avg len.......: 545 chars
+~~ json string max len.......: 654 chars
+~~ json string avg len.......: 548 chars