1 files changed, 36 insertions, 133 deletions
diff --git a/src/expr/verdict.rs b/src/expr/verdict.rs
index 3c4c374..7edf7cd 100644
--- a/src/expr/verdict.rs
+++ b/src/expr/verdict.rs
@@ -1,11 +1,39 @@
-use super::{DeserializationError, Expression, Rule};
-use crate::sys::{self, libc::{self, c_char}};
-use std::ffi::{CStr, CString};
+use std::fmt::Debug;
+
+use libc::{NF_ACCEPT, NF_DROP, NF_QUEUE};
+use rustables_macros::{nfnetlink_enum, nfnetlink_struct};
+
+use crate::sys::{
+    NFTA_VERDICT_CHAIN, NFTA_VERDICT_CHAIN_ID, NFTA_VERDICT_CODE, NFT_BREAK, NFT_CONTINUE,
+    NFT_GOTO, NFT_JUMP, NFT_RETURN,
+};
+
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+#[nfnetlink_enum(i32)]
+pub enum VerdictType {
+    Drop = NF_DROP,
+    Accept = NF_ACCEPT,
+    Queue = NF_QUEUE,
+    Continue = NFT_CONTINUE,
+    Break = NFT_BREAK,
+    Jump = NFT_JUMP,
+    Goto = NFT_GOTO,
+    Return = NFT_RETURN,
+}
+
+#[derive(Clone, PartialEq, Eq, Default, Debug)]
+#[nfnetlink_struct(nested = true)]
+pub struct Verdict {
+    #[field(NFTA_VERDICT_CODE)]
+    code: VerdictType,
+    #[field(NFTA_VERDICT_CHAIN)]
+    chain: String,
+    #[field(NFTA_VERDICT_CHAIN_ID)]
+    chain_id: u32,
+}
 
-/// A verdict expression. In the background, this is usually an "Immediate" expression in nftnl
-/// terms, but here it is simplified to only represent a verdict.
 #[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub enum Verdict {
+pub enum VerdictKind {
     /// Silently drop the packet.
     Drop,
     /// Accept the packet and let it pass.
@@ -14,135 +42,10 @@ pub enum Verdict {
     Continue,
     Break,
     Jump {
-        chain: CString,
+        chain: String,
     },
     Goto {
-        chain: CString,
+        chain: String,
     },
     Return,
 }
-
-impl Verdict {
-    fn chain(&self) -> Option<&CStr> {
-        match *self {
-            Verdict::Jump { ref chain } => Some(chain.as_c_str()),
-            Verdict::Goto { ref chain } => Some(chain.as_c_str()),
-            _ => None,
-        }
-    }
-}
-
-impl Expression for Verdict {
-    fn get_raw_name() -> *const libc::c_char {
-        b"immediate\0" as *const _ as *const c_char
-    }
-
-    fn from_expr(expr: *const sys::nftnl_expr) -> Result<Self, DeserializationError> {
-        unsafe {
-            let mut chain = None;
-            if sys::nftnl_expr_is_set(expr, sys::NFTNL_EXPR_IMM_CHAIN as u16) {
-                let raw_chain = sys::nftnl_expr_get_str(expr, sys::NFTNL_EXPR_IMM_CHAIN as u16);
-
-                if raw_chain.is_null() {
-                    return Err(DeserializationError::NullPointer);
-                }
-                chain = Some(CStr::from_ptr(raw_chain).to_owned());
-            }
-
-            let verdict = sys::nftnl_expr_get_u32(expr, sys::NFTNL_EXPR_IMM_VERDICT as u16);
-
-            match verdict as i32 {
-                libc::NF_DROP => Ok(Verdict::Drop),
-                libc::NF_ACCEPT => Ok(Verdict::Accept),
-                libc::NF_QUEUE => Ok(Verdict::Queue),
-                libc::NFT_CONTINUE => Ok(Verdict::Continue),
-                libc::NFT_BREAK => Ok(Verdict::Break),
-                libc::NFT_JUMP => {
-                    if let Some(chain) = chain {
-                        Ok(Verdict::Jump { chain })
-                    } else {
-                        Err(DeserializationError::InvalidValue)
-                    }
-                }
-                libc::NFT_GOTO => {
-                    if let Some(chain) = chain {
-                        Ok(Verdict::Goto { chain })
-                    } else {
-                        Err(DeserializationError::InvalidValue)
-                    }
-                }
-                libc::NFT_RETURN => Ok(Verdict::Return),
-                _ => Err(DeserializationError::InvalidValue),
-            }
-        }
-    }
-
-    fn to_expr(&self, _rule: &Rule) -> *mut sys::nftnl_expr {
-        let immediate_const = match *self {
-            Verdict::Drop => libc::NF_DROP,
-            Verdict::Accept => libc::NF_ACCEPT,
-            Verdict::Queue => libc::NF_QUEUE,
-            Verdict::Continue => libc::NFT_CONTINUE,
-            Verdict::Break => libc::NFT_BREAK,
-            Verdict::Jump { .. } => libc::NFT_JUMP,
-            Verdict::Goto { .. } => libc::NFT_GOTO,
-            Verdict::Return => libc::NFT_RETURN,
-        };
-        unsafe {
-            let expr = try_alloc!(sys::nftnl_expr_alloc(
-                b"immediate\0" as *const _ as *const c_char
-            ));
-
-            sys::nftnl_expr_set_u32(
-                expr,
-                sys::NFTNL_EXPR_IMM_DREG as u16,
-                libc::NFT_REG_VERDICT as u32,
-            );
-
-            if let Some(chain) = self.chain() {
-                sys::nftnl_expr_set_str(expr, sys::NFTNL_EXPR_IMM_CHAIN as u16, chain.as_ptr());
-            }
-            sys::nftnl_expr_set_u32(
-                expr,
-                sys::NFTNL_EXPR_IMM_VERDICT as u16,
-                immediate_const as u32,
-            );
-
-            expr
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! nft_expr_verdict {
-    (drop) => {
-        $crate::expr::Verdict::Drop
-    };
-    (accept) => {
-        $crate::expr::Verdict::Accept
-    };
-    (reject icmp $code:expr) => {
-        $crate::expr::Verdict::Reject(RejectionType::Icmp($code))
-    };
-    (reject tcp-rst) => {
-        $crate::expr::Verdict::Reject(RejectionType::TcpRst)
-    };
-    (queue) => {
-        $crate::expr::Verdict::Queue
-    };
-    (continue) => {
-        $crate::expr::Verdict::Continue
-    };
-    (break) => {
-        $crate::expr::Verdict::Break
-    };
-    (jump $chain:expr) => {
-        $crate::expr::Verdict::Jump { chain: $chain }
-    };
-    (goto $chain:expr) => {
-        $crate::expr::Verdict::Goto { chain: $chain }
-    };
-    (return) => {
-        $crate::expr::Verdict::Return
-    };
-}