1 files changed, 27 insertions, 82 deletions

diff --git a/src/expr/reject.rs b/src/expr/reject.rs
index 19752ce..83fd843 100644
--- a/src/expr/reject.rs
+++ b/src/expr/reject.rs
@@ -1,95 +1,40 @@
-use super::{DeserializationError, Expression, Rule};
-use crate::ProtoFamily;
-use crate::sys::{self, libc::{self, c_char}};
+use rustables_macros::{nfnetlink_enum, nfnetlink_struct};
 
-/// A reject expression that defines the type of rejection message sent when discarding a packet.
-#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
-pub enum Reject {
-    /// Returns an ICMP unreachable packet.
-    Icmp(IcmpCode),
-    /// Rejects by sending a TCP RST packet.
-    TcpRst,
-}
+use crate::sys;
 
-impl Reject {
-    fn to_raw(&self, family: ProtoFamily) -> u32 {
-        use libc::*;
-        let value = match *self {
-            Self::Icmp(..) => match family {
-                ProtoFamily::Bridge | ProtoFamily::Inet => NFT_REJECT_ICMPX_UNREACH,
-                _ => NFT_REJECT_ICMP_UNREACH,
-            },
-            Self::TcpRst => NFT_REJECT_TCP_RST,
-        };
-        value as u32
-    }
-}
+use super::Expression;
 
 impl Expression for Reject {
-    fn get_raw_name() -> *const libc::c_char {
-        b"reject\0" as *const _ as *const c_char
+    fn get_name() -> &'static str {
+        "reject"
     }
+}
 
-    fn from_expr(expr: *const sys::nftnl_expr) -> Result<Self, DeserializationError>
-    where
-        Self: Sized,
-    {
-        unsafe {
-            if sys::nftnl_expr_get_u32(expr, sys::NFTNL_EXPR_REJECT_TYPE as u16)
-                == libc::NFT_REJECT_TCP_RST as u32
-            {
-                Ok(Self::TcpRst)
-            } else {
-                Ok(Self::Icmp(IcmpCode::from_raw(sys::nftnl_expr_get_u8(
-                    expr,
-                    sys::NFTNL_EXPR_REJECT_CODE as u16,
-                ))?))
-            }
-        }
-    }
-
-    fn to_expr(&self, rule: &Rule) -> *mut sys::nftnl_expr {
-        let family = rule.get_chain().get_table().get_family();
-
-        unsafe {
-            let expr = try_alloc!(sys::nftnl_expr_alloc(Self::get_raw_name()));
-
-            sys::nftnl_expr_set_u32(
-                expr,
-                sys::NFTNL_EXPR_REJECT_TYPE as u16,
-                self.to_raw(family),
-            );
-
-            let reject_code = match *self {
-                Reject::Icmp(code) => code as u8,
-                Reject::TcpRst => 0,
-            };
-
-            sys::nftnl_expr_set_u8(expr, sys::NFTNL_EXPR_REJECT_CODE as u16, reject_code);
-
-            expr
-        }
-    }
+#[derive(Clone, PartialEq, Eq, Default, Debug)]
+#[nfnetlink_struct]
+/// A reject expression that defines the type of rejection message sent when discarding a packet.
+pub struct Reject {
+    #[field(sys::NFTA_REJECT_TYPE, name_in_functions = "type")]
+    reject_type: RejectType,
+    #[field(sys::NFTA_REJECT_ICMP_CODE)]
+    icmp_code: IcmpCode,
 }
 
 /// An ICMP reject code.
 #[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
-#[repr(u8)]
-pub enum IcmpCode {
-    NoRoute = libc::NFT_REJECT_ICMPX_NO_ROUTE as u8,
-    PortUnreach = libc::NFT_REJECT_ICMPX_PORT_UNREACH as u8,
-    HostUnreach = libc::NFT_REJECT_ICMPX_HOST_UNREACH as u8,
-    AdminProhibited = libc::NFT_REJECT_ICMPX_ADMIN_PROHIBITED as u8,
+#[nfnetlink_enum(u32)]
+pub enum RejectType {
+    IcmpUnreach = sys::NFT_REJECT_ICMP_UNREACH,
+    TcpRst = sys::NFT_REJECT_TCP_RST,
+    IcmpxUnreach = sys::NFT_REJECT_ICMPX_UNREACH,
 }
 
-impl IcmpCode {
-    fn from_raw(code: u8) -> Result<Self, DeserializationError> {
-        match code as i32 {
-            libc::NFT_REJECT_ICMPX_NO_ROUTE => Ok(Self::NoRoute),
-            libc::NFT_REJECT_ICMPX_PORT_UNREACH => Ok(Self::PortUnreach),
-            libc::NFT_REJECT_ICMPX_HOST_UNREACH => Ok(Self::HostUnreach),
-            libc::NFT_REJECT_ICMPX_ADMIN_PROHIBITED => Ok(Self::AdminProhibited),
-            _ => Err(DeserializationError::InvalidValue),
-        }
-    }
+/// An ICMP reject code.
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
+#[nfnetlink_enum(u8)]
+pub enum IcmpCode {
+    NoRoute = sys::NFT_REJECT_ICMPX_NO_ROUTE,
+    PortUnreach = sys::NFT_REJECT_ICMPX_PORT_UNREACH,
+    HostUnreach = sys::NFT_REJECT_ICMPX_HOST_UNREACH,
+    AdminProhibited = sys::NFT_REJECT_ICMPX_ADMIN_PROHIBITED,
 }