From: Victor Julien <victor@inliniac.net>
Date: Mon, 26 Mar 2018 09:50:58 +0000 (+0200)
Subject: rust: remove multi level 'experimental'
X-Git-Tag: suricata-4.1.0-rc1~181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3315%2Fhead;p=thirdparty%2Fsuricata.git

rust: remove multi level 'experimental'

Don't treat 'external' parsers as more experimental. All parsers
depend on crates to some extend, and all have C glue code. So the
distinction doesn't really make sense.
---

diff --git a/configure.ac b/configure.ac
index 1e3a467406..1696623b73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2085,11 +2085,9 @@
 
 # Cargo/Rust.
     AC_ARG_ENABLE([rust], AS_HELP_STRING([--enable-rust], [Enable Experimental Rust support]))
-    AC_ARG_ENABLE([rust_experimental], AS_HELP_STRING([--enable-rust-experimental], [Enable support for experimental Rus parsers]))
 
     rust_config_enabled="no"        # used in suricata.yaml.in to enable/disable app-layers
     rust_config_comment="#"         # used in suricata.yaml.in to enable/disable eve loggers
-    rust_config_exp_enabled="no"    # used in suricata.yaml.in to enable/disable app-layers
     rust_vendor_comment="# "
     have_rust_vendor="no"
 
@@ -2152,20 +2150,10 @@
       fi
     fi
 
-    if test "x$enable_rust_experimental" = "xyes"; then
-        rust_config_exp_enabled="yes"
-        rust_config_exp_comment=""
-    else
-        enable_rust_experimental="no"
-    fi
-
     AM_CONDITIONAL([HAVE_RUST], [test "x$enable_rust" = "xyes"])
-    AM_CONDITIONAL([HAVE_RUST_EXTERNAL], [test "x$enable_rust_experimental" = "xyes"])
     AC_SUBST(rust_vendor_comment)
     AC_SUBST(rust_config_enabled)
     AC_SUBST(rust_config_comment)
-    AC_SUBST(rust_config_exp_comment)
-    AC_SUBST(rust_config_exp_enabled)
     AM_CONDITIONAL([HAVE_RUST_VENDOR], [test "x$have_rust_vendor" = "xyes"])
 
     if test "x$enable_rust" = "xyes"; then
@@ -2175,10 +2163,6 @@
         echo "       for building the distribution"
         echo "   To install: cargo install cargo-vendor"
       fi
-
-      if test "x$enable_rust_experimental" = "xyes"; then
-          AC_DEFINE([HAVE_RUST_EXTERNAL],[1],[Enable support for experimental Rust parsers])
-      fi
     fi
     AM_CONDITIONAL([HAVE_CARGO_VENDOR], [test "x$HAVE_CARGO_VENDOR" != "xno"])
 
@@ -2314,7 +2298,6 @@ SURICATA_BUILD_CONF="Suricata Configuration:
   Libnet support:                          ${enable_libnet}
 
   Rust support (experimental):             ${enable_rust}
-  Experimental Rust parsers:               ${enable_rust_experimental}
   Rust strict mode:                        ${enable_rust_strict}
   Rust debug mode:                         ${enable_rust_debug}
 
diff --git a/rust/Cargo.toml.in b/rust/Cargo.toml.in
index 4cb837437e..263b715dd0 100644
--- a/rust/Cargo.toml.in
+++ b/rust/Cargo.toml.in
@@ -10,7 +10,6 @@ debug = true
 
 [features]
 lua = []
-experimental = ["ntp-parser"]
 strict = []
 debug = []
 
@@ -21,5 +20,5 @@ crc = "~1.7.0"
 der-parser = "0.5.2"
 kerberos-parser = "0.1.0"
 
-ntp-parser = { version = "^0", optional = true }
+ntp-parser = "^0"
 ipsec-parser = "~0.3.0"
diff --git a/rust/Makefile.am b/rust/Makefile.am
index 6bc8a7b018..fc9b6a0a90 100644
--- a/rust/Makefile.am
+++ b/rust/Makefile.am
@@ -25,10 +25,6 @@ if HAVE_LUA
 RUST_FEATURES +=	lua
 endif
 
-if HAVE_RUST_EXTERNAL
-RUST_FEATURES +=	experimental
-endif
-
 if DEBUG
 RUST_FEATURES +=	debug
 endif
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index ba44491ee3..5e4689e943 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -52,6 +52,5 @@ pub mod smb;
 
 pub mod ikev2;
 
-#[cfg(feature = "experimental")]
 pub mod ntp;
 pub mod tftp;
diff --git a/src/app-layer-ntp.c b/src/app-layer-ntp.c
index aa5d700345..85e0aa223f 100644
--- a/src/app-layer-ntp.c
+++ b/src/app-layer-ntp.c
@@ -34,7 +34,7 @@
 
 #include "app-layer-ntp.h"
 
-#if defined(HAVE_RUST) && defined(HAVE_RUST_EXTERNAL)
+#if defined(HAVE_RUST)
 
 #include "rust-ntp-ntp-gen.h"
 
diff --git a/suricata.yaml.in b/suricata.yaml.in
index 9d4c0e9c3b..1fe208e234 100644
--- a/suricata.yaml.in
+++ b/suricata.yaml.in
@@ -1013,9 +1013,8 @@ app-layer:
         sp: 44818
 
     # Note: parser depends on experimental Rust support
-    # with --enable-rust-experimental passed to configure
     ntp:
-      enabled: @rust_config_exp_enabled@
+      enabled: @rust_config_enabled@
 
 # Limit for the maximum number of asn1 frames to decode (default 256)
 asn1-max-frames: 256