Avoid calling ndpi_reconcile_protocols() twice in ndpi_detection_giveup() (#1996)

`ndpi_reconcile_protocols()` is already called by
`ndpi_set_detected_protocol()`
This commit is contained in:
Ivan Nardi
2023-05-29 16:55:53 +02:00
committed by GitHub
parent 82fa3a0986
commit 346bb268e2
4 changed files with 6 additions and 7 deletions
+3 -4
View File
@@ -6432,16 +6432,15 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
if(ret.app_protocol == NDPI_PROTOCOL_UNKNOWN &&
flow->guessed_protocol_id_by_ip != NDPI_PROTOCOL_UNKNOWN) {
ndpi_int_change_protocol(ndpi_str, flow,
flow->guessed_protocol_id_by_ip, ret.master_protocol,
NDPI_CONFIDENCE_MATCH_BY_IP);
ndpi_set_detected_protocol(ndpi_str, flow,
flow->guessed_protocol_id_by_ip, ret.master_protocol,
NDPI_CONFIDENCE_MATCH_BY_IP);
ret.app_protocol = flow->detected_protocol_stack[0];
}
if(ret.app_protocol != NDPI_PROTOCOL_UNKNOWN) {
*protocol_was_guessed = 1;
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
ndpi_reconcile_protocols(ndpi_str, flow, &ret);
}
return(ret);
+1 -1
View File
@@ -14,7 +14,7 @@ LRU cache zoom: 0/0/0 (insert/search/found)
LRU cache stun: 6/42/18 (insert/search/found)
LRU cache tls_cert: 0/0/0 (insert/search/found)
LRU cache mining: 0/2/0 (insert/search/found)
LRU cache msteams: 28/20/16 (insert/search/found)
LRU cache msteams: 27/19/15 (insert/search/found)
LRU cache stun_zoom: 0/0/0 (insert/search/found)
Automa host: 85/71 (search/found)
Automa domain: 85/0 (search/found)
@@ -13,7 +13,7 @@ LRU cache zoom: 0/0/0 (insert/search/found)
LRU cache stun: 0/0/0 (insert/search/found)
LRU cache tls_cert: 0/0/0 (insert/search/found)
LRU cache mining: 0/2/0 (insert/search/found)
LRU cache msteams: 0/2/0 (insert/search/found)
LRU cache msteams: 0/1/0 (insert/search/found)
LRU cache stun_zoom: 0/0/0 (insert/search/found)
Automa host: 39/22 (search/found)
Automa domain: 39/0 (search/found)
+1 -1
View File
@@ -11,7 +11,7 @@ LRU cache zoom: 0/0/0 (insert/search/found)
LRU cache stun: 0/0/0 (insert/search/found)
LRU cache tls_cert: 0/8/0 (insert/search/found)
LRU cache mining: 0/1/0 (insert/search/found)
LRU cache msteams: 0/2/0 (insert/search/found)
LRU cache msteams: 0/1/0 (insert/search/found)
LRU cache stun_zoom: 0/0/0 (insert/search/found)
Automa host: 7/0 (search/found)
Automa domain: 7/0 (search/found)