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/mpeg.pcap.out b/test/results/mpeg.pcap.out
index eacebd485..29be67e6e 100644
--- a/test/results/mpeg.pcap.out
+++ b/test/results/mpeg.pcap.out
@@ -1,3 +1,4 @@
+00381{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"mpeg.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}
 00471{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":1434379491040,"flow_last_seen":0,"flow_tot_l4_data_len":44,"flow_min_l4_data_len":44,"flow_max_l4_data_len":44,"flow_avg_l4_data_len":44,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
 00437{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":40018,"pkt_caplen":78,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":78,"pkt_l4_len":44,"pkt":"yGyHABajPBXCt3IOCABFAABAOE9AAEAGJUTAqFCgLmWdd9n8AFBP68YoAAAAALAC\/\/\/OTgAAAgQFtAEDAwUBAQgKFSiGAAAAAAAEAgAA"}
 00435{"flow_id":1,"flow_packet_id":2,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":117076,"pkt_caplen":76,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":76,"pkt_l4_len":40,"pkt":"PBXCt3IOyGyHABajCABFAAA8AABAADIGa5cuZZ13wKhQoABQ2fyPIjpcT+vGKaAScSAIFwAAAgQFqAQCCAoAu5vaFSiGAAEDAwhf8g=="}
@@ -16,3 +17,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":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":160493,"pkt_caplen":66,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":66,"pkt_l4_len":32,"pkt":"yGyHABajPBXCt3IOCABFAAA0OtBAAEAGIs\/AqFCgLmWdd9n8AFBP68a9jyJWaYAQD9N6+gAAAQEIChUohncAu5vu"}
 02410{"flow_id":1,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":14,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":161455,"pkt_caplen":1502,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1502,"pkt_l4_len":1468,"pkt":"PBXCt3IOyGyHABajCABFAAXQobZAADIGxEwuZZ13wKhQoABQ2fyPIlZpT+vGvYAQAHYVzwAAAQEICgC7m+4VKIZNLxLPeV6nXf99nXeO25UCRqFtev\/ziMRJO5QiBADGFt1lt4y3ehfS44MRlUZk0\/QSGda240tmYffh2bdBF\/+QOm3WNxqGqtFF7kXpF3w5JJLasR8f6G46XDvNgTw\/jrNCWHgdLiQKRuBMPQJpeViHlZLHaQRubj4OAR3lR5pxUgz9nAT02BoeH861yJDJqpqLnDZdsov6SiunTETxNqV1\/f03ubiL4\/ZO5vNO2Oe58\/NT9sbstsTsiYfXbava633U0yc8xUOqgmG0p0vweE5ZxMoqMKQbHRWKP88aib0q4YisEyhW161usTYmzBnkw8DwL4pHUM8SCC4KNzaDsR4+S7jrN1OoxQJdCz8WziOBVsxrRlc4KJTlsPByV8RWrLpDD+YTROcm7GcCQOuOTGDIpUNN4\/\/ziMRtPNQuAAFZeAHREFghNDAT5kYD4hryhTrgzQFe+bDjeG4ikupFGvo7W0PmpGUititkjmZKeQ5UVlgR4VmVTr8qsc8wNNLZRj0\/iN0SLPmFa3rmFDvbN5vL\/G1mtveud+n9vu28at7e9\/PJjyXz96pvW77l1nEX+2c2zfFvvP1Wv1bWq4pW1L51TOd6iZp4sOqka4awxYfMEEMKaetRlRfEDRneTGJYFAjAHNSIq+oUQ5YHmizEozPOUSVbBIOIABeiHzApAVKMQDYuZMIYYac0yIIlHpuZcNPtW5NwGB0HTCjgw4aAsNMUOCCN55S09d7dlLBCMFC4oGjRhyQVMgUKqUtcCSQMFmbFxJxPdxsquwwwYUYXpdgaKig8yP\/ziMSMYDxqQAGZ0AAAM0rGShghoOYAlO9pMTM0oBoFLtkkMRR330cRcZRkN2PMuJAAxZLdCJGgDBK4HGgSRMYQLnEzg2z8WPAqUFUjTI3Qy5+F+RuowNOusoODWJfYiRCyA3bMyZ0xRhiZjAI4SDj8CLBkA03gJ+jRgScMMAzNxAMBTxiAoQZffXXPWIfuWOf3v\/5IAXcwpaXF1LAP79XK3+HmMGEAFDxSldambDGuValHc\/nf\/\/+3rC3UsajFi5DE5LOd\/87uVV7pZD0uj8BP\/DLdG3Za0dWNMTms61Wo6j6uq4bkM\/aQriRX2cpzMnZ5L\/z\/\/\/\/bgwOCP\/\/\/28W9T0UP9CxommOwv4kA9atYSULbikxC4oaI\/RymILguS\/\/ziMQeQzRCbAGPeACiwRsgAFVmDTRpPxbQgAZR2jNPUcZvjhEBAbGkvyomMonApBfSatJASCi4C9Yj+QxwEKQCbMQ\/wgbgb6HhoF7YiYo8TwLUUaLHwc6CPOQgxiFMdZnjwTT0RVVLgmqhbRlF6JnBLsc5JImUoPSfp1HDYti5N8kRdFoXc1z1Oct68YaoK5BOCgfFzLycNFs1ilJmXEykWtPAXxzxj+TekmuDLgt8ZHLpRU3PWlf\/+XCq7gKWLSbWfv\/q+NBdtjZv5\/\/\/\/+Pu\/zLWDFr8Xh6ff7\/rf0nplvs+jTRIO\/\/j69neL7h3+WbO9VtL\/\/\/PU7lgfQCIwLqQcmaKFuPwqj\/IQS4\/pAj4uhfEKb0ePERgQNVJeEcyFP\/ziMQkQVRqaAOPeABmJZS3OFOk3JopmdDW1SGaQVJCBMCWThiAe1CklbCjOIBWAXk7VBhFxoAwGWFYWFhUJhE9SqeEjDjDeIEBoF6GoPspCaCKJEfhC24fQapihl9UxQnOiyTn4ZygIMOAhBzixnsxEOD9HmepBkE+hp2DAjVJSQYlxNl0p47AbIaa6QoeLU1pcyUuhh9nMV6PbbdEi2ktq3OUKNms6uY8rqLErr1\/\/UMVWxdfNcbx\/\/WvzX\/OM6\/\/\/x8b\/3eese00eST2\/z6+2\/6Z9rRVbuL\/86x\/86xn\/P3a38uP\/\/559f\/\/5e1VdFUrLY4uZlzRQIUzHSubqqV1Zp\/pWnKXhf8="}
 01235{"flow_id":1,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":15,"source":"mpeg.pcap","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":1434379491,"pkt_ts_usec":161458,"pkt_caplen":665,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":665,"pkt_l4_len":631,"pkt":"PBXCt3IOyGyHABajCABFAAKLobdAADIGx5AuZZ13wKhQoABQ2fyPIlwFT+vGvYAYAHY9pgAAAQEICgC7m+4VKIZNQSlxWCwU16Cy6pgGmFF2UpCoOqaxROb\/84jEMUn8QdgB2MAAQDNNj0WmX9nE0jCg1oW6XOMYC+UXazArSkxoOZUxKXtZdVuwJAYxJ0vUkMkUsZxr8pf2Xd1TWplcpd0tq2zSVivzEnelaPJeGH0EqKMOJfJ1MbMTThFAckaYAloVczkNQ9Gn1ZyzmHajtNaXcy6DEvkinWgFdrLaR2n9jMMv7LaBgSEpAM4rpKBKDMSi0RYasWHpl2Xdh2zWhp\/rM1Gpda3SxmM5VaWl5qtTWsdZVsu1YzGbVWlpbP1qamx1lll3dWly\/eOOP5ZY\/\/\/rLLL8ssvx5+X\/+OP5U1NytTZfjz9Y\/rLLLcpjNrdLS2cf\/94444\/WppVS4kxBTUUzLjgyqqqqqqqqqqqqqqqqqqqqqqqqqqr\/84jEAAAAA0gAAAAATEFNRTMuODKqqqqqqqqqqqqqqqpMQU1FMy44Mqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo="}
+00490{"flow_event_id":2,"flow_event_name":"end","thread_id":0,"packet_id":19,"source":"mpeg.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":19,"flow_first_seen":1434379491040,"flow_last_seen":1434379491221,"flow_tot_l4_data_len":9991,"flow_min_l4_data_len":32,"flow_max_l4_data_len":1468,"flow_avg_l4_data_len":525,"midstream":0,"l3_proto":"ip4","src_ip":"192.168.80.160","dst_ip":"46.101.157.119","src_port":55804,"dst_port":80,"l4_proto":"tcp","flow_datalink":1,"flow_max_packets":15}
+00124{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":19,"source":"mpeg.pcap","alias":"nDPId-test"}