From 960aa77b6da9bd70081621ae8e975e548ce7cc13 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 21 Oct 2019 01:27:07 +0200 Subject: Reworked email metaata extraction --- example/reader_util.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'example/reader_util.c') diff --git a/example/reader_util.c b/example/reader_util.c index dffd0128c..a8b91cd8e 100644 --- a/example/reader_util.c +++ b/example/reader_util.c @@ -948,25 +948,14 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl snprintf(flow->info, sizeof(flow->info), "%s", flow->ndpi_flow->protos.ubntac2.version); } /* FTP */ - else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_FTP_CONTROL) { - if(flow->ndpi_flow->protos.ftp.username[0] != '\0') + else if((flow->detected_protocol.app_protocol == NDPI_PROTOCOL_FTP_CONTROL) + || /* IMAP */ (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MAIL_IMAP) + || /* POP */ (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MAIL_POP) + || /* SMTP */ (flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MAIL_SMTP)) { + if(flow->ndpi_flow->protos.ftp_imap_pop_smtp.username[0] != '\0') snprintf(flow->info, sizeof(flow->info), "User: %s][Pwd: %s", - flow->ndpi_flow->protos.ftp.username, - flow->ndpi_flow->protos.ftp.password); - } - /* IMAP */ - else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MAIL_IMAP) { - if(flow->ndpi_flow->protos.imap.username[0] != '\0') - snprintf(flow->info, sizeof(flow->info), "User: %s][Pwd: %s", - flow->ndpi_flow->protos.imap.username, - flow->ndpi_flow->protos.imap.password); - } - /* POP */ - else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_MAIL_POP) { - if(flow->ndpi_flow->protos.pop.username[0] != '\0') - snprintf(flow->info, sizeof(flow->info), "User: %s][Pwd: %s", - flow->ndpi_flow->protos.pop.username, - flow->ndpi_flow->protos.pop.password); + flow->ndpi_flow->protos.ftp_imap_pop_smtp.username, + flow->ndpi_flow->protos.ftp_imap_pop_smtp.password); } /* KERBEROS */ else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_KERBEROS) { -- cgit v1.2.3