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/quic.pcap.out b/test/results/quic.pcap.out
index 9379019a0..a030fdc66 100644
--- a/test/results/quic.pcap.out
+++ b/test/results/quic.pcap.out
@@ -1,3 +1,4 @@
+00381{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"quic.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}
 00479{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"quic.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1431155536815,"flow_last_seen":0,"flow_tot_l4_data_len":1358,"flow_min_l4_data_len":1358,"flow_max_l4_data_len":1358,"flow_avg_l4_data_len":1358,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.1.109","dst_ip":"216.58.212.101","src_port":57833,"dst_port":443,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
 02200{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"quic.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1431155536,"pkt_ts_usec":815947,"pkt_caplen":1392,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1392,"pkt_l4_len":1358,"pkt":"ZHACjT05eJKcD6iOCABFAAViHYdAAEARqU7AqAFt2DrUZeHpAbsFTjSmDbLeXfFPVUXrUTAyNAE7bomG+Dzzt6arXQUBoAEABENITE8YAAAAUEFEAIcBAABTTkkAlgEAAFNUSwDQAQAAVkVSANQBAABDQ1MA5AEAAE5PTkMEAgAATVNQQwgCAABBRUFEDAIAAFVBSUQkAgAAU0NJRDQCAABUQ0lEOAIAAFBETUQ8AgAAU1JCRkACAABJQ1NMRAIAAFBVQlNkAgAAU0NMU2gCAABLRVhTbAIAAENPUFRsAgAAQ0NSVIQCAABDR1NUiAIAAElSVFSMAgAAQ0VUVjADAABDRkNXNAMAAFNGQ1c4AwAALS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLW1haWwuZ29vZ2xlLmNvbT0+v6ewgcRvrlDFl4IgCKBtLSXVw73kkvbSDmvcmOf2TBMxulvrGz8yGTFdF5jLNEfrxdDYlT46wVhRMDI0OZ\/5U0D3\/sl7Junn5Fxx\/1VNs1C1kCtxr0CV9UPILNoJ6w2heNOu0THXmZnbqXjfZAAAAEFFU0diZXRhIENocm9tZS80My4wLjIzNTcuNDWSgFuKS9buSt4mHNzF5UW8AAAAAFg1MDkAAAQAHgAAALUiugwS5Xe6lV7+35SrDjhQNi2XDPMM\/SAa6745q60xAQAAAEMyNTWyymQS2aTzwxJH\/U1CkeUIQAt7kKmueetRQklDOGABACXmg4KWna0TB6ed5h20iLVA1zTe0FGDOptzFKaIlVwv9K6LN7uMdA4zwVZIB1iByXkmIDPeaAjR8KDHiEXiLMdlilnNIxXrsf36+nSmAywD99MMia5QSojDYPQnkx\/kpc2+WkgLuTD7x6JugKntVJ0OcgBRa3ZbeaVzbIzXT9DutsK0zdmFTlT7PzF\/1Y0KupYf9uk4kqnlGvQLoUuyyKbFovu6AACgAAAAoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"}
 00615{"flow_event_id":5,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"quic.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1431155536815,"flow_last_seen":0,"flow_tot_l4_data_len":1358,"flow_min_l4_data_len":1358,"flow_max_l4_data_len":1358,"flow_avg_l4_data_len":1358,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.1.109","dst_ip":"216.58.212.101","src_port":57833,"dst_port":443,"l4_proto":"udp","ndpi": {"proto":"QUIC.GMail","breed":"Acceptable","category":"Email"},"quic": {"client_requested_server_name":"mail.google.com","user_agent":"beta Chrome\/43.0.2357.45"}}
@@ -93,3 +94,5 @@
 02226{"flow_id":10,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":462,"source":"quic.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1463075953,"pkt_ts_usec":428061,"pkt_caplen":1392,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1392,"pkt_l4_len":1358,"pkt":"ABlmWmaM6HTmLPTkCABFAAViG1QAADQR+RjYOtLOwKgBbQG7iaQFTg9DAAdNVYQf+iC\/\/853DRLv9axgfYBjztrhLSg1s8tnb+0mxaeHezcc8sEddrmKsZSRYWcrYF9VCqiHXDNKY7dY1PB7CJYNS5aD\/r21wISS9hMPwdB21G0Hcu+EwnECvwvM\/0xR9AM4oKNl\/3Fe9H0H4yUBO+KpL02GhxngHzlMTv97MiyJNHcU5XwZRgKsobi246ls5nyH3OCZxd\/WriGpW2D6YWBfhEru0wVQ+nFW5usrHs+808xWtp9abq2fIE8jKQM9AUn07ujtqFyYYp7H6GsqZ2djyBzhplSARzFL7u8xxm+xJ35T+W5\/3hR97w6FY+61zAgwk\/S\/3EuUyCgVQFfmkHLxa6ffAEzwOTYE6NluPvfUV0vaIfE520EylO59UTrD6SOhmFdEOPU0sTo3an5mnvGPF0OObkkn6zPg8lGg\/Xk9uTv6kXKi18HEk3FdChYdgWoLPdR8RpexHHhk\/KYCZeLsFkh8eQabTnrsLoxUB0M1cdHt3S0K4onDVqG4JaGdOeCx8ckepZs+FRor1WlvquFD\/IYEYz9n1WLSGD1C8PAGI1w9AtK8khS5UtdPZPtePvZ3UhiZviplzXovmyqN7iGfs+7OBMKQ+v+fJgg31saWnMURKaB3mzV7wylK2vPSxK7Iq7AUQ3FLWKc\/D34uZL3FdKdeQAxj+fmF2IXJNSY4TxrLZm1Pz8Ot9ccSpLzARv7TWoXwWYw+V9iO1HONycd4WPSVV6pvGAzZELYGSsJLiQJCMrMCGhXkFA6skX5RdZyRfJde+raE8ky162\/k+onPLGYaZSA5H+DU8coiAQ+7SS+pMoZbHIXREskFi3GgirDbcEc3S51yo7dGJwmt1DxJcpvtMIPYhsv+9iK5hN30QQhogta+eeJMk0oDeG\/zTwwAgZB0i04J\/LAbx9IqWhahgOgjWQTAVzkAZ4qFtnNgLQhQFsU\/EoOVwH\/CQOHRF9NWLW3zLjLAB2Q6cru\/cATFHBFbG7lpIxZaHXMRhMgRTPMPqUdk6ZSthg+ZtlB8VOTykzthfFzwa9eNEbOQF5LdqraJbWq9yQhYRvvt3Fqrys39jzAHeCuynF2lRcI1vJjQWoeaQN\/2e0KkJEunqTGdkXfw+mgJdEvWZYi8+p4iGujkl9OViO0hLMmbX1IiYinomNW6RcuMWUkHc\/N6Gkf9x47XwRy5bF7i3AysneHT0NXiKScMqzQVzAZMmJMfcGL5JbR\/H\/Wm1ZrLc1AAVot4upxeIGzzckokXpU9TRMFJWZIijs+urWA9aAgjBWTCh3THScrEgL6pJVhU3VYARS3mfGP5HLAc6C33xhvYf9m15dTcFn+nCmsQf+oYlReM4o+dZi16U1hDDlnYctSQnRdyuomM5Cv5lG+9ZIEGCbCpmUpC36bVLhK1dOOl1z43aDZL02uWMtOdwTlTXw8zTgKle1Qpq7MRETMxTvFWWO5UGb7dMrK0+6uK6z9GCWNsPBv1QI3UOSckN88QmdpxB5Zm0OgrNSBQ\/QfUKjp1aUPiJdx1CUOaMb4EvAQgUVnc+b6f0pS5eyfiwmzd\/fCfIEdPACHCrZVZR7MOe0wcQUTnsUk12JTBMut+jzUQ8PAsH56VvuhvVc+CzBC\/a7HaXhb153HKPnZGVYvtheUnb51Phx1AOdOTUy6mbYJTr8ztC8UUfebEUiRJf7mveK8IP2PLTb1k\/fi6C2QvpDL\/c602MwBIC8TEJ3tTJ763IFx3cn4NRzl2mbKI24Fubuvhc2UMlR9hQPX4rX0esWexvKpDui+X3OzHWrlV5pGYL5pD\/tM"}
 02228{"flow_id":10,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":463,"source":"quic.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1463075953,"pkt_ts_usec":428507,"pkt_caplen":1392,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1392,"pkt_l4_len":1358,"pkt":"ABlmWmaM6HTmLPTkCABFAAViG1UAADQR+RfYOtLOwKgBbQG7iaQFTqXWAAj5CaSOKUnUAmbVYxJjCiYKf27SpOrRU\/gvItHJBLhsGyh4WeXfwYt5YzSMbZNmml899qQN3A4wKwdsahus5C1yoXENkWtilCnVV1NqJAqiaiZKq8NvECrLoLhms8NiYEYK58xEerw3FMM\/\/B5RUtrf7J6OWB6VVOjwTu6DRXQXubQdhEIZR1WSDoZq0CSvZP1\/\/qxYoOcwnpFW7FU1pA5jtaVZ11kUW3DKUikzmXrTX+WkOaunhYNZffb\/5FxdZ+fwjYac69cXVIn02n+v69YUgdUkH0j7MDzgPK23MjPCQOwZTU+OASdqebPcVZYNFhYzD0K7Hs8HmkfPBnbpYgcxebN9x2A34ItdlBOiluxkftOpWlGk8ReyA7ziEDZ\/YHMiVE9iCI0k\/Q+v5WOAznVQS6A\/JWDLqV+cbZInQSh90ZSLUCkbjoycP65jRWsJOUPceBG3urCE47BKEOhDxqDE3H\/b+W+vZIem18eZOSuhWCRqb5DINDkLKE0lndwbYQxviab\/Cj8DCDdnw9alf053R8C2gR13TUJkazv7E5d2KJBwGlyhLse2tugKyHrw6VnWSCLdmLqt0viDh+YB2F0HXj1CeO1nSSCwaJyrwevh+JMhr28U4GZuq\/8iOyCT32qzGATTob0blSixKNU0nrsG\/edv7ffcTSflocJCCoGDIPz5k\/SvGRZr2+wiLlOODRBoy+Hp\/ZoR0zRh3yZNqocZlkDIUTBKznO5qQE5ST89RU+D9ITBzSFrjm0vj762yqIYQn7atyujrlIguI69oV7Uc6Yk350ppgZezdDQW6ZtU0dlUnsQnioVaxPeehgPzqL73Erfq9hevik1cXRfPmRlZ5pO1Uw4ylyXLqBwN6FTuhy3MlBp6n\/uhx+oAHZ4OKTas4oRg+Hw0eqVSVAp7\/31bth7tMA\/d\/QvSAq+SGeu\/ZG8PJfRr\/JAqIBREhfI7VSdydJ\/Z8i5liX3t3RBpoNk4MnqDqqqN3fEq7DG2oT6\/HH2wCLRl+a6gq1ey+VHx4cA77wpcJJa18slC8C6\/YCKR3WSTuahSzjf0ZxyWpoeo7O6oRO+Cf57SxWUyMRunJe5haUE5DRgyRVgDq2A0is4tTVlm\/kJfuyqmGi5p1nqgG4qZEBGwfhr0y5gpp3Lx1VLOMafrWWWhBqBpNd8pBfh3SRrpJOttXDmB5hqTwMLYFH2ZLTlx3d8IpZ2D4ldgsY6R1koCzsXCTalO+Pzz4uWCC4Zgch2qTWN\/OFSWw0up88D1VEWTiWMRCVc2kK93LkjpiwYYtmTKan6lA2pfFrIbq54rA63o9eAcfmJNpm5SHUiiJ78V4tPR+3\/h7u1nPyawsC3CxXYhI80NKw0S1ifJ3ROu9Uht4TB0mSZIC37xbVJMRc5V7yHr7jMm7HC2uupUP1EvqAJK4hH0WsmillshZ+c+wEwn3C6AoDqkGE7zn+N+irKocjnIy+AKnwAzm5gaUvZQOAvBOpmTUIIS9nUO++9vi09y0u\/cjZnJdoUdZLnEnwVJbXzl4\/5Pb90Xl4nkZG4lnlw4iWwugzfcKv2gmQrcj7fgBoWmUFb7\/Al1Gqv8kDW4YFYljNOnSb2zx4pIFrtDsnSHDjAGCcpqBJfAF0pU1prbVA1xeAIziexP+bu2yxJQUbJ5c91WDE8sAsHyx0U6W0KaPB37KCcOeRdPh5DyE0TXWkBvFFdLL8bPo1DuyiGwAN58Tf6RNwW84tYPmvorpDe4A6SYnvb0FQMw9xhbrYe85U0F28h\/Xu9WAQdT9YFiGPEpyXb5ViEL1AiSGEH"}
 01956{"flow_id":10,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":464,"source":"quic.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1463075953,"pkt_ts_usec":428518,"pkt_caplen":1188,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1188,"pkt_l4_len":1154,"pkt":"ABlmWmaM6HTmLPTkCABFAASWG1YAADQR+eLYOtLOwKgBbQG7iaQEgrfkAAnf4DCMrsUbO\/ngChm3BUxvj6ihF711mBPSXPVFdDhpSOtcrbvY1KsY0f4vCqIi1MXzoSbEcl8CFyGdECH08WWlYgy6GmXJ+IpdKgMRIunQ0WNk82BxUlyvqQQzyafpjH4+5Y814Kb4YgqBF\/zJ7AWokLdMqZd2sh5fS4lv7RgAT+IwyMSp23pRzGxvNPTD\/VBqoMIIcR0xsXYQ7cIRDkEghEXLz\/miWktIBLJB+76uq2WcJL1iRBTB7BrhW3xzrub2U\/qksP\/rNCTPyoRaGvkcD6kS+cZjUHuSBrbBFfY\/kFvtiyzOt+1dUS2H5WvK\/e9cdd4hZTdVW8z0+NuWpQ650nDVcLNHwpcvT8Y7kFGRH1aJWlNwYnCjjhjFGL4WJ0nGves2K55q9L1NWMo60zkIPt2gSkDN7ic5vrsZJo2pbLNjLoHl26mIrU9iwWWlSyPBJw0zLkVPJRtg6rCHPZRO8DI39uhPGktSe6PgYTZq3cvhG3I+WHymsGbmr3SWPKy2nJ5Icb5lItEcNjwBHM8VuWWpEFkLmCY1DSf0YTyNPXH0ray\/Zb9BueH0uIEmJpW9lIgxkUn8Fne\/+5B8hXt+Fn3ULzd4BLoKH5WoQuZW4dB0BAizlUCv7XkBpKL1jJ\/Xa0ynkC0\/GM+6y6rPY\/N2RBKBls946wbH1MamdLsvuDy0J+CIMnAU1VbKQfcuzVTDU6PyCd5vjc6L39DK9LfYRwahFhdDInWWn6Z1liwAY0utnhWQfYKSQJW3tgH6I3sxruO6UxMDcvLVAywZuAtwP5usEfc9neWEWSGAS94nId1TSYp\/UnV2jfx6M+\/eMtUpc3UoXcMVDvYRCMagfHcjPYbOvaBXufrlERvzBra4C62\/8Z8sz6eWaljp7aAzDuKzSv31lgrX9j0JQF5yFUGWET+shJydWdq9Y9lg4eDmqzM1DwA7N9pEuyM\/BI9BypXeQmpVKTaerJ\/uedM64ldi40vJlWQi\/6fsYMZjeCnF7d2WXDVfBiu\/EtHx5p7cDiKTY6u3IcWJP+WvWIfbyrSDxy8ul9ZxbCK2KP2dJslbz5i10BRktzGiNojUoZji5U6mCs9XEQk6Veq09SpgVmPX1kSE+3SW8D\/uGNOm1fmyOP\/xKDgMBCTeFDgZZgVZV1oq\/p2X0qeAs+5fQFsMMtl6tY4Bt5P3ohcc0Oxg8FEqUHyM6zRnP15PIOpxxlN\/\/s4SZSt\/aMq\/IPg2lPmc9CpcJMS0L8LVIyaDXcScO1DvsyEALATmTDycfe2+tthjTeQnxlEsN5sjob5ccENZo1PjR6HhP2LlJJ2bD4T5tGRBb1rdnIqtT8v8ksY+Yc0uO63TLrkRWlws+y6ccPBHNJzsgcal11JK8nMhJeJlFRIt2rf3Hapg5hwia\/UuQUfF+4cWZc9DvUL3MSuO2Ox\/iCroKvXeyNPw3CVhgyihJPqrOqtB4BuzMAouyKKIjCC2KhyXI+JgP1S2E9CCp7Lj\/eDne2tDHDryZxZ1lwQJntiYx7Y32qZi\/GVd"}
+00494{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":518,"source":"quic.pcap","alias":"nDPId-test","flow_id":10,"flow_packet_id":69,"flow_first_seen":1463075953299,"flow_last_seen":1463075954300,"flow_tot_l4_data_len":56087,"flow_min_l4_data_len":27,"flow_max_l4_data_len":1358,"flow_avg_l4_data_len":812,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.1.109","dst_ip":"216.58.210.206","src_port":35236,"dst_port":443,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00125{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":518,"source":"quic.pcap","alias":"nDPId-test"}