Some small fixes (#1481)

FTP: if the authentication fails, stop analyzing the flow
WSD: call the initialization routine; the dissector code has never been
triggered
MINING: fix dissection
This commit is contained in:
Ivan Nardi
2022-03-08 00:21:51 +01:00
committed by GitHub
parent f91218360b
commit 269be6c7ef
6 changed files with 25 additions and 19 deletions
+3
View File
@@ -4280,6 +4280,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
/* EthernetIP */
init_ethernet_ip_dissector(ndpi_str, &a, detection_bitmask);
/* WSD */
init_wsd_dissector(ndpi_str, &a, detection_bitmask);
#ifdef CUSTOM_NDPI_PROTOCOLS
#include "../../../nDPI-custom/custom_ndpi_main_init.c"
#endif
+2
View File
@@ -570,6 +570,7 @@ static int ndpi_ftp_control_check_response(struct ndpi_flow_struct *flow,
case '4':
case '5':
flow->l4.tcp.ftp_imap_pop_smtp.auth_failed = 1;
flow->l4.tcp.ftp_imap_pop_smtp.auth_done = 1;
return(1);
break;
}
@@ -636,6 +637,7 @@ static void ndpi_check_ftp_control(struct ndpi_detection_module_struct *ndpi_str
#endif
if(flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0' &&
flow->l4.tcp.ftp_imap_pop_smtp.auth_done == 0 &&
flow->l4.tcp.ftp_imap_pop_smtp.auth_tls == 0) /* TODO: any values on dissecting TLS handshake? */
flow->ftp_control_stage = 0;
else
+2 -1
View File
@@ -87,7 +87,8 @@ void ndpi_search_mining_tcp(struct ndpi_detection_module_struct *ndpi_struct,
/* Check connection over TCP */
if(packet->tcp && (packet->payload_packet_len > 10)) {
if(packet->tcp->source == htons(8333)) {
if(packet->tcp->source == htons(8333) ||
packet->tcp->dest == htons(8333)) {
/*
Bitcoin