1 files changed, 28 insertions, 66 deletions
diff --git a/src/expr/lookup.rs b/src/expr/lookup.rs
index a0cc021..2ef830e 100644
--- a/src/expr/lookup.rs
+++ b/src/expr/lookup.rs
@@ -1,78 +1,40 @@
-use super::{DeserializationError, Expression, Rule};
-use crate::set::Set;
-use crate::sys::{self, libc};
-use std::ffi::{CStr, CString};
-use std::os::raw::c_char;
+use rustables_macros::nfnetlink_struct;
 
-#[derive(Debug, PartialEq)]
+use super::{Expression, Register};
+use crate::error::BuilderError;
+use crate::sys::{NFTA_LOOKUP_DREG, NFTA_LOOKUP_SET, NFTA_LOOKUP_SET_ID, NFTA_LOOKUP_SREG};
+use crate::Set;
+
+#[derive(Clone, PartialEq, Eq, Default, Debug)]
+#[nfnetlink_struct]
 pub struct Lookup {
-    set_name: CString,
+    #[field(NFTA_LOOKUP_SET)]
+    set: String,
+    #[field(NFTA_LOOKUP_SREG)]
+    sreg: Register,
+    #[field(NFTA_LOOKUP_DREG)]
+    dreg: Register,
+    #[field(NFTA_LOOKUP_SET_ID)]
     set_id: u32,
 }
 
 impl Lookup {
-    /// Creates a new lookup entry. May return None if the set has no name.
-    pub fn new<K>(set: &Set<K>) -> Option<Self> {
-        set.get_name().map(|set_name| Lookup {
-            set_name: set_name.to_owned(),
-            set_id: set.get_id(),
-        })
-    }
-}
-
-impl Expression for Lookup {
-    fn get_raw_name() -> *const libc::c_char {
-        b"lookup\0" as *const _ as *const c_char
-    }
-
-    fn from_expr(expr: *const sys::nftnl_expr) -> Result<Self, DeserializationError>
-    where
-        Self: Sized,
-    {
-        unsafe {
-            let set_name = sys::nftnl_expr_get_str(expr, sys::NFTNL_EXPR_LOOKUP_SET as u16);
-            let set_id = sys::nftnl_expr_get_u32(expr, sys::NFTNL_EXPR_LOOKUP_SET_ID as u16);
-
-            if set_name.is_null() {
-                return Err(DeserializationError::NullPointer);
-            }
-
-            let set_name = CStr::from_ptr(set_name).to_owned();
-
-            Ok(Lookup { set_id, set_name })
+    /// Creates a new lookup entry. May return BuilderError::MissingSetName if the set has no name.
+    pub fn new(set: &Set) -> Result<Self, BuilderError> {
+        let mut res = Lookup::default()
+            .with_set(set.get_name().ok_or(BuilderError::MissingSetName)?)
+            .with_sreg(Register::Reg1);
+
+        if let Some(id) = set.get_id() {
+            res.set_set_id(*id);
         }
-    }
-
-    fn to_expr(&self, _rule: &Rule) -> *mut sys::nftnl_expr {
-        unsafe {
-            let expr = try_alloc!(sys::nftnl_expr_alloc(Self::get_raw_name()));
-
-            sys::nftnl_expr_set_u32(
-                expr,
-                sys::NFTNL_EXPR_LOOKUP_SREG as u16,
-                libc::NFT_REG_1 as u32,
-            );
-            sys::nftnl_expr_set_str(
-                expr,
-                sys::NFTNL_EXPR_LOOKUP_SET as u16,
-                self.set_name.as_ptr() as *const _ as *const c_char,
-            );
-            sys::nftnl_expr_set_u32(expr, sys::NFTNL_EXPR_LOOKUP_SET_ID as u16, self.set_id);
 
-            // This code is left here since it's quite likely we need it again when we get further
-            // if self.reverse {
-            //     sys::nftnl_expr_set_u32(expr, sys::NFTNL_EXPR_LOOKUP_FLAGS as u16,
-            //         libc::NFT_LOOKUP_F_INV as u32);
-            // }
-
-            expr
-        }
+        Ok(res)
     }
 }
 
-#[macro_export]
-macro_rules! nft_expr_lookup {
-    ($set:expr) => {
-        $crate::expr::Lookup::new($set)
-    };
+impl Expression for Lookup {
+    fn get_name() -> &'static str {
+        "lookup"
+    }
 }