rust/ffi: use ThreadVars wrapper in eve callback signature

Author: jasonish

examples/plugins/rust/src/mod.rs

@@ -4,9 +4,11 @@ use suricata_ffi::eve::{self, SCJsonBuilder};
 use suricata_ffi::flow::{self, Flow};
 use suricata_ffi::jsonbuilder::JsonBuilder;
 use suricata_ffi::packet::Packet;
+use suricata_ffi::threadvars::ThreadVars;
 use suricata_ffi::{SCLogError, SCLogNotice};
 use suricata_sys::sys::{
-    Flow as RawFlow, Packet as RawPacket, SCEveRegisterCallback, SCPlugin, ThreadVars,
+    Flow as RawFlow, Packet as RawPacket, SCEveRegisterCallback, SCPlugin,
+    ThreadVars as RawThreadVars,
 };
 
 unsafe extern "C" fn init() {
@@ -42,7 +44,7 @@ pub fn register_flow_callbacks() -> Result<(), &'static str> {
 }
 
 unsafe extern "C" fn log_eve_raw(
-    _tv: *mut ThreadVars,
+    _tv: *mut RawThreadVars,
     _p: *const RawPacket,
     _f: *mut RawFlow,
     jb: *mut SCJsonBuilder,
@@ -55,7 +57,7 @@ unsafe extern "C" fn log_eve_raw(
 }
 
 fn log_eve_wrapped(
-    _tv: *mut ThreadVars,
+    _tv: ThreadVars<'_>,
     p: Option<Packet<'_>>,
     f: Option<Flow<'_>>,
     jb: &mut JsonBuilder,
@@ -68,23 +70,23 @@ fn log_eve_wrapped(
     Ok(())
 }
 
-fn log_flow_init(_tv: *mut ThreadVars, f: Flow<'_>, p: Option<Packet<'_>>) {
+fn log_flow_init(_tv: *mut RawThreadVars, f: Flow<'_>, p: Option<Packet<'_>>) {
     SCLogNotice!(
         "rust example flow init callback: flow={:p}, has_packet={}",
         f.as_ptr(),
         p.is_some()
     );
 }
 
-fn log_flow_update(_tv: *mut ThreadVars, f: Flow<'_>, p: Option<Packet<'_>>) {
+fn log_flow_update(_tv: *mut RawThreadVars, f: Flow<'_>, p: Option<Packet<'_>>) {
     SCLogNotice!(
         "rust example flow update callback: flow={:p}, has_packet={}",
         f.as_ptr(),
         p.is_some()
     );
 }
 
-fn log_flow_finish(_tv: *mut ThreadVars, f: Flow<'_>) {
+fn log_flow_finish(_tv: *mut RawThreadVars, f: Flow<'_>) {
     SCLogNotice!("rust example flow finish callback: flow={:p}", f.as_ptr());
 }
 

rust/ffi/src/eve.rs

@@ -19,7 +19,8 @@ use std::ffi::CString;
 use std::os::raw::c_void;
 
 pub use suricata_sys::sys::{
-    Flow as RawFlow, Packet as RawPacket, SCEveUserCallbackFn, SCJsonBuilder, ThreadVars,
+    Flow as RawFlow, Packet as RawPacket, SCEveUserCallbackFn, SCJsonBuilder,
+    ThreadVars as RawThreadVars,
 };
 use suricata_sys::sys::{
     SCEveFileType, SCEveFileTypeDeinitFunc, SCEveFileTypeInitFunc, SCEveFileTypeThreadDeinitFunc,
@@ -113,7 +114,7 @@ impl EveFileType {
 pub fn register_callback<F>(callback: F) -> Result<(), &'static str>
 where
     F: for<'a> Fn(
-            *mut ThreadVars,
+            crate::threadvars::ThreadVars<'a>,
             Option<crate::packet::Packet<'a>>,
             Option<crate::flow::Flow<'a>>,
             &mut crate::jsonbuilder::JsonBuilder,
@@ -136,11 +137,11 @@ where
 /// Internal wrapper used to adapt the C EVE callback to a Rust
 /// closure callback.
 unsafe extern "C" fn callback_wrapper<F>(
-    tv: *mut ThreadVars, p: *const RawPacket, f: *mut RawFlow, jb: *mut SCJsonBuilder,
+    tv: *mut RawThreadVars, p: *const RawPacket, f: *mut RawFlow, jb: *mut SCJsonBuilder,
     user: *mut c_void,
 ) where
     F: for<'a> Fn(
-            *mut ThreadVars,
+            crate::threadvars::ThreadVars<'a>,
             Option<crate::packet::Packet<'a>>,
             Option<crate::flow::Flow<'a>>,
             &mut crate::jsonbuilder::JsonBuilder,
@@ -162,7 +163,7 @@ unsafe extern "C" fn callback_wrapper<F>(
     } else {
         Some(crate::flow::Flow::from_ptr(f))
     };
-    if callback(tv, packet, flow, &mut jb).is_err() {
+    if callback(crate::threadvars::ThreadVars::from_ptr(tv), packet, flow, &mut jb).is_err() {
         let _ = jb.restore_mark(&mark);
     }
 }