From: Victor Julien <victor@inliniac.net>
Date: Tue, 11 Jun 2019 10:09:38 +0000 (+0200)
Subject: ftp: implement progress tracking
X-Git-Tag: suricata-5.0.0-rc1~188
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc80d520affa690c0f7141fb55aaec47fbf2ade4;p=thirdparty%2Fsuricata.git

ftp: implement progress tracking

Make sure FTP_STATE_FINISHED is returned for transactions that
are marked 'done'.

This is necessary for timely logging and inspection.
---

diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 0916b2ac75..26c0f99300 100644
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -1014,9 +1014,10 @@ static int FTPGetAlstateProgress(void *vtx, uint8_t direction)
         return FTP_STATE_PORT_DONE;
     }
 
-    /* TODO: figure out further progress handling */
+    if (!tx->done)
+        return FTP_STATE_IN_PROGRESS;
 
-    return FTP_STATE_IN_PROGRESS;
+    return FTP_STATE_FINISHED;
 }