1 files changed, 30 insertions, 47 deletions

diff --git a/src/parser.rs b/src/parser.rs
index 6ea34c1..82dd27e 100644
--- a/src/parser.rs
+++ b/src/parser.rs
@@ -105,14 +105,10 @@ pub fn parse_nlmsg<'a>(buf: &'a [u8]) -> Result<(nlmsghdr, NlMsg<'a>), DecodeErr
 
 /// Write the attribute, preceded by a `libc::nlattr`
 // rewrite of `mnl_attr_put`
-pub unsafe fn write_attribute<'a>(
-    ty: NetlinkType,
-    obj: &impl NfNetlinkAttribute,
-    mut buf: *mut u8,
-) {
-    let header_len = pad_netlink_object::<libc::nlattr>();
+pub fn write_attribute<'a>(ty: NetlinkType, obj: &impl NfNetlinkAttribute, mut buf: &mut [u8]) {
+    let header_len = pad_netlink_object::<nlattr>();
     // copy the header
-    *(buf as *mut nlattr) = nlattr {
+    let header = nlattr {
         // nla_len contains the header size + the unpadded attribute length
         nla_len: (header_len + obj.get_size() as usize) as u16,
         nla_type: if obj.is_nested() {
@@ -121,7 +117,12 @@ pub unsafe fn write_attribute<'a>(
             ty
         },
     };
-    buf = buf.offset(pad_netlink_object::<nlattr>() as isize);
+
+    unsafe {
+        *(buf.as_mut_ptr() as *mut nlattr) = header;
+    }
+
+    buf = &mut buf[header_len..];
     // copy the attribute data itself
     obj.write_payload(buf);
 }
@@ -169,48 +170,30 @@ pub trait InnerFormat {
     ) -> Result<DebugStruct<'a, 'b>, std::fmt::Error>;
 }
 
-pub trait Parsable
-where
-    Self: Sized,
-{
-    fn parse_object(
-        buf: &[u8],
-        add_obj: u32,
-        del_obj: u32,
-    ) -> Result<(Self, nfgenmsg, &[u8]), DecodeError>;
-}
+pub(crate) fn parse_object<T: AttributeDecoder + Default + Sized>(
+    buf: &[u8],
+    add_obj: u32,
+    del_obj: u32,
+) -> Result<(T, nfgenmsg, &[u8]), DecodeError> {
+    debug!("parse_object() started");
+    let (hdr, msg) = parse_nlmsg(buf)?;
 
-impl<T> Parsable for T
-where
-    T: AttributeDecoder + Default + Sized,
-{
-    fn parse_object(
-        buf: &[u8],
-        add_obj: u32,
-        del_obj: u32,
-    ) -> Result<(Self, nfgenmsg, &[u8]), DecodeError> {
-        debug!("parse_object() started");
-        let (hdr, msg) = parse_nlmsg(buf)?;
-
-        let op = get_operation_from_nlmsghdr_type(hdr.nlmsg_type) as u32;
-
-        if op != add_obj && op != del_obj {
-            return Err(DecodeError::UnexpectedType(hdr.nlmsg_type));
-        }
+    let op = get_operation_from_nlmsghdr_type(hdr.nlmsg_type) as u32;
 
-        let obj_size = hdr.nlmsg_len as usize
-            - pad_netlink_object_with_variable_size(size_of::<nlmsghdr>() + size_of::<nfgenmsg>());
+    if op != add_obj && op != del_obj {
+        return Err(DecodeError::UnexpectedType(hdr.nlmsg_type));
+    }
 
-        let remaining_data_offset = pad_netlink_object_with_variable_size(hdr.nlmsg_len as usize);
-        let remaining_data = &buf[remaining_data_offset..];
+    let obj_size = hdr.nlmsg_len as usize
+        - pad_netlink_object_with_variable_size(size_of::<nlmsghdr>() + size_of::<nfgenmsg>());
 
-        let (nfgenmsg, res) = match msg {
-            NlMsg::NfGenMsg(nfgenmsg, content) => {
-                (nfgenmsg, read_attributes(&content[..obj_size])?)
-            }
-            _ => return Err(DecodeError::UnexpectedType(hdr.nlmsg_type)),
-        };
+    let remaining_data_offset = pad_netlink_object_with_variable_size(hdr.nlmsg_len as usize);
+    let remaining_data = &buf[remaining_data_offset..];
 
-        Ok((res, nfgenmsg, remaining_data))
-    }
+    let (nfgenmsg, res) = match msg {
+        NlMsg::NfGenMsg(nfgenmsg, content) => (nfgenmsg, read_attributes(&content[..obj_size])?),
+        _ => return Err(DecodeError::UnexpectedType(hdr.nlmsg_type)),
+    };
+
+    Ok((res, nfgenmsg, remaining_data))
 }