From 2a29f79960b8153234074fee64b1aad45ae76e4f Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Mon, 12 Jun 2017 23:15:42 +0200 Subject: [PATCH] nfs: fix rust data type declaration --- src/app-layer-nfs3-udp.h | 4 ---- src/app-layer-nfs3.h | 4 ---- src/output-json-nfs3.c | 1 + src/rust.h | 4 ++++ 4 files changed, 5 insertions(+), 8 deletions(-) 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__ */