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

diff --git a/test/results/git.pcap.out b/test/results/git.pcap.out
index 9a6f405e3..ebb98789e 100644
--- a/test/results/git.pcap.out
+++ b/test/results/git.pcap.out
@@ -1,3 +1,4 @@
+00380{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"git.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}
 00468{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"git.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1460821630164,"flow_last_seen":0,"flow_tot_l4_data_len":40,"flow_min_l4_data_len":40,"flow_max_l4_data_len":40,"flow_avg_l4_data_len":40,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.0.77","dst_ip":"5.153.231.21","src_port":47991,"dst_port":9418,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
 00430{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"git.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460821630,"pkt_ts_usec":164056,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"pkt":"nJcm0ghCPJcOZtCOCABFAAA8Q1ZAAEAGScLAqABNBZnnFbt3JMp+hgtEAAAAAKACchB0gwAAAgQFtAQCCAoBp0gSAAAAAAEDAwo="}
 00430{"flow_id":1,"flow_packet_id":2,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"git.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460821630,"pkt_ts_usec":221958,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"pkt":"PJcOZtCOnJcm0ghCCABFCAA8AABAAC8GnhAFmecVwKgATSTKu3dqwE5VfoYLRaASOJBfrwAAAgQFrAQCCAorjWmrAadIEgEDAwc="}
@@ -15,3 +16,5 @@
 00422{"flow_id":1,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":13,"source":"git.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460821630,"pkt_ts_usec":471592,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"PJcOZtCOnJcm0ghCCABFCAA0J\/NAAC8GdiUFmecVwKgATSTKu3dqwFKffoYNooAQAHq\/YgAAAQEICiuNaeoBp0hU"}
 00433{"flow_id":1,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":14,"source":"git.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460821630,"pkt_ts_usec":471621,"pkt_caplen":74,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":74,"pkt_l4_len":40,"pkt":"PJcOZtCOnJcm0ghCCABFCAA8J\/RAAC8GdhwFmecVwKgATSTKu3dqwFKffoYNooAYAHrFngAAAQEICiuNaeoBp0hUMDAwOE5BSwo="}
 02347{"flow_id":1,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":15,"source":"git.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1460821630,"pkt_ts_usec":489457,"pkt_caplen":1506,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1506,"pkt_l4_len":1472,"pkt":"PJcOZtCOnJcm0ghCCABFCAXUJ\/VAAC8GcIMFmecVwKgATSTKu3dqwFKnfoYNooAQAHrgqAAAAQEICiuNae4Bp0hUMDAyMgJDb3VudGluZyBvYmplY3RzOiAxMjYsIGRvbmUuCjAwMjkCQ29tcHJlc3Npbmcgb2JqZWN0czogICAxJSAoMS81NykgICANMDAyOQJDb21wcmVzc2luZyBvYmplY3RzOiAgIDMlICgyLzU3KSAgIA0wMDI5AkNvbXByZXNzaW5nIG9iamVjdHM6ICAgNSUgKDMvNTcpICAgDTAwMjkCQ29tcHJlc3Npbmcgb2JqZWN0czogICA3JSAoNC81NykgICANMDAyOQJDb21wcmVzc2luZyBvYmplY3RzOiAgIDglICg1LzU3KSAgIA0wMDI5AkNvbXByZXNzaW5nIG9iamVjdHM6ICAxMCUgKDYvNTcpICAgDTAwMjkCQ29tcHJlc3Npbmcgb2JqZWN0czogIDEyJSAoNy81NykgICANMDAyOQJDb21wcmVzc2luZyBvYmplY3RzOiAgMTQlICg4LzU3KSAgIA0wMDI5AkNvbXByZXNzaW5nIG9iamVjdHM6ICAxNSUgKDkvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDE3JSAoMTAvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDE5JSAoMTEvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDIxJSAoMTIvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDIyJSAoMTMvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDI0JSAoMTQvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDI2JSAoMTUvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDI4JSAoMTYvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDI5JSAoMTcvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDMxJSAoMTgvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDMzJSAoMTkvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDM1JSAoMjAvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDM2JSAoMjEvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDM4JSAoMjIvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQwJSAoMjMvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQyJSAoMjQvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQzJSAoMjUvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQ1JSAoMjYvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQ3JSAoMjcvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDQ5JSAoMjgvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDUwJSAoMjkvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDUyJSAoMzAvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDU0JSAoMzEvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDU2JSAoMzIvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDU3JSAoMzMvNTcpICAgDTAwMmECQ29tcHJlc3Npbmcgb2JqZWN0czogIDU5"}
+00488{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":90,"source":"git.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":90,"flow_first_seen":1460821630164,"flow_last_seen":1460821631269,"flow_tot_l4_data_len":70945,"flow_min_l4_data_len":32,"flow_max_l4_data_len":2912,"flow_avg_l4_data_len":788,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.0.77","dst_ip":"5.153.231.21","src_port":47991,"dst_port":9418,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00123{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":90,"source":"git.pcap","alias":"nDPId-test"}