rust/debug: use functions from ffi crate where possible

It's not possible to use all the functions and macros from the ffi crate
in the main Suricata crate, as there are conditionals around when
running in test mode, and "cargo test" doesn't propagate the "cfg(test)"
to test crates.

Which for now means duplicating the macros and some functions.

Author: jasonish

rust/Cargo.lock.in

@@ -87,6 +87,7 @@ time = "=0.3.41"
 
 suricata-derive = { path = "./derive", version = "@PACKAGE_VERSION@" }
 suricata-sys = { path = "./sys", version = "@PACKAGE_VERSION@" }
+suricata-ffi = { path = "./ffi", version = "@PACKAGE_VERSION@" }
 
 suricata-lua-sys = { version = "5.4.8002" }
 

rust/Cargo.toml.in

@@ -17,11 +17,11 @@
 
 //! Logging and debug utilities, like util-debug.c.
 
-use std::{ffi::CString, path::Path};
+use std::path::Path;
 
-use suricata_sys::sys::{SCFatalErrorOnInitStatic, SCLogLevel};
+use suricata_sys::sys::SCLogLevel;
 #[cfg(not(test))]
-use suricata_sys::sys::{SCError, SCLogMessage};
+use suricata_sys::sys::SCError;
 
 pub static mut LEVEL: SCLogLevel = SCLogLevel::SC_LOG_NOTSET;
 
@@ -44,12 +44,6 @@ fn basename(filename: &str) -> &str {
     return filename;
 }
 
-pub fn fatalerror(message: &str) {
-    unsafe {
-        SCFatalErrorOnInitStatic(to_safe_cstring(message).as_ptr());
-    }
-}
-
 pub fn sclog(level: SCLogLevel, file: &str, line: u32, function: &str, message: &str) {
     let filename = basename(file);
     let noext = &filename[0..filename.len() - 3];
@@ -64,16 +58,7 @@ pub fn sc_log_message(
     level: SCLogLevel, filename: &str, line: std::os::raw::c_uint, function: &str, module: &str,
     message: &str,
 ) -> SCError {
-    unsafe {
-        return SCLogMessage(
-            level,
-            to_safe_cstring(filename).as_ptr(),
-            line,
-            to_safe_cstring(function).as_ptr(),
-            to_safe_cstring(module).as_ptr(),
-            to_safe_cstring(message).as_ptr(),
-        );
-    }
+    suricata_ffi::debug::log_message(level, filename, line, function, module, message)
 }
 
 #[cfg(test)]
@@ -92,20 +77,6 @@ pub fn sc_log_message(
     return 0;
 }
 
-// Convert a &str into a CString by first stripping NUL bytes.
-fn to_safe_cstring(val: &str) -> CString {
-    let mut safe = Vec::with_capacity(val.len());
-    for c in val.as_bytes() {
-        if *c != 0 {
-            safe.push(*c);
-        }
-    }
-    match CString::new(safe) {
-        Ok(cstr) => cstr,
-        _ => CString::new("<failed to encode string>").unwrap(),
-    }
-}
-
 // This macro returns the function name.
 //
 // This macro has been borrowed from https://github.com/popzxc/stdext-rs, which
@@ -199,7 +170,7 @@ macro_rules! SCLogDebug {
 #[macro_export]
 macro_rules!SCFatalErrorOnInit {
     ($($arg:tt)*) => {
-        $crate::debug::fatalerror(&format!($($arg)*));
+        suricata_ffi::debug::fatalerror(&format!($($arg)*));
     }
 }