Merge pull request #1311 from IvanNardi/ftp-start-tls

FTP: fix support for START-TLS sessions

2 files changed, 11 insertions, 1 deletions

diff --git a/python/ndpi.py b/python/ndpi.py
index a7b568451..3eea870e2 100644
--- a/python/ndpi.py
+++ b/python/ndpi.py
@@ -1086,7 +1086,7 @@ struct ndpi_flow_struct {
     } http;
 
     struct {
-      uint8_t auth_found:1, auth_failed:1, _pad:5;
+      uint8_t auth_found:1, auth_failed:1, auth_tls:1, _pad:5;
       char username[16], password[16];
     } ftp_imap_pop_smtp;
 
diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py
index 9413ca039..a0bdcee84 100644
--- a/python/ndpi_typestruct.py
+++ b/python/ndpi_typestruct.py
@@ -507,6 +507,15 @@ class Http2(Structure):
         ("nat_ip", c_char * 24)
     ]
 
+class FtpImapPopSmtp(Structure):
+    _fields_ = [
+        ("auth_found", c_uint8, 1),
+        ("auth_failed", c_uint8, 1),
+        ("auth_tls", c_uint8, 1),
+        ("_pad", c_uint8, 5),
+        ("username", c_char * 16),
+        ("password", c_char * 16)
+    ]
 
 class Bittorrent(Structure):
     _fields_ = [("hash", c_char * 20)]
@@ -529,6 +538,7 @@ class Protos(Union):
         ("mdns", Mdns),
         ("ubntac2", Ubntac2),
         ("http", Http2),
+        ("ftp_imap_pop_smtp", FtpImapPopSmtp),
         ("bittorrent", Bittorrent),
         ("dhcp", Dhcp)
     ]