Small fixes.

Signed-off-by: lns <matzeton@googlemail.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/test/results/xdmcp.pcap.out b/test/results/xdmcp.pcap.out
index 986c4f120..1f9ddd6d2 100644
--- a/test/results/xdmcp.pcap.out
+++ b/test/results/xdmcp.pcap.out
@@ -1,11 +1,11 @@
 00456{"daemon_event_id":1,"daemon_event_name":"init","thread_id":0,"packet_id":0,"source":"xdmcp.pcap","alias":"nDPId-test","max-flows-per-thread":2048,"max-idle-flows-per-thread":64,"tick-resolution":1000,"reader-thread-count":1,"flow-scan-interval":10000,"generic-max-idle-time":600000,"icmp-max-idle-time":120000,"udp-max-idle-time":180000,"tcp-max-idle-time":7560000,"max-packets-per-flow-to-send":3,"max-packets-per-flow-to-process":32,"global_ts_msec":0}
 00542{"daemon_event_id":4,"daemon_event_name":"status","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","packets-captured":1,"packets-processed":0,"total-skipped-flows":0,"total-l4-data-len":0,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":0,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":0,"total-idle-flows":0,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":2,"global_ts_msec":1538467333581}
-00563{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1538467333581,"flow_last_seen":1538467333581,"flow_idle_time":180000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":7,"flow_tot_l4_payload_len":7,"flow_avg_l4_payload_len":7,"midstream":0,"thread_ts_msec":1538467333581,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
-00455{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1538467333581,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":60,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":60,"pkt_l4_len":15,"thread_ts_msec":1538467333581,"pkt":"CAAngNsFUlQAEjUACABFAAAjIEIAAP8Rg4AKAQICCgECBO\/yALEAD\/cgAAEAAgABAAAAAAAAAAAAAAAA"}
-00628{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1538467333581,"flow_last_seen":1538467333581,"flow_idle_time":180000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":7,"flow_tot_l4_payload_len":7,"flow_avg_l4_payload_len":7,"midstream":0,"thread_ts_msec":1538467333581,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"XDMCP","breed":"Acceptable","category":"RemoteAccess"}}
-00470{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1538467333586,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":71,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":71,"pkt_l4_len":37,"thread_ts_msec":1538467333586,"pkt":"UlQAEjUACAAngNsFCABFAAA5uT5AAEARaW4KAQIECgECAgCx7\/IAJRg+AAEABQAXAAAAAAARV2lsbGluZyB0byBtYW5hZ2U="}
-00689{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1538467333586,"flow_idle_time":180000,"pkt_oversize":false,"pkt_caplen":231,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":231,"pkt_l4_len":197,"thread_ts_msec":1538467333586,"pkt":"CAAngNsFUlQAEjUACABFAADZIEMAAP8RgskKAQICCgECBO\/yALEAxWSsAAEABwC3AAAJAAAAAAAAAAAAAAAGAAYABgAGCQAExlrfKwAEwKg4AQAEqf5aAAAEqf5VYAAExj1eOQAQ\/oAAAAAAAAAUuwoXMyj2JAAQ\/oAAAAAAAAAND9alvNJ9SwAQ\/oAAAAAAAAClDBBzRudaAAAQ\/oAAAAAAAAChc6eH9dJVYAAAAAADABJNSVQtTUFHSUMtQ09PS0lFLTEAE1hETS1BVVRIT1JJWkFUSU9OLTEACVNVTi1ERVMtMQAA"}
-00672{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":6,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":6,"flow_first_seen":1538467333581,"flow_last_seen":1538467336601,"flow_idle_time":180000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":189,"flow_tot_l4_payload_len":335,"flow_avg_l4_payload_len":55,"midstream":0,"thread_ts_msec":1538467336601,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"XDMCP","breed":"Acceptable","category":"RemoteAccess"}}
+00563{"flow_event_id":1,"flow_event_name":"new","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1538467333581,"flow_last_seen":1538467333581,"flow_idle_time":200000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":7,"flow_tot_l4_payload_len":7,"flow_avg_l4_payload_len":7,"midstream":0,"thread_ts_msec":1538467333581,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3}
+00455{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":1,"flow_last_seen":1538467333581,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":60,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":60,"pkt_l4_len":15,"thread_ts_msec":1538467333581,"pkt":"CAAngNsFUlQAEjUACABFAAAjIEIAAP8Rg4AKAQICCgECBO\/yALEAD\/cgAAEAAgABAAAAAAAAAAAAAAAA"}
+00628{"flow_event_id":6,"flow_event_name":"detected","thread_id":0,"packet_id":1,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"info","flow_packets_processed":1,"flow_first_seen":1538467333581,"flow_last_seen":1538467333581,"flow_idle_time":200000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":7,"flow_tot_l4_payload_len":7,"flow_avg_l4_payload_len":7,"midstream":0,"thread_ts_msec":1538467333581,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","ndpi": {"confidence": {"4":"DPI"},"proto":"XDMCP","breed":"Acceptable","category":"RemoteAccess"}}
+00470{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":2,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":2,"flow_last_seen":1538467333586,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":71,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":71,"pkt_l4_len":37,"thread_ts_msec":1538467333586,"pkt":"UlQAEjUACAAngNsFCABFAAA5uT5AAEARaW4KAQIECgECAgCx7\/IAJRg+AAEABQAXAAAAAAARV2lsbGluZyB0byBtYW5hZ2U="}
+00689{"packet_event_id":2,"packet_event_name":"packet-flow","thread_id":0,"packet_id":3,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_packet_id":3,"flow_last_seen":1538467333586,"flow_idle_time":200000,"pkt_oversize":false,"pkt_caplen":231,"pkt_type":2048,"pkt_l3_offset":14,"pkt_l4_offset":34,"pkt_len":231,"pkt_l4_len":197,"thread_ts_msec":1538467333586,"pkt":"CAAngNsFUlQAEjUACABFAADZIEMAAP8RgskKAQICCgECBO\/yALEAxWSsAAEABwC3AAAJAAAAAAAAAAAAAAAGAAYABgAGCQAExlrfKwAEwKg4AQAEqf5aAAAEqf5VYAAExj1eOQAQ\/oAAAAAAAAAUuwoXMyj2JAAQ\/oAAAAAAAAAND9alvNJ9SwAQ\/oAAAAAAAAClDBBzRudaAAAQ\/oAAAAAAAAChc6eH9dJVYAAAAAADABJNSVQtTUFHSUMtQ09PS0lFLTEAE1hETS1BVVRIT1JJWkFUSU9OLTEACVNVTi1ERVMtMQAA"}
+00672{"flow_event_id":3,"flow_event_name":"idle","thread_id":0,"packet_id":6,"source":"xdmcp.pcap","alias":"nDPId-test","flow_id":1,"flow_state":"finished","flow_packets_processed":6,"flow_first_seen":1538467333581,"flow_last_seen":1538467336601,"flow_idle_time":200000,"flow_min_l4_payload_len":7,"flow_max_l4_payload_len":189,"flow_tot_l4_payload_len":335,"flow_avg_l4_payload_len":55,"midstream":0,"thread_ts_msec":1538467336601,"l3_proto":"ip4","src_ip":"10.1.2.2","dst_ip":"10.1.2.4","src_port":61426,"dst_port":177,"l4_proto":"udp","flow_datalink":1,"flow_max_packets":3,"ndpi": {"confidence": {"4":"DPI"},"proto":"XDMCP","breed":"Acceptable","category":"RemoteAccess"}}
 00546{"daemon_event_id":3,"daemon_event_name":"shutdown","thread_id":0,"packet_id":6,"source":"xdmcp.pcap","alias":"nDPId-test","packets-captured":6,"packets-processed":6,"total-skipped-flows":0,"total-l4-data-len":335,"total-not-detected-flows":0,"total-guessed-flows":0,"total-detected-flows":1,"total-detection-updates":0,"total-updates":0,"current-active-flows":0,"total-active-flows":1,"total-idle-flows":1,"total-compressions":0,"total-compression-diff":0,"current-compression-diff":0,"total-events-serialized":9,"global_ts_msec":1538467336601}
 ~~~~~~~~~~~~~~~~~~~~ SUMMARY ~~~~~~~~~~~~~~~~~~~~
 ~~ packets captured/processed: 6/6