From: Jeff Lucovsky <jeff@lucovsky.org>
Date: Fri, 23 Aug 2019 00:12:28 +0000 (-0400)
Subject: ftp: remove RUST guards
X-Git-Tag: suricata-5.0.0-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f79316d71af0f993b2e24d5b735e3d5559b8574b;p=thirdparty%2Fsuricata.git

ftp: remove RUST guards
---

diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c
index 0e5b414917..cb6f3c1d40 100644
--- a/src/app-layer-ftp.c
+++ b/src/app-layer-ftp.c
@@ -59,9 +59,7 @@
 #include "util-mem.h"
 #include "util-misc.h"
 
-#ifdef HAVE_RUST
 #include "rust-ftp-mod-gen.h"
-#endif
 
 #include "output-json.h"
 
@@ -738,12 +736,7 @@ static int FTPParseRequest(Flow *f, void *ftp_state,
 
 static int FTPParsePassiveResponse(Flow *f, FtpState *state, uint8_t *input, uint32_t input_len)
 {
-    uint16_t dyn_port =
-#ifdef HAVE_RUST
-            rs_ftp_pasv_response(input, input_len);
-#else
-            FTPGetV4PortNumber(input, input_len);
-#endif
+    uint16_t dyn_port = rs_ftp_pasv_response(input, input_len);
     if (dyn_port == 0) {
         return -1;
     }
@@ -758,12 +751,7 @@ static int FTPParsePassiveResponse(Flow *f, FtpState *state, uint8_t *input, uin
 
 static int FTPParsePassiveResponseV6(Flow *f, FtpState *state, uint8_t *input, uint32_t input_len)
 {
-    uint16_t dyn_port =
-#ifdef HAVE_RUST
-            rs_ftp_epsv_response(input, input_len);
-#else
-            FTPGetV6PortNumber(input, input_len);
-#endif
+    uint16_t dyn_port = rs_ftp_epsv_response(input, input_len);
     if (dyn_port == 0) {
         return -1;
     }