From: Jason Ish <jason.ish@oisf.net>
Date: Tue, 22 Dec 2020 16:40:18 +0000 (-0600)
Subject: rust: include file cleanup
X-Git-Tag: suricata-7.0.0-beta1~1914
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f77fd0c0cb5e8c86d8351b10432ffa0f185b22e6;p=thirdparty%2Fsuricata.git

rust: include file cleanup

The cbindgen generated header should not include rust.h as
rust.h already includes the generated binding.

Fixup C source code that only pulled the generated include, it
should instead pull in "rust.h" which includes the generated
binding plus other misc. stuff.
---

diff --git a/rust/cbindgen.toml b/rust/cbindgen.toml
index cd5cf5c9e3..d33d7f2374 100644
--- a/rust/cbindgen.toml
+++ b/rust/cbindgen.toml
@@ -43,7 +43,7 @@ include_version = true
 
 # A list of headers to #include (with quotes)
 # default: []
-includes = ["rust.h"]
+includes = []
 
 # The desired length of a line to use when formatting lines
 # default: 100
diff --git a/src/detect-mqtt-connack-sessionpresent.c b/src/detect-mqtt-connack-sessionpresent.c
index cb3321b2e9..b209c75558 100644
--- a/src/detect-mqtt-connack-sessionpresent.c
+++ b/src/detect-mqtt-connack-sessionpresent.c
@@ -30,7 +30,7 @@
 #include "detect-mqtt-connack-sessionpresent.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 #define PARSE_REGEX "^true|false|yes|no$"
 static DetectParseRegex parse_regex;
diff --git a/src/detect-mqtt-connect-flags.c b/src/detect-mqtt-connect-flags.c
index 6054bd4acf..958becce67 100644
--- a/src/detect-mqtt-connect-flags.c
+++ b/src/detect-mqtt-connect-flags.c
@@ -30,7 +30,7 @@
 #include "detect-mqtt-connect-flags.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 #define PARSE_REGEX "(?: *,?!?(?:username|password|will|will_retain|clean_session))+"
 static DetectParseRegex parse_regex;
diff --git a/src/detect-mqtt-flags.c b/src/detect-mqtt-flags.c
index a2cde067b4..1ef1154fd2 100644
--- a/src/detect-mqtt-flags.c
+++ b/src/detect-mqtt-flags.c
@@ -30,7 +30,7 @@
 #include "detect-mqtt-flags.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 #define PARSE_REGEX "(?: *,?!?(?:retain|dup))+"
 static DetectParseRegex parse_regex;
diff --git a/src/detect-mqtt-protocol-version.c b/src/detect-mqtt-protocol-version.c
index 3ad43b43a9..8a09d36755 100644
--- a/src/detect-mqtt-protocol-version.c
+++ b/src/detect-mqtt-protocol-version.c
@@ -32,7 +32,7 @@
 #include "util-byte.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 static int mqtt_protocol_version_id = 0;
 
diff --git a/src/detect-mqtt-qos.c b/src/detect-mqtt-qos.c
index 7166dd13d0..a5da29729d 100644
--- a/src/detect-mqtt-qos.c
+++ b/src/detect-mqtt-qos.c
@@ -31,7 +31,7 @@
 #include "util-byte.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 static int mqtt_qos_id = 0;
 
diff --git a/src/detect-mqtt-reason-code.c b/src/detect-mqtt-reason-code.c
index 1fa1b7e934..b5eb8e741f 100644
--- a/src/detect-mqtt-reason-code.c
+++ b/src/detect-mqtt-reason-code.c
@@ -31,7 +31,7 @@
 #include "util-byte.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 #define PARSE_REGEX "^\\s*\\d+\\s*$"
 static DetectParseRegex parse_regex;
diff --git a/src/detect-mqtt-type.c b/src/detect-mqtt-type.c
index 493be73f8a..8c21e11bbe 100644
--- a/src/detect-mqtt-type.c
+++ b/src/detect-mqtt-type.c
@@ -30,7 +30,7 @@
 #include "detect-mqtt-type.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 static int mqtt_type_id = 0;
 
diff --git a/src/detect-rfb-secresult.c b/src/detect-rfb-secresult.c
index 6f9915ca65..eee1ab787c 100644
--- a/src/detect-rfb-secresult.c
+++ b/src/detect-rfb-secresult.c
@@ -30,7 +30,7 @@
 #include "detect-rfb-secresult.h"
 #include "util-unittest.h"
 
-#include "rust-bindings.h"
+#include "rust.h"
 
 #define PARSE_REGEX "\\S[A-z]"
 static DetectParseRegex parse_regex;