HTTP, Bittorrent, Kerberos: fix stopping of extra dissection (#1700)
The return value of the extra-dissection callback indicates if the extra dissection needs to be called again. In the HTTP cose, this setting to NULL of the callabck is wrong since we stop extra dissection only if we have a hostname *and* a return code.
This commit is contained in:
@@ -54,7 +54,7 @@ static int search_bittorrent_again(struct ndpi_detection_module_struct *ndpi_str
|
||||
ndpi_search_bittorrent_hash(ndpi_struct, flow, -1);
|
||||
|
||||
/* Possibly more processing */
|
||||
return(1);
|
||||
return flow->extra_packets_func != NULL;
|
||||
}
|
||||
|
||||
/* *********************************************** */
|
||||
|
||||
@@ -720,7 +720,6 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
|
||||
/* Copy result for nDPI apps */
|
||||
ndpi_hostname_sni_set(flow, packet->host_line.ptr, packet->host_line.len);
|
||||
flow->extra_packets_func = NULL; /* We're good now */
|
||||
|
||||
if(strlen(flow->host_server_name) > 0) {
|
||||
ndpi_check_dga_name(ndpi_struct, flow, flow->host_server_name, 1);
|
||||
|
||||
@@ -693,7 +693,7 @@ static int ndpi_search_kerberos_extra(struct ndpi_detection_module_struct *ndpi_
|
||||
ndpi_search_kerberos(ndpi_struct, flow);
|
||||
|
||||
/* Possibly more processing */
|
||||
return 1;
|
||||
return flow->extra_packets_func != NULL;
|
||||
}
|
||||
|
||||
void init_kerberos_dissector(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
Reference in New Issue
Block a user