Skip to content

Commit

Permalink
ndpiReader: fix guessed_flow_protocols statistic
Browse files Browse the repository at this point in the history
Increment the counter only if the flow has been guessed
  • Loading branch information
IvanNardi committed Dec 10, 2023
1 parent c809e7c commit ed3d160
Show file tree
Hide file tree
Showing 102 changed files with 102 additions and 102 deletions.
2 changes: 1 addition & 1 deletion example/ndpiReader.c
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,7 @@ static void node_proto_guess_walker(const void *node, ndpi_VISIT which, int dept
flow->ndpi_flow, enable_protocol_guess, &proto_guessed);
malloc_size_stats = 0;

if(enable_protocol_guess) ndpi_thread_info[thread_id].workflow->stats.guessed_flow_protocols++;
if(proto_guessed) ndpi_thread_info[thread_id].workflow->stats.guessed_flow_protocols++;
}

process_ndpi_collected_info(ndpi_thread_info[thread_id].workflow, flow);
Expand Down
2 changes: 1 addition & 1 deletion example/reader_util.c
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,

flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow,
enable_protocol_guess, &proto_guessed);
if(enable_protocol_guess) workflow->stats.guessed_flow_protocols++;
if(proto_guessed) workflow->stats.guessed_flow_protocols++;
}

process_ndpi_collected_info(workflow, flow);
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/caches_cfg/result/teams.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 4
Guessed flow protos: 2

DPI Packets (TCP): 337 (8.02 pkts/flow)
DPI Packets (UDP): 74 (1.85 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/1kxun.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 25
Guessed flow protos: 6

DPI Packets (TCP): 408 (4.16 pkts/flow)
DPI Packets (UDP): 120 (1.21 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/4in4tunnel.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 5 (5.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/4in6tunnel.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 4 (4.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/6in4tunnel.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (TCP): 29 (5.80 pkts/flow)
DPI Packets (UDP): 4 (2.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/6in6tunnel.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/KakaoTalk_chat.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 8
Guessed flow protos: 5

DPI Packets (TCP): 166 (8.74 pkts/flow)
DPI Packets (UDP): 36 (2.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/KakaoTalk_talk.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 11
Guessed flow protos: 9

DPI Packets (TCP): 71 (4.73 pkts/flow)
DPI Packets (UDP): 10 (2.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/WebattackRCE.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 797
Guessed flow protos: 0

DPI Packets (TCP): 797 (1.00 pkts/flow)
Confidence DPI : 797 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/ajp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (TCP): 8 (4.00 pkts/flow)
DPI Packets (other): 6 (3.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/android.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 7
Guessed flow protos: 3

DPI Packets (TCP): 147 (5.25 pkts/flow)
DPI Packets (UDP): 52 (1.68 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/anyconnect-vpn.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 10
Guessed flow protos: 6

DPI Packets (TCP): 131 (5.95 pkts/flow)
DPI Packets (UDP): 82 (2.22 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/bt_search.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/capwap.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 7 (1.17 pkts/flow)
DPI Packets (other): 4 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/capwap_data.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 0

DPI Packets (TCP): 14 (4.67 pkts/flow)
Confidence DPI : 3 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/cloudflare-warp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 4
Guessed flow protos: 3

DPI Packets (TCP): 41 (5.12 pkts/flow)
Confidence Match by port : 2 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/dns_fragmented.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 12 (6.00 pkts/flow)
DPI Packets (UDP): 39 (2.05 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/dns_invert_query.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/dtls.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/dtls_certificate.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 1 (1.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/encrypted_sni.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 0

DPI Packets (TCP): 3 (1.00 pkts/flow)
Confidence DPI : 3 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/ftp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 39 (13.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/fuzz-2006-06-26-2594.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 172
Guessed flow protos: 27

DPI Packets (TCP): 48 (2.29 pkts/flow)
DPI Packets (UDP): 369 (1.64 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/fuzz-2006-09-29-28586.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 36
Guessed flow protos: 26

DPI Packets (TCP): 104 (2.67 pkts/flow)
DPI Packets (other): 1 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/fuzz-2020-02-16-11740.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 22
Guessed flow protos: 3

DPI Packets (UDP): 70 (1.00 pkts/flow)
DPI Packets (other): 7 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/fuzz-2021-10-13.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 1 (1.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/gnutella.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 394
Guessed flow protos: 1

DPI Packets (TCP): 528 (3.85 pkts/flow)
DPI Packets (UDP): 886 (1.45 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/gtp_false_positive.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 2

DPI Packets (UDP): 7 (2.33 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/h323-overflow.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 1 (1.00 pkts/flow)
Confidence nBPF : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/http_asymmetric.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 21 (10.50 pkts/flow)
Confidence DPI : 2 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/imaps.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 15 (7.50 pkts/flow)
Confidence DPI : 2 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/instagram.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 12
Guessed flow protos: 7

DPI Packets (TCP): 219 (7.30 pkts/flow)
DPI Packets (UDP): 10 (1.43 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/ip_fragmented_garbage.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 29 (29.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/iphone.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 1

DPI Packets (TCP): 107 (7.13 pkts/flow)
DPI Packets (UDP): 55 (1.77 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/ipv6_in_gtp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 1 (1.00 pkts/flow)
DPI Packets (other): 1 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/kerberos.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 29
Guessed flow protos: 23

DPI Packets (TCP): 77 (2.14 pkts/flow)
Confidence Unknown : 2 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/kerberos_fuzz.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 1 (1.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/kontiki.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (UDP): 6 (1.50 pkts/flow)
DPI Packets (other): 4 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/linecall_falsepositve.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 13 (13.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/log4j-webapp-exploit.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (TCP): 56 (8.00 pkts/flow)
Confidence Unknown : 2 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/lru_ipv6_caches.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 0

DPI Packets (TCP): 9 (3.00 pkts/flow)
DPI Packets (UDP): 36 (4.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/malware.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 1

DPI Packets (TCP): 26 (6.50 pkts/flow)
DPI Packets (UDP): 2 (2.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/mongodb.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 2

DPI Packets (TCP): 27 (3.38 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/mpeg-dash.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 3
Guessed flow protos: 0

DPI Packets (TCP): 13 (3.25 pkts/flow)
Confidence DPI : 4 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/natpmp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 4
Guessed flow protos: 0

DPI Packets (UDP): 11 (2.75 pkts/flow)
Confidence DPI : 4 (flows)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 1 (1.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/no_sni.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 51 (6.38 pkts/flow)
Confidence DPI : 8 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/ocs.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 13
Guessed flow protos: 2

DPI Packets (TCP): 92 (7.67 pkts/flow)
DPI Packets (UDP): 8 (1.00 pkts/flow)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 4 (4.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/pop3.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (TCP): 83 (13.83 pkts/flow)
Confidence DPI : 6 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/pops.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 5 (5.00 pkts/flow)
Confidence DPI : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/pps.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 38
Guessed flow protos: 2

DPI Packets (TCP): 141 (2.24 pkts/flow)
DPI Packets (UDP): 136 (3.09 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/punycode-idn.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 8 (8.00 pkts/flow)
DPI Packets (UDP): 4 (2.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/quic_interop_V.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 33
Guessed flow protos: 0

DPI Packets (UDP): 113 (1.79 pkts/flow)
DPI Packets (other): 14 (1.00 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/quickplay.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 8
Guessed flow protos: 0

DPI Packets (TCP): 78 (3.71 pkts/flow)
Confidence DPI : 21 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/reasm_crash_anon.pcapng.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 23 (23.00 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/shadowsocks.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 21 (10.50 pkts/flow)
Confidence Unknown : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/skype.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 95
Guessed flow protos: 28

DPI Packets (TCP): 1493 (15.39 pkts/flow)
DPI Packets (UDP): 337 (1.76 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/skype_no_unknown.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 69
Guessed flow protos: 22

DPI Packets (TCP): 1053 (13.86 pkts/flow)
DPI Packets (UDP): 288 (1.55 pkts/flow)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/snmp.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 0

DPI Packets (UDP): 24 (1.41 pkts/flow)
Confidence DPI : 17 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/soap.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 2
Guessed flow protos: 1

DPI Packets (TCP): 20 (6.67 pkts/flow)
Confidence Match by port : 1 (flows)
Expand Down
2 changes: 1 addition & 1 deletion tests/cfgs/default/result/softether.pcap.out
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Guessed flow protos: 1
Guessed flow protos: 0

DPI Packets (TCP): 4 (4.00 pkts/flow)
DPI Packets (UDP): 31 (10.33 pkts/flow)
Expand Down
Loading

0 comments on commit ed3d160

Please sign in to comment.