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, 10 insertions, 10 deletions

diff --git a/test/results/sctp.cap.out b/test/results/sctp.cap.out
index 706b94263..f19492ae6 100644
--- a/test/results/sctp.cap.out
+++ b/test/results/sctp.cap.out
@@ -1,15 +1,15 @@
 00454{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"sctp.cap","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":"sctp.cap","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":1088696689784}
-00539{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":104,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":104,"flow_avg_l4_payload_len":104,"midstream":0,"thread_ts_msec":1088696689784,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3}
+00544{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":104,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":104,"midstream":0,"thread_ts_msec":1088696689784,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3}
 00558{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1088696689784,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":138,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":138,"pkt_l4_len":104,"thread_ts_msec":1088696689784,"pkt":"AKCAAF5GCAADSgA1CABFAAB8FBwAADuESlQKHAYrChwGLEAAC4AAAW8KbbAYggADAFsoAkNFAACgvQAAAAdNRUdBQ08vMiA8bWctdHI+OjE2Mzg0ClJlcGx5ID0gMTc0MDkxewpDb250ZXh0ID0gMjU1ewpNb2RpZnkgPSBNVVgvMjU1Cn0KfQpn"}
-00598{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":104,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":104,"flow_avg_l4_payload_len":104,"midstream":0,"thread_ts_msec":1088696689784,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
+00603{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":104,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":104,"midstream":0,"thread_ts_msec":1088696689784,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
 00456{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1088696689784,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":62,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":62,"pkt_l4_len":28,"thread_ts_msec":1088696689784,"pkt":"CAADSgA1AKCAAF5GCABFAAAwCdlAAP+EUOIKHAYsChwGKwuAQAAhRBUjK\/ICTgMAABAoAkNFAAAgAAAAAAA="}
-00535{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":3,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":36,"flow_avg_l4_payload_len":36,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3}
+00541{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":3,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":36,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3}
 00467{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_packet_id":1,"flow_last_seen":1088696689872,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":70,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":70,"pkt_l4_len":36,"thread_ts_msec":1088696689872,"pkt":"AKCAAF5GAAGvDAaWCABFAAA4ykAAAECEj3QKHAYqChwGLAtZC1kAAA5QU8MFXwQAABgAAQAUQORLkgocBiwbZq9+AAAAAA=="}
-00594{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":3,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":36,"flow_avg_l4_payload_len":36,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
+00600{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":3,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"info","flow_src_packets_processed":1,"flow_dst_packets_processed":0,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":36,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
 00467{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_packet_id":2,"flow_last_seen":1088696689872,"flow_idle_time":620000,"pkt_oversize":false,"pkt_caplen":70,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":70,"pkt_l4_len":36,"thread_ts_msec":1088696689872,"pkt":"AAGvDAaWAKCAAF5GCABFAAA4u4FAAP+EnzIKHAYsChwGKgtZC1kNU+b+jI4HRgUAABgAAQAUQORLkgocBiwbZq9+AAAAAA=="}
-00633{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_packets_processed":2,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":72,"flow_avg_l4_payload_len":36,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
-00635{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":2,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":28,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":132,"flow_avg_l4_payload_len":66,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
+00639{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","flow_id":2,"flow_state":"finished","flow_src_packets_processed":1,"flow_dst_packets_processed":1,"flow_first_seen":1088696689872,"flow_last_seen":1088696689872,"flow_idle_time":620000,"flow_min_l4_payload_len":36,"flow_max_l4_payload_len":36,"flow_tot_l4_payload_len":72,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.42","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
+00641{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_src_packets_processed":1,"flow_dst_packets_processed":1,"flow_first_seen":1088696689784,"flow_last_seen":1088696689784,"flow_idle_time":620000,"flow_min_l4_payload_len":28,"flow_max_l4_payload_len":104,"flow_tot_l4_payload_len":132,"midstream":0,"thread_ts_msec":1088696689872,"l3_proto":"ip4","src_ip":"10.28.6.43","dst_ip":"10.28.6.44","l4_proto":132,"flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"6":"DPI"},"proto":"SCTP","breed":"Acceptable","category":"Network"}}
 00548{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":4,"source":"sctp.cap","alias":"nDPId-test","packets-captured":4,"packets-processed":4,"total-skipped-flows":0,"total-l4-payload-len":204,"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":13,"global_ts_msec":1088696689872}
 ~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
 ~~ packets captured/processed: 4/4
@@ -19,10 +19,10 @@
 ~~ total active/idle flows...: 2/2
 ~~ total timeout flows.......: 0
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-~~ total memory allocated....: 6004253 bytes
-~~ total memory freed........: 6004253 bytes
+~~ total memory allocated....: 6004269 bytes
+~~ total memory freed........: 6004269 bytes
 ~~ total allocations/frees...: 120884/120884
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ~~ json string min len.......: 459 chars
-~~ json string max len.......: 640 chars
-~~ json string avg len.......: 546 chars
+~~ json string max len.......: 646 chars
+~~ json string avg len.......: 549 chars