aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--example/reader_util.c1
-rw-r--r--src/lib/ndpi_main.c1
-rw-r--r--tests/result/Oscar.pcap.out4
-rw-r--r--tests/result/anyconnect-vpn.pcap.out2
-rw-r--r--tests/result/ftp.pcap.out2
-rw-r--r--tests/result/instagram.pcap.out2
-rw-r--r--tests/result/log4j-webapp-exploit.pcap.out2
-rw-r--r--tests/result/nest_log_sink.pcap.out2
-rw-r--r--tests/result/reasm_crash_anon.pcapng.out2
-rw-r--r--tests/result/reasm_segv_anon.pcapng.out2
-rw-r--r--tests/result/skype.pcap.out2
-rw-r--r--tests/result/skype_no_unknown.pcap.out2
-rw-r--r--tests/result/viber.pcap.out2
-rw-r--r--tests/result/wa_video.pcap.out2
14 files changed, 15 insertions, 13 deletions
diff --git a/example/reader_util.c b/example/reader_util.c
index 91eeb0775..94564bfed 100644
--- a/example/reader_util.c
+++ b/example/reader_util.c
@@ -1562,6 +1562,7 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
iph ? (uint8_t *)iph : (uint8_t *)iph6,
ipsize, time_ms);
+ enough_packets |= ndpi_flow->fail_with_unknown;
if(enough_packets || (flow->detected_protocol.app_protocol != NDPI_PROTOCOL_UNKNOWN)) {
if((!enough_packets)
&& ndpi_extra_dissection_possible(workflow->ndpi_struct, ndpi_flow))
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 2ba5bf385..172149824 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -6086,6 +6086,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct
if(ndpi_str->max_packets_to_process > 0 && flow->num_processed_pkts >= ndpi_str->max_packets_to_process) {
flow->extra_packets_func = NULL; /* To allow ndpi_extra_dissection_possible() to fail */
+ flow->fail_with_unknown = 1;
return(ret); /* Avoid spending too much time with this flow */
}
diff --git a/tests/result/Oscar.pcap.out b/tests/result/Oscar.pcap.out
index 7593d578a..a41b410ce 100644
--- a/tests/result/Oscar.pcap.out
+++ b/tests/result/Oscar.pcap.out
@@ -1,9 +1,9 @@
Guessed flow protos: 1
-DPI Packets (TCP): 71 (71.00 pkts/flow)
+DPI Packets (TCP): 33 (33.00 pkts/flow)
Confidence Match by port : 1 (flows)
Num dissector calls: 365 (365.00 diss/flow)
TLS 71 9386 1
- 1 TCP 10.30.29.3:63357 <-> 178.237.24.249:443 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][38 pkts/3580 bytes <-> 33 pkts/5806 bytes][Goodput ratio: 42/68][72.45 sec][bytes ratio: -0.237 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 2392/2607 58175/58215 10382/11142][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 94/176 369/1414 75/257][PLAIN TEXT (Adium/1.5.10)][Plen Bins: 7,58,5,5,0,0,5,2,2,7,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0]
+ 1 TCP 10.30.29.3:63357 <-> 178.237.24.249:443 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][38 pkts/3580 bytes <-> 33 pkts/5806 bytes][Goodput ratio: 42/68][72.45 sec][bytes ratio: -0.237 (Download)][IAT c2s/s2c min/avg/max/stddev: 0/0 2392/2607 58175/58215 10382/11142][Pkt Len c2s/s2c min/avg/max/stddev: 54/60 94/176 369/1414 75/257][Plen Bins: 7,58,5,5,0,0,5,2,2,7,0,0,0,0,2,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,0,0,0]
diff --git a/tests/result/anyconnect-vpn.pcap.out b/tests/result/anyconnect-vpn.pcap.out
index d5c6c41ba..355018a27 100644
--- a/tests/result/anyconnect-vpn.pcap.out
+++ b/tests/result/anyconnect-vpn.pcap.out
@@ -1,7 +1,7 @@
Guessed flow protos: 12
DPI Packets (TCP): 161 (7.32 pkts/flow)
-DPI Packets (UDP): 103 (2.78 pkts/flow)
+DPI Packets (UDP): 83 (2.24 pkts/flow)
DPI Packets (other): 10 (1.00 pkts/flow)
Confidence Unknown : 2 (flows)
Confidence Match by port : 5 (flows)
diff --git a/tests/result/ftp.pcap.out b/tests/result/ftp.pcap.out
index f83c57f2f..d1f432937 100644
--- a/tests/result/ftp.pcap.out
+++ b/tests/result/ftp.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 1
-DPI Packets (TCP): 97 (32.33 pkts/flow)
+DPI Packets (TCP): 49 (16.33 pkts/flow)
Confidence Unknown : 1 (flows)
Confidence DPI : 2 (flows)
Num dissector calls: 691 (230.33 diss/flow)
diff --git a/tests/result/instagram.pcap.out b/tests/result/instagram.pcap.out
index 100ab28eb..f298e47e1 100644
--- a/tests/result/instagram.pcap.out
+++ b/tests/result/instagram.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 15
-DPI Packets (TCP): 360 (12.00 pkts/flow)
+DPI Packets (TCP): 295 (9.83 pkts/flow)
DPI Packets (UDP): 10 (1.43 pkts/flow)
DPI Packets (other): 1 (1.00 pkts/flow)
Confidence Unknown : 1 (flows)
diff --git a/tests/result/log4j-webapp-exploit.pcap.out b/tests/result/log4j-webapp-exploit.pcap.out
index aa5170e9e..eaaf5d43f 100644
--- a/tests/result/log4j-webapp-exploit.pcap.out
+++ b/tests/result/log4j-webapp-exploit.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 2
-DPI Packets (TCP): 111 (15.86 pkts/flow)
+DPI Packets (TCP): 63 (9.00 pkts/flow)
Confidence Unknown : 2 (flows)
Confidence DPI : 5 (flows)
Num dissector calls: 549 (78.43 diss/flow)
diff --git a/tests/result/nest_log_sink.pcap.out b/tests/result/nest_log_sink.pcap.out
index fed1d3419..b947d9d10 100644
--- a/tests/result/nest_log_sink.pcap.out
+++ b/tests/result/nest_log_sink.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 1
-DPI Packets (TCP): 176 (13.54 pkts/flow)
+DPI Packets (TCP): 128 (9.85 pkts/flow)
DPI Packets (UDP): 2 (2.00 pkts/flow)
Confidence Match by IP : 1 (flows)
Confidence DPI : 13 (flows)
diff --git a/tests/result/reasm_crash_anon.pcapng.out b/tests/result/reasm_crash_anon.pcapng.out
index 7c223a646..0d0673956 100644
--- a/tests/result/reasm_crash_anon.pcapng.out
+++ b/tests/result/reasm_crash_anon.pcapng.out
@@ -1,6 +1,6 @@
Guessed flow protos: 1
-DPI Packets (TCP): 81 (81.00 pkts/flow)
+DPI Packets (TCP): 33 (33.00 pkts/flow)
Confidence Unknown : 1 (flows)
Num dissector calls: 337 (337.00 diss/flow)
diff --git a/tests/result/reasm_segv_anon.pcapng.out b/tests/result/reasm_segv_anon.pcapng.out
index 73a0cdfe4..81a29b683 100644
--- a/tests/result/reasm_segv_anon.pcapng.out
+++ b/tests/result/reasm_segv_anon.pcapng.out
@@ -1,6 +1,6 @@
Guessed flow protos: 1
-DPI Packets (TCP): 81 (81.00 pkts/flow)
+DPI Packets (TCP): 33 (33.00 pkts/flow)
Confidence Match by port : 1 (flows)
Num dissector calls: 336 (336.00 diss/flow)
diff --git a/tests/result/skype.pcap.out b/tests/result/skype.pcap.out
index db9211b9a..648edeced 100644
--- a/tests/result/skype.pcap.out
+++ b/tests/result/skype.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 97
-DPI Packets (TCP): 1691 (17.43 pkts/flow)
+DPI Packets (TCP): 1578 (16.27 pkts/flow)
DPI Packets (UDP): 337 (1.76 pkts/flow)
DPI Packets (other): 5 (1.00 pkts/flow)
Confidence Unknown : 61 (flows)
diff --git a/tests/result/skype_no_unknown.pcap.out b/tests/result/skype_no_unknown.pcap.out
index 65719b382..430e08735 100644
--- a/tests/result/skype_no_unknown.pcap.out
+++ b/tests/result/skype_no_unknown.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 72
-DPI Packets (TCP): 1159 (15.25 pkts/flow)
+DPI Packets (TCP): 1111 (14.62 pkts/flow)
DPI Packets (UDP): 288 (1.55 pkts/flow)
DPI Packets (other): 5 (1.00 pkts/flow)
Confidence Unknown : 45 (flows)
diff --git a/tests/result/viber.pcap.out b/tests/result/viber.pcap.out
index 31236788f..d0dd5055c 100644
--- a/tests/result/viber.pcap.out
+++ b/tests/result/viber.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 5
-DPI Packets (TCP): 131 (10.08 pkts/flow)
+DPI Packets (TCP): 106 (8.15 pkts/flow)
DPI Packets (UDP): 27 (1.93 pkts/flow)
DPI Packets (other): 2 (1.00 pkts/flow)
Confidence Match by IP : 4 (flows)
diff --git a/tests/result/wa_video.pcap.out b/tests/result/wa_video.pcap.out
index 6cfc8d954..405ee3006 100644
--- a/tests/result/wa_video.pcap.out
+++ b/tests/result/wa_video.pcap.out
@@ -1,6 +1,6 @@
Guessed flow protos: 1
-DPI Packets (TCP): 81 (81.00 pkts/flow)
+DPI Packets (TCP): 33 (33.00 pkts/flow)
DPI Packets (UDP): 13 (1.00 pkts/flow)
Confidence Match by IP : 1 (flows)
Confidence DPI : 13 (flows)
Powered by cgit, Themed by Ted Yin.