First step in simplify ndpi_process_extra_packet() (#1680)
Move the prottocol specific logic into the proper dissector code, where it belongs. Next step: remove that list of protocols. Long goal: remove this function altogether...
This commit is contained in:
+3
-40
@@ -5778,8 +5778,10 @@ void ndpi_process_extra_packet(struct ndpi_detection_module_struct *ndpi_str, st
|
|||||||
|
|
||||||
/* call the extra packet function (which may add more data/info to flow) */
|
/* call the extra packet function (which may add more data/info to flow) */
|
||||||
if(flow->extra_packets_func) {
|
if(flow->extra_packets_func) {
|
||||||
if((flow->extra_packets_func(ndpi_str, flow)) == 0)
|
if((flow->extra_packets_func(ndpi_str, flow)) == 0) {
|
||||||
flow->check_extra_packets = 0;
|
flow->check_extra_packets = 0;
|
||||||
|
flow->extra_packets_func = NULL; /* Enough packets detected */
|
||||||
|
}
|
||||||
|
|
||||||
if(++flow->num_extra_packets_checked == flow->max_extra_packets_to_check)
|
if(++flow->num_extra_packets_checked == flow->max_extra_packets_to_check)
|
||||||
flow->extra_packets_func = NULL; /* Enough packets detected */
|
flow->extra_packets_func = NULL; /* Enough packets detected */
|
||||||
@@ -8116,61 +8118,22 @@ u_int8_t ndpi_extra_dissection_possible(struct ndpi_detection_module_struct *ndp
|
|||||||
switch(proto) {
|
switch(proto) {
|
||||||
case NDPI_PROTOCOL_TLS:
|
case NDPI_PROTOCOL_TLS:
|
||||||
case NDPI_PROTOCOL_DTLS:
|
case NDPI_PROTOCOL_DTLS:
|
||||||
if(flow->l4.tcp.tls.certificate_processed) return(0);
|
|
||||||
|
|
||||||
if(flow->l4.tcp.tls.num_tls_blocks <= ndpi_str->num_tls_blocks_to_follow) {
|
|
||||||
// printf("*** %u/%u\n", flow->l4.tcp.tls.num_tls_blocks, ndpi_str->num_tls_blocks_to_follow);
|
|
||||||
return(1);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_HTTP:
|
case NDPI_PROTOCOL_HTTP:
|
||||||
case NDPI_PROTOCOL_HTTP_PROXY:
|
case NDPI_PROTOCOL_HTTP_PROXY:
|
||||||
case NDPI_PROTOCOL_HTTP_CONNECT:
|
case NDPI_PROTOCOL_HTTP_CONNECT:
|
||||||
if((flow->host_server_name[0] == '\0') || (flow->http.response_status_code == 0))
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_DNS:
|
case NDPI_PROTOCOL_DNS:
|
||||||
case NDPI_PROTOCOL_MDNS:
|
case NDPI_PROTOCOL_MDNS:
|
||||||
if(flow->protos.dns.num_answers == 0)
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_FTP_CONTROL:
|
case NDPI_PROTOCOL_FTP_CONTROL:
|
||||||
if(flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0' &&
|
|
||||||
flow->l4.tcp.ftp_imap_pop_smtp.auth_tls == 0 &&
|
|
||||||
flow->l4.tcp.ftp_imap_pop_smtp.auth_done == 0)
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
case NDPI_PROTOCOL_MAIL_POP:
|
case NDPI_PROTOCOL_MAIL_POP:
|
||||||
case NDPI_PROTOCOL_MAIL_IMAP:
|
case NDPI_PROTOCOL_MAIL_IMAP:
|
||||||
case NDPI_PROTOCOL_MAIL_SMTP:
|
case NDPI_PROTOCOL_MAIL_SMTP:
|
||||||
if(flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0' &&
|
|
||||||
(flow->l4.tcp.ftp_imap_pop_smtp.auth_tls == 1 ||
|
|
||||||
flow->l4.tcp.ftp_imap_pop_smtp.auth_done == 0))
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_SSH:
|
case NDPI_PROTOCOL_SSH:
|
||||||
if((flow->protos.ssh.hassh_client[0] == '\0') || (flow->protos.ssh.hassh_server[0] == '\0'))
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_TELNET:
|
case NDPI_PROTOCOL_TELNET:
|
||||||
if(!flow->protos.telnet.password_detected)
|
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_SKYPE_TEAMS:
|
case NDPI_PROTOCOL_SKYPE_TEAMS:
|
||||||
case NDPI_PROTOCOL_QUIC:
|
case NDPI_PROTOCOL_QUIC:
|
||||||
case NDPI_PROTOCOL_KERBEROS:
|
case NDPI_PROTOCOL_KERBEROS:
|
||||||
case NDPI_PROTOCOL_SNMP:
|
case NDPI_PROTOCOL_SNMP:
|
||||||
return(1);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NDPI_PROTOCOL_BITTORRENT:
|
case NDPI_PROTOCOL_BITTORRENT:
|
||||||
if(flow->protos.bittorrent.hash[0] == '\0')
|
|
||||||
return(1);
|
return(1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -370,6 +370,9 @@ static int search_dns_again(struct ndpi_detection_module_struct *ndpi_struct, st
|
|||||||
/* possibly dissect the DNS reply */
|
/* possibly dissect the DNS reply */
|
||||||
ndpi_search_dns(ndpi_struct, flow);
|
ndpi_search_dns(ndpi_struct, flow);
|
||||||
|
|
||||||
|
if(flow->protos.dns.num_answers != 0)
|
||||||
|
return(0);
|
||||||
|
|
||||||
/* Possibly more processing */
|
/* Possibly more processing */
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,6 +46,7 @@
|
|||||||
static void ndpi_int_mail_pop_add_connection(struct ndpi_detection_module_struct
|
static void ndpi_int_mail_pop_add_connection(struct ndpi_detection_module_struct
|
||||||
*ndpi_struct, struct ndpi_flow_struct *flow) {
|
*ndpi_struct, struct ndpi_flow_struct *flow) {
|
||||||
|
|
||||||
|
NDPI_LOG_INFO(ndpi_struct, "mail_pop identified\n");
|
||||||
flow->guessed_protocol_id = NDPI_PROTOCOL_UNKNOWN; /* Avoid POP3S to be used s sub-protocol */
|
flow->guessed_protocol_id = NDPI_PROTOCOL_UNKNOWN; /* Avoid POP3S to be used s sub-protocol */
|
||||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_POP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
|
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MAIL_POP, NDPI_PROTOCOL_UNKNOWN, NDPI_CONFIDENCE_DPI);
|
||||||
}
|
}
|
||||||
@@ -185,12 +186,12 @@ void ndpi_search_mail_pop_tcp(struct ndpi_detection_module_struct
|
|||||||
|
|
||||||
if((bit_count + flow->l4.tcp.mail_pop_stage) >= 3) {
|
if((bit_count + flow->l4.tcp.mail_pop_stage) >= 3) {
|
||||||
if(flow->l4.tcp.mail_pop_stage > 0) {
|
if(flow->l4.tcp.mail_pop_stage > 0) {
|
||||||
NDPI_LOG_INFO(ndpi_struct, "mail_pop identified\n");
|
|
||||||
|
|
||||||
if((flow->l4.tcp.ftp_imap_pop_smtp.password[0] != '\0')
|
if((flow->l4.tcp.ftp_imap_pop_smtp.password[0] != '\0')
|
||||||
|| (flow->l4.tcp.mail_pop_stage > 3)) {
|
|| (flow->l4.tcp.mail_pop_stage > 3)) {
|
||||||
ndpi_int_mail_pop_add_connection(ndpi_struct, flow);
|
ndpi_int_mail_pop_add_connection(ndpi_struct, flow);
|
||||||
popInitExtraPacketProcessing(flow);
|
if(flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0')
|
||||||
|
popInitExtraPacketProcessing(flow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -440,7 +440,9 @@ int ndpi_extra_search_mail_smtp_tcp(struct ndpi_detection_module_struct *ndpi_st
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
ndpi_search_mail_smtp_tcp(ndpi_struct, flow);
|
ndpi_search_mail_smtp_tcp(ndpi_struct, flow);
|
||||||
rc = (flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0') ? 1 : 0;
|
rc = ((flow->l4.tcp.ftp_imap_pop_smtp.password[0] == '\0') &&
|
||||||
|
(flow->l4.tcp.ftp_imap_pop_smtp.auth_tls == 1 ||
|
||||||
|
flow->l4.tcp.ftp_imap_pop_smtp.auth_done == 0)) ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef SMTP_DEBUG
|
#ifdef SMTP_DEBUG
|
||||||
|
|||||||
@@ -936,7 +936,7 @@ static int ndpi_search_tls_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
u_int8_t content_type;
|
u_int8_t content_type;
|
||||||
|
|
||||||
if(message->buffer_used < 5)
|
if(message->buffer_used < 5)
|
||||||
return(1); /* Keep working */
|
break;
|
||||||
|
|
||||||
len = (message->buffer[3] << 8) + message->buffer[4] + 5;
|
len = (message->buffer[3] << 8) + message->buffer[4] + 5;
|
||||||
|
|
||||||
@@ -1074,6 +1074,8 @@ static int ndpi_search_tls_tcp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
if(something_went_wrong
|
if(something_went_wrong
|
||||||
|| ((ndpi_struct->num_tls_blocks_to_follow > 0)
|
|| ((ndpi_struct->num_tls_blocks_to_follow > 0)
|
||||||
&& (flow->l4.tcp.tls.num_tls_blocks == ndpi_struct->num_tls_blocks_to_follow))
|
&& (flow->l4.tcp.tls.num_tls_blocks == ndpi_struct->num_tls_blocks_to_follow))
|
||||||
|
|| ((ndpi_struct->num_tls_blocks_to_follow == 0)
|
||||||
|
&& (flow->l4.tcp.tls.certificate_processed == 1))
|
||||||
) {
|
) {
|
||||||
#ifdef DEBUG_TLS_BLOCKS
|
#ifdef DEBUG_TLS_BLOCKS
|
||||||
printf("*** [TLS Block] No more blocks\n");
|
printf("*** [TLS Block] No more blocks\n");
|
||||||
@@ -1187,7 +1189,7 @@ static int ndpi_search_tls_udp(struct ndpi_detection_module_struct *ndpi_struct,
|
|||||||
packet->payload = p;
|
packet->payload = p;
|
||||||
packet->payload_packet_len = p_len; /* Restore */
|
packet->payload_packet_len = p_len; /* Restore */
|
||||||
|
|
||||||
if(no_dtls || change_cipher_found) {
|
if(no_dtls || change_cipher_found || flow->l4.tcp.tls.certificate_processed) {
|
||||||
NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_DTLS);
|
NDPI_EXCLUDE_PROTO_EXT(ndpi_struct, flow, NDPI_PROTOCOL_DTLS);
|
||||||
flow->check_extra_packets = 0;
|
flow->check_extra_packets = 0;
|
||||||
flow->extra_packets_func = NULL;
|
flow->extra_packets_func = NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user