From 2525ea2e37e787af3f5e882acca341a99d9f0b15 Mon Sep 17 00:00:00 2001 From: Philippe Antoine Date: Mon, 11 May 2026 22:22:23 +0200 Subject: [PATCH] rust/ffi: move direction to ffi Ticket: 7666 --- rust/{ => ffi}/src/direction.rs | 11 ++++------- rust/ffi/src/lib.rs | 1 + rust/src/lib.rs | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) rename rust/{ => ffi}/src/direction.rs (94%) diff --git a/rust/src/direction.rs b/rust/ffi/src/direction.rs similarity index 94% rename from rust/src/direction.rs rename to rust/ffi/src/direction.rs index 7cf10a0a37..80603aa482 100644 --- a/rust/src/direction.rs +++ b/rust/ffi/src/direction.rs @@ -15,13 +15,16 @@ * 02110-1301, USA. */ +use crate::debug_validate_fail; + pub const DIR_BOTH: u8 = 0b0000_1100; const DIR_TOSERVER: u8 = 0b0000_0100; const DIR_TOCLIENT: u8 = 0b0000_1000; #[repr(C)] -#[derive(Debug, PartialEq, Eq, Clone, Copy)] +#[derive(Debug, Default, PartialEq, Eq, Clone, Copy)] pub enum Direction { + #[default] ToServer = 0x04, ToClient = 0x08, } @@ -45,12 +48,6 @@ impl Direction { } } -impl Default for Direction { - fn default() -> Self { - Direction::ToServer - } -} - impl std::fmt::Display for Direction { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { diff --git a/rust/ffi/src/lib.rs b/rust/ffi/src/lib.rs index 2be487dfb9..5203abb2ee 100644 --- a/rust/ffi/src/lib.rs +++ b/rust/ffi/src/lib.rs @@ -19,6 +19,7 @@ pub mod applayer; pub mod conf; pub mod debug; pub mod detect; +pub mod direction; pub mod eve; pub mod flow; pub mod jsonbuilder; diff --git a/rust/src/lib.rs b/rust/src/lib.rs index b0ff6c1c57..262a000ad6 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -139,7 +139,7 @@ pub mod feature; pub mod sdp; pub mod ldap; pub mod flow; -pub mod direction; +pub use suricata_ffi::direction; #[allow(unused_imports)] pub use suricata_lua_sys;