nDPId-test: mimic full nDPId lifecycle

 * generate DAEMON_EVENT_INIT as well as DAEMON_EVENT_SHUTDOWN
 * process remaining flows before shutdown (and generate events)

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

1 files changed, 6 insertions, 0 deletions

diff --git a/test/results/simple-dnscrypt.pcap.out b/test/results/simple-dnscrypt.pcap.out
index dbb6c4158..6f570ab63 100644
--- a/test/results/simple-dnscrypt.pcap.out
+++ b/test/results/simple-dnscrypt.pcap.out
@@ -1,3 +1,4 @@
+00392{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","max-flows-per-thread":2048,"max-idle-flows-per-thread":256,"tick-resolution":1000,"reader-thread-count":1,"idle-scan-period":10000,"max-idle-time":600000,"tcp-max-post-end-flow-time":60000,"max-packets-per-flow-to-send":15,"max-packets-per-flow-to-process":255}
 00482{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1491813284555,"flow_last_seen":0,"flow_tot_l4_data_len":32,"flow_min_l4_data_len":32,"flow_max_l4_data_len":32,"flow_avg_l4_data_len":32,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.43.167","dst_ip":"134.119.26.24","src_port":50233,"dst_port":443,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
 00431{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1491813284,"pkt_ts_usec":555591,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"uFpz9d6dpDTZFrEGCABFAAA0PRVAAIAGMNDAqCunhncaGMQ5Abvf\/XrjAAAAAIACIAChWwAAAgQFtAEDAwgBAQQC"}
 00432{"flow_id":1,"flow_packet_id":2,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1491813284,"pkt_ts_usec":666208,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"pDTZFrEGuFpz9d6dCABFAAA0AABAADMGuuWGdxoYwKgrpwG7xDnBW87r3\/165IASchC\/iQAAAgQFHgEBBAIBAwMH"}
@@ -74,3 +75,8 @@
 00833{"flow_id":3,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":88,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1491813286,"pkt_ts_usec":612927,"pkt_caplen":360,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":360,"pkt_l4_len":326,"pkt":"pDTZFrEGuFpz9d6dCABFAAFaPCdAADMGfZiGdxoYwKgrpwG7xFKVdMKUXuwPVlAYAO24IwAAOniMGP4VfxmqNYQkfmYsWzbtFzPT8SzMmHLpB8VEC49Krcr1+mK5gWMneNpnV9dODfdehLZnP0A\/O2j3PCFXZww0C2p7j2lBW5KK\/nFKj0DgymGHVQn2sGgTGQbXWLq7kpacgXw8M39PxN7RT2S8WR98pWYHn6moqRPQIUN71ryQq2I3sVu3GSK+WnX6dN+gVflqI+wV93ySPTZNsauRM\/ypKN7HSpQlBFHVKNMAggEU3sXbo\/\/YnRHEE0y13nL0P5k6I9ow\/Isps7udr+o640FCadudaRKKLP7C888mtsiggJjlQ8I3kTpna8W+eEWAtsai9jHCC0AwVsAYwxrsXIn4elp8rDeNYgHNpBqZu2j1wa+9s3OgRLcQiqmrn4PiMSsVVK0GYu0nFgMDAAQOAAAA"}
 00416{"flow_id":3,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":89,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1491813286,"pkt_ts_usec":613108,"pkt_caplen":54,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":54,"pkt_l4_len":20,"pkt":"uFpz9d6dpDTZFrEGCABFAAAoPUBAAIAGMLHAqCunhncaGMRSAbte7A9WlXTDxlAQAECVKgAA"}
 00589{"flow_id":3,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":90,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1491813286,"pkt_ts_usec":617377,"pkt_caplen":180,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":180,"pkt_l4_len":146,"pkt":"uFpz9d6dpDTZFrEGCABFAACmPUFAAIAGMDLAqCunhncaGMRSAbte7A9WlXTDxlAYAEBXewAAFgMDAEYQAABCQQS3Xp2AlfFC22Y2YogKVYDmOcIMxJboN\/X7MTLKc+s0a\/3KPHASyDk0CPcYXgtszMN5ekLUAAOsBJqGyUfM8brVFAMDAAEBFgMDACgAAAAAAAAAAGSqZuE6blT7eearrYamBpAP9Uxx8q45CrWFtb1OeTqe"}
+00504{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":111,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":39,"flow_first_seen":1491813284555,"flow_last_seen":1491813285262,"flow_tot_l4_data_len":15042,"flow_min_l4_data_len":20,"flow_max_l4_data_len":1330,"flow_avg_l4_data_len":385,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.43.167","dst_ip":"134.119.26.24","src_port":50233,"dst_port":443,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00503{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":111,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":18,"flow_first_seen":1491813286275,"flow_last_seen":1491813286718,"flow_tot_l4_data_len":7903,"flow_min_l4_data_len":20,"flow_max_l4_data_len":1330,"flow_avg_l4_data_len":439,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.43.167","dst_ip":"134.119.26.24","src_port":50253,"dst_port":443,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00503{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":111,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":18,"flow_first_seen":1491813286392,"flow_last_seen":1491813286753,"flow_tot_l4_data_len":7903,"flow_min_l4_data_len":20,"flow_max_l4_data_len":1330,"flow_avg_l4_data_len":439,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.43.167","dst_ip":"134.119.26.24","src_port":50258,"dst_port":443,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00504{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":111,"source":"simple-dnscrypt.pcap","alias":"nDPId-test","flow_id":4,"flow_packet_id":36,"flow_first_seen":1491813286393,"flow_last_seen":1491813286913,"flow_tot_l4_data_len":10054,"flow_min_l4_data_len":20,"flow_max_l4_data_len":1330,"flow_avg_l4_data_len":279,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.43.167","dst_ip":"134.119.26.24","src_port":50259,"dst_port":443,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00136{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":111,"source":"simple-dnscrypt.pcap","alias":"nDPId-test"}