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-mvfst-27.pcapng.out b/test/results/quic-mvfst-27.pcapng.out
index bfa29e4cf..68f984333 100644
--- a/test/results/quic-mvfst-27.pcapng.out
+++ b/test/results/quic-mvfst-27.pcapng.out
@@ -1,3 +1,4 @@
+00392{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"quic-mvfst-27.pcapng","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":"quic-mvfst-27.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":41432,"flow_last_seen":0,"flow_tot_l4_data_len":1240,"flow_min_l4_data_len":1240,"flow_max_l4_data_len":1240,"flow_avg_l4_data_len":1240,"midstream":0,"l3_proto":"ip4","src_ip":"10.0.2.15","dst_ip":"69.171.250.15","src_port":35957,"dst_port":443,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
 02139{"flow_id":1,"flow_packet_id":1,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":41,"pkt_ts_usec":432902,"pkt_caplen":1326,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1326,"pkt_l4_len":1240,"pkt":"UlQAEjUCCAAnANMtCABFAATsAABAAEAR6jcKAAIPRav6D4x1AbsE2OWQzPrOsAIIrbuyBEpv1K8AAES+140kYx8r1I1jytRmSbOd1I6+euAu\/WCog0hZ7CK2vbiQaDsUNhduZ4TaOU+YwMwzr4tFRPY4WVcwFZYxf3JpeyRLGb56IxYnrJ+wVEN3bI7bVdKHF8LObpsuaNgGvwptfsH+rDACd3BONx\/QShlSNEGgtojOTAb3IBxaMPoBBrqk2vcqdCneK9x+zToW6kQDTdEd1IieGWgR+hdSwpMJLkz6epIDIJvr2+7hnKY8vsay1GJiKAlvxUurjQpspuMDfgvdh0iM6M1FrTv7rKzGyRXK46jvoMQof1iOAPHATgwqM4ZuYMuNvt\/y0p1tz148IXIa\/fLbIf\/jtx8RB3egC2zhGA2mbRbaurTTw48eZ\/8+UmFX\/pGgD39VTuQ0iy3fwQ4KqkHSAZwYDfMrqtGQuy3zdVoOJcB1EfGcQ\/j15ErCmDlRT7vkVVWnNzp5ac2qQ30IkEy79yMP2uQl+qcNCK7LBv3ES0ZAYMoMzeMHxcHojmxmY7m9pU8\/6TN1mmhBOL55YskIGgF5b9dubHYOHRFbIoVzLmlUMAC3n\/J8icXYhMzF+2LMmkFk5V6Ftpg6RFwazyDsV1VvAG0px\/ZReUsDZc2BpKOvPXUMcmmbi7J+4xk79GjDWU7qn9No\/9OgaUBSqlTMXjLKVw1AQS9DQbbP6Ljm2tjkBmxsNgiaX3ZHZdlEZ39g+pfa+C3d0\/Me91SnnyzofgyFHFf\/FZrz8kZlG+cPy3y6jToJU9oYVkDn4scTl9+EJRhVW2fiSh2BpNrkr1jxBS6nl0AbZVVuTjZo1emeItVe2pTwk9uLFdXZ\/CsWVBwjAwBQ8vxgzBGFWe9Cz3WpWkEzkAzQeOKzfLIFJb1PdMquNCwMajA4Jx\/Cl8vTf2306+VAoELddtYLnop0Ayp+TxS0Rn4I5pIhgtvtCnBaEOMmPLVrk2Tj6N4i6o4MT6NN2UsGMhl2jrLGVEchP8VeBBOrUPQTIvY+Xm1UQd6ud\/GSXz1lmW9JWN\/jvl2VrC\/dEdNNNDsuFT5DVQqiDS81yxHlMqpnUJtGOqdXBxl\/ipvbbIFVJMAxqaqhOIq9lLXVi0WRSrle2jY8C6byBzVmaXR9ob+Wj5JgOJ4dl6+zmTJfROyutrX06SLZW3iXBCGlGsJZa3VoAGsKr8R2PPaQW1IM5QBB1\/g3l2+\/8cMTpVbSj+AToLePRXNLpaht6\/i0lf5tmm5WeIZEw\/kp8XgE1IVG1OwCHdXi3LW8Ju6ZT6+NSDZYRl5iCIMOLeH+Uqa7zxr6BPSdijI5fZHwJ7CyzIIsLtNldUOOeWaUdszlpTm5UglrnEBk\/8+KIWEVomulKHSD78LbyMa2ZwRhHyUIoQUx3u628eG5WvmgiPmoWBpQq0SAcNJkibSZlfyukZBXk6ytoD7RL+6u7B+gDbgoIKW3EI2Vygx0786PDvzKNz\/jICcqh071958oOMWvZwK4wNNnPl+hmatacx8NLqlbU4\/qy23i+aLaPb\/wBxpmPXyakND4mOvFt3dmh\/yOVbINbAdZZ958R4K\/VXTGhgBSkxwXbKGKq+I\/xQwGAiri3PaDQBO6NYoKc0jqzc3rTGw44eUPJeiqQ8qEhbvrsfPi3A+VS5FRGlwZaAkkAdoB2gRkAwEAAAAAAAAAAAAAABYAAQACACEB2gAAAAAAAAAAAAAAAAAAAAANY6kd"}
 00709{"flow_event_id":5,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_first_seen":41432,"flow_last_seen":0,"flow_tot_l4_data_len":1240,"flow_min_l4_data_len":1240,"flow_max_l4_data_len":1240,"flow_avg_l4_data_len":1240,"midstream":0,"l3_proto":"ip4","src_ip":"10.0.2.15","dst_ip":"69.171.250.15","src_port":35957,"dst_port":443,"l4_proto":"udp","ndpi": {"proto":"QUIC.Facebook","breed":"Fun","category":"SocialNetwork"},"quic": {"client_requested_server_name":"graph.facebook.com","version":"TLSv1.3","alpn":"h3-fb-05","ja3":"61d8a93ff379660087082a82411f19a2","tls_supported_versions":"TLSv1.3,TLSv1.3 (draft)"}}
@@ -15,3 +16,5 @@
 00800{"flow_id":1,"flow_packet_id":13,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":13,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":41,"pkt_ts_usec":489979,"pkt_caplen":341,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":341,"pkt_l4_len":255,"pkt":"CAAnANMtUlQAEjUCCABFAAETAJEAAEARLYBFq\/oPCgACDwG7jHUA\/ze5TUhfRxauwQKQESXXOvvEIjR2c8gFVxEbYpp577YkVedjPbjQSiPNnc6HsQTkrUp8ZSlihItxMehqvAhublRP4zs7BJh\/g2kUttS5VL9h4Hb+AEJkIxmCidmdB2uCbNTjCjcdIX1vHMmtuzBKPsBXv26XyXN9RJL7GpiZdtfRYlT+Zw925d9XFS6vfjgVugKjGmFyhwBUQ\/jF9LrfgnMAAit6ItpALlCngKESJqrSw1xGqFsB1YVaBKcHjoITDK5fSUvpRzvQSsllaul2GEdUx\/3Wi67MB1O65clVL2SBHCW2QChDPVnTnoR+6n4CAsaT1QWNmSLGnBloCSQB2gHaBGQDAQAAAAAAAAAAAAAAFgABAAIAIQHaAAAAAAAAAAAAAAAAAAAAAMDh5wg="}
 00511{"flow_id":1,"flow_packet_id":14,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":14,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":41,"pkt_ts_usec":500982,"pkt_caplen":128,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":128,"pkt_l4_len":42,"pkt":"UlQAEjUCCAAnANMtCABFAAA+AABAAEAR7uUKAAIPRav6D4x1AbsAKuTESGUZSqSBwJ2mMk6Nt0Gm4aLYR2aPxthlM0NC0+1eF\/tZTRloCSQB2gHaBGQDAQAAAAAAAAAAAAAAFgABAAIAIQHaAAAAAAAAAAAAAAAAAAAAALvDf+M="}
 01870{"flow_id":1,"flow_packet_id":15,"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":15,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","pkt_oversize":false,"pkt_ts_sec":50,"pkt_ts_usec":309237,"pkt_caplen":1133,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":1133,"pkt_l4_len":1047,"pkt":"UlQAEjUCCAAnANMtCABFAAQrAABAAEAR6vgKAAIPRav6D4x1AbsEF2uFUWUZSqSBwJ2mMcfPOUKudx8IIdHFM+KYJWQvGFhfEc+0DxpgsTk44tZtXhYT2vNYWnzuIL1izcfXlPisguidPmO2DqtN7xgWikzAgQY8F03zNKDzWAGNqzF+LwWD+XTBieSsyeSBANPhvyxGVuE04HB+E00Q7ceTw8dR+xfDxfHvwU9UmfDZocpLYx377vu\/M6kJ\/X8XH5pcrTmMfFBo6MSZ7Bc7jrGDWNg3je6LONHE93LfSwNV1LIiMYJJybwFgfl4G8+uIwH4zKgX4UzCKwFaitESJ3\/P0woXSIe4VhcvPOZCqKbd5EXS7ylCxgNR0CAaLPbHtRyowOgRxiJeeoHGEq5zwK9u5Ee0sARBdMz4uFPT3KAMyOerg36WU1qYHYfP9k6jgIXTaEDFLgtpmuh3GDDch3UKt8xAuikoUDhknxmxc6aUubsklPpCltOmm9Woi9N7qceDtuzlf0WZpEYZC5QliXkSyp70lnKWjAuMPEDhtundmLlompnxrMRidleKKdTtuo1l5nX\/ECbozZoAv4MuQCX9YWYSMjv0u0uUT1c6uvEu0d51yOL+s9AV8pKlvk3MLKn0WgC2YLCcjG9WYhSMJ58b+84ZaBBUZ3Og5qPYcRKEdHAAa0N3rFC78EoJApuBItaIZj1OUUcwcBvGTJ752ruh2TWzG4VnIM1vofvYSAkxeeeIf+Ua5J6Ak2MKIA79HqfkvUrxlhcca7VEuSVvoTOWM5i\/I8cMfw6y2avOBJdbCtWDM7pY60Rwt5B5GdifarEN4OcqipbPZLDax0HccOkJJaC2pgFYW5brOiYImYlxggdctEaB1k0DPifMZQ+zGgB7Cb0H\/zZsPJkegDkB+kVN1iB1n6nJBAEUjI3qTLmAy68krMF61lsL0LwNoBtIJnEklxridi3Hae6kz2w0pbSJMDpPqGcAMCgz9XgWU\/lbULK1TU5ov+2bFyy+yI+Cf9B7yUUfDLkMOgEVwdra9DpaNhRAK8y7ctoft25rY7LGurcOG4hJgLAWwg0TenWVvjqlWP8G4JwMRLUK6GmeXsem6rYz8wAml+y77EXDfzohoNACzJoBo5k\/NxeSRif9VK9vJmx8uvrFfptb\/TY2HPHPvXYBhKLbdDnKaGfbOL6KeOo0pQhT3NUo5NasuPbGn9valN\/JkvdIRb1qZdXPZDXvNJNCgdwe+CjjA9ks9mo1Oq5oROlL4NzopfnJ6UzUYHRuFegfbmZnG81daq+iJEfAicFte2S4AB3XHpsAdypFr\/7g3vbSHXA1dE3\/ZmxinbKy9yb2dR2\/YwaQL2ZeNv4j3ghJeBU6mtAUufHJX\/pK3RTdcW\/lPWIACQf4z6pCDcEKG0ol83FYIOJxgk3y9h66neuY3f\/zIBloCSQB2gHaBGQDAQAAAAAAAAAAAAAAFgABAAIAIQHaAAAAAAAAAAAAAAAAAAAAADw7OGY="}
+00481{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":20,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test","flow_id":1,"flow_packet_id":20,"flow_first_seen":41432,"flow_last_seen":50392,"flow_tot_l4_data_len":9679,"flow_min_l4_data_len":29,"flow_max_l4_data_len":1260,"flow_avg_l4_data_len":483,"midstream":0,"l3_proto":"ip4","src_ip":"10.0.2.15","dst_ip":"69.171.250.15","src_port":35957,"dst_port":443,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":15}
+00135{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":20,"source":"quic-mvfst-27.pcapng","alias":"nDPId-test"}