From: Victor Julien <victor@inliniac.net>
Date: Mon, 12 Jun 2017 21:15:42 +0000 (+0200)
Subject: nfs: fix rust data type declaration
X-Git-Tag: suricata-4.0.0-rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a29f79960b8153234074fee64b1aad45ae76e4f;p=thirdparty%2Fsuricata.git

nfs: fix rust data type declaration
---

diff --git a/src/app-layer-nfs3-udp.h b/src/app-layer-nfs3-udp.h
index 5c3be9a204..bfe105d592 100644
--- a/src/app-layer-nfs3-udp.h
+++ b/src/app-layer-nfs3-udp.h
@@ -27,8 +27,4 @@
 void RegisterNFS3UDPParsers(void);
 void NFS3UDPParserRegisterTests(void);
 
-/** Opaque Rust types. */
-typedef struct NFS3tate_ NFS3State;
-typedef struct NFS3Transaction_ NFS3Transaction;
-
 #endif /* __APP_LAYER_NFS3_H__ */
diff --git a/src/app-layer-nfs3.h b/src/app-layer-nfs3.h
index 9386c47a73..f50fb507ea 100644
--- a/src/app-layer-nfs3.h
+++ b/src/app-layer-nfs3.h
@@ -27,8 +27,4 @@
 void RegisterNFS3Parsers(void);
 void NFS3ParserRegisterTests(void);
 
-/** Opaque Rust types. */
-typedef struct NFS3tate_ NFS3State;
-typedef struct NFS3Transaction_ NFS3Transaction;
-
 #endif /* __APP_LAYER_NFS3_H__ */
diff --git a/src/output-json-nfs3.c b/src/output-json-nfs3.c
index ee988141de..c2d5d04ac5 100644
--- a/src/output-json-nfs3.c
+++ b/src/output-json-nfs3.c
@@ -55,6 +55,7 @@
 
 #ifdef HAVE_RUST
 #ifdef HAVE_LIBJANSSON
+#include "rust.h"
 #include "rust-nfs-log-gen.h"
 
 typedef struct LogNFS3FileCtx_ {
diff --git a/src/rust.h b/src/rust.h
index 58684b3648..1bcb13fb15 100644
--- a/src/rust.h
+++ b/src/rust.h
@@ -50,4 +50,8 @@ typedef struct SuricataFileContext_ {
 struct _Store;
 typedef struct _Store Store;
 
+/** Opaque Rust types. */
+typedef struct NFS3tate_ NFS3State;
+typedef struct NFS3Transaction_ NFS3Transaction;
+
 #endif /* !__RUST_H__ */