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 cd5cf5c9e305e7f71e379af5a3d81f0d9bbc447c..d33d7f2374c79faa5f7c5cff20542b82250e5d09 100644 (file)
--- 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 cb3321b2e97865170e44635b50b4129444979f13..b209c75558ebd34a6c210e65b660ae76f1c303d1 100644 (file)
--- 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 6054bd4acf6fd455389cf2ed3001d94baf38c69a..958becce67002dded327d47f763ada9692b9dd3d 100644 (file)
--- 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 a2cde067b40906f6363a1c194eaa48c9e790dfd5..1ef1154fd20f3eb5dc26cd68f5cf31f82fd7c7f6 100644 (file)
--- 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 3ad43b43a9c6e746ae76b8190575c72f8ab63b31..8a09d36755f0bd7cc8ab2c99be743e29f9a52a9c 100644 (file)
--- 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 7166dd13d03dfc6611cd5c7bd0d17d5c3e9f494f..a5da29729d612bde7ce9eed2915f05a4efebe23f 100644 (file)
--- 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 1fa1b7e93463568ecf777a31174042bba3bc09f7..b5eb8e741f42397990bc9dcc289e1e0c64880ed0 100644 (file)
--- 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 493be73f8a971e26e5944b207409d678bb8e7ea7..8c21e11bbe8b554fc630a9a8863293a8c3ef1813 100644 (file)
--- 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 6f9915ca653bfba1b360f3a746c0456c2db1aba5..eee1ab787c6f87e8ac53f774da37e99255c567e3 100644 (file)
--- 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;