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

diff --git a/test/results/rx.pcap.out b/test/results/rx.pcap.out
index bb41d43f1..d37557ca4 100644
--- a/test/results/rx.pcap.out
+++ b/test/results/rx.pcap.out
@@ -1,3 +1,4 @@
+00379{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"rx.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}
 00477{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"rx.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1460647264018,"flow_last_seen":0,"flow_tot_l4_data_len":300,"flow_min_l4_data_len":300,"flow_max_l4_data_len":300,"flow_avg_l4_data_len":300,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":41559,"dst_port":7002,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
 00781{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"rx.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460647264,"pkt_ts_usec":18403,"pkt_caplen":334,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":334,"pkt_l4_len":300,"pkt":"PIqwbTfwAAjK968mCABFAAFA5\/AAAEARo32DctuowKfOfKJXG1oBLBrkVw+1YFw\/yYgAAAABAAAAAQAAAAEBBQAAAAAASQAAAfgAAAABAAAAZwAAAGkAAABvAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=="}
 00503{"flow_event_id":5,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"rx.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1460647264018,"flow_last_seen":0,"flow_tot_l4_data_len":300,"flow_min_l4_data_len":300,"flow_max_l4_data_len":300,"flow_avg_l4_data_len":300,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":41559,"dst_port":7002,"l4_proto":"udp","ndpi": {"proto":"RX","breed":"Acceptable","category":"RPC"}}
@@ -59,3 +60,9 @@
 00448{"flow_id":5,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":112,"source":"rx.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460647300,"pkt_ts_usec":305310,"pkt_caplen":86,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":86,"pkt_l4_len":52,"pkt":"AAjK968mPIqwbTfwCABFAABIUYoAADoRQNzAp858g3LbqBtYG1kANGRrpznrEIIX+MQAAAAAAAAAAAAAAAEGAAACAAAAAQAAAAIPbFORAAAAAAAAAAA="}
 00922{"flow_id":5,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":113,"source":"rx.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460647300,"pkt_ts_usec":305347,"pkt_caplen":435,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":435,"pkt_l4_len":401,"pkt":"PIqwbTfwAAjK968mCABFAAGl9z4AAEARk8qDctuowKfOfBtZG1gBkZ0QpznrEIIX+MQAAAAAAAAAAAAAAAIHAQACAAAAAQAAAAIAAAAAbN8VeUBVvisWQ9S6x95dol\/TUOn9bl0f90I3hGv3uVWDizOZmldnlgAAAQAAAAE1YYIBMTCCAS2gAwIBBaELGwlVWi5TTlMuSVSiGzAZoAMCAQChEjAQGwNhZnMbCXV6LnNucy5pdKOB+zCB+KADAgEBoQMCAQKigesEgejNCW5m+7aBGuNoiVjkIJzx2tfXcLBv38bKqTxnfkKpelrtA2NteZ8teA2NY\/JcS7qvCbZJ5UfKfc0XKBLSX738gQiqTXl3VrPW6tJlGduoYTSlbLyRRjJPbpfA8K1\/szhWNGSiFLmMKWb9D3hNBBWPTEvqEyYAaHPUgal5Rc1F+EXgRSJeXlbJkNTV4kp3P8IMhfBmmyZrdnmNbYh2kOEX\/XLBBA7VWh1HbE3nAPhiu\/cR5WVZnVZ83fKFION8RnxUZiNj5tJwTg5Xm0rlK0JDrC0ZWhW0UJRkXyn0UNTnL\/w5O\/ofVSgO"}
 00432{"flow_id":5,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":114,"source":"rx.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460647300,"pkt_ts_usec":308261,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"pkt":"AAjK968mPIqwbTfwCABFAAA8UYsAADoRQOfAp858g3LbqBtYG1kAKDkyna9LKFupW+gAAAADAAAAAQAAAAUBBQAAAAAAAQABAAI="}
+00491{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_first_seen":1460647264018,"flow_last_seen":1460647264026,"flow_tot_l4_data_len":417,"flow_min_l4_data_len":44,"flow_max_l4_data_len":300,"flow_avg_l4_data_len":139,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":41559,"dst_port":7002,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00492{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test","flow_id":5,"flow_packet_id":20,"flow_first_seen":1460647299986,"flow_last_seen":1460647320158,"flow_tot_l4_data_len":2462,"flow_min_l4_data_len":36,"flow_max_l4_data_len":476,"flow_avg_l4_data_len":123,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":7001,"dst_port":7000,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00492{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test","flow_id":4,"flow_packet_id":79,"flow_first_seen":1460647299704,"flow_last_seen":1460647320158,"flow_tot_l4_data_len":9690,"flow_min_l4_data_len":36,"flow_max_l4_data_len":748,"flow_avg_l4_data_len":122,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.241","src_port":7001,"dst_port":7000,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00493{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test","flow_id":3,"flow_packet_id":27,"flow_first_seen":1460647299605,"flow_last_seen":1460647300326,"flow_tot_l4_data_len":9001,"flow_min_l4_data_len":48,"flow_max_l4_data_len":1084,"flow_avg_l4_data_len":333,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":7001,"dst_port":7003,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00491{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test","flow_id":2,"flow_packet_id":3,"flow_first_seen":1460647283326,"flow_last_seen":1460647283340,"flow_tot_l4_data_len":417,"flow_min_l4_data_len":44,"flow_max_l4_data_len":300,"flow_avg_l4_data_len":139,"midstream":0,"l3_proto":"ip4","src_ip":"131.114.219.168","dst_ip":"192.167.206.124","src_port":38331,"dst_port":7002,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00123{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":132,"source":"rx.pcap","alias":"nDPId-test"}