add support for optional attributes

3 files changed, 9 insertions, 11 deletions

diff --git a/src/chain.rs b/src/chain.rs
index 7d365a1..53ac595 100644
--- a/src/chain.rs
+++ b/src/chain.rs
@@ -5,8 +5,7 @@ use crate::error::{DecodeError, QueryError};
 use crate::nlmsg::{NfNetlinkAttribute, NfNetlinkDeserializable, NfNetlinkObject};
 use crate::sys::{
     NFTA_CHAIN_FLAGS, NFTA_CHAIN_HOOK, NFTA_CHAIN_NAME, NFTA_CHAIN_POLICY, NFTA_CHAIN_TABLE,
-    NFTA_CHAIN_TYPE, NFTA_CHAIN_USERDATA, NFTA_HOOK_HOOKNUM, NFTA_HOOK_PRIORITY, NFT_MSG_DELCHAIN,
-    NFT_MSG_NEWCHAIN,
+    NFTA_CHAIN_TYPE, NFTA_HOOK_HOOKNUM, NFTA_HOOK_PRIORITY, NFT_MSG_DELCHAIN, NFT_MSG_NEWCHAIN,
 };
 use crate::{Batch, ProtocolFamily, Table};
 use std::fmt::Debug;
@@ -135,8 +134,8 @@ impl NfNetlinkDeserializable for ChainType {
 ///
 /// [`Table`]: struct.Table.html
 /// [`Rule`]: struct.Rule.html
-#[derive(PartialEq, Eq, Default, Debug)]
 #[nfnetlink_struct(derive_deserialize = false)]
+#[derive(PartialEq, Eq, Default, Debug)]
 pub struct Chain {
     family: ProtocolFamily,
     #[field(NFTA_CHAIN_TABLE)]
@@ -151,7 +150,7 @@ pub struct Chain {
     chain_type: ChainType,
     #[field(NFTA_CHAIN_FLAGS)]
     flags: u32,
-    #[field(NFTA_CHAIN_USERDATA)]
+    #[field(optional = true, crate::sys::NFTA_CHAIN_USERDATA)]
     userdata: Vec<u8>,
 }
 
diff --git a/src/expr/verdict.rs b/src/expr/verdict.rs
index 7edf7cd..c42ad32 100644
--- a/src/expr/verdict.rs
+++ b/src/expr/verdict.rs
@@ -4,8 +4,7 @@ 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,
+    NFTA_VERDICT_CHAIN, NFTA_VERDICT_CODE, NFT_BREAK, NFT_CONTINUE, NFT_GOTO, NFT_JUMP, NFT_RETURN,
 };
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
@@ -21,14 +20,14 @@ pub enum VerdictType {
     Return = NFT_RETURN,
 }
 
-#[derive(Clone, PartialEq, Eq, Default, Debug)]
 #[nfnetlink_struct(nested = true)]
+#[derive(Clone, PartialEq, Eq, Default, Debug)]
 pub struct Verdict {
     #[field(NFTA_VERDICT_CODE)]
     code: VerdictType,
     #[field(NFTA_VERDICT_CHAIN)]
     chain: String,
-    #[field(NFTA_VERDICT_CHAIN_ID)]
+    #[field(optional = true, crate::sys::NFTA_VERDICT_CHAIN_ID)]
     chain_id: u32,
 }
 
diff --git a/src/table.rs b/src/table.rs
index 81a26ef..1d19abe 100644
--- a/src/table.rs
+++ b/src/table.rs
@@ -5,7 +5,7 @@ use rustables_macros::nfnetlink_struct;
 use crate::error::QueryError;
 use crate::nlmsg::NfNetlinkObject;
 use crate::sys::{
-    NFTA_TABLE_FLAGS, NFTA_TABLE_NAME, NFTA_TABLE_USERDATA, NFT_MSG_DELTABLE, NFT_MSG_GETTABLE,
+    NFTA_TABLE_FLAGS, NFTA_TABLE_NAME, NFT_MSG_DELTABLE, NFT_MSG_GETTABLE,
     NFT_MSG_NEWTABLE,
 };
 use crate::{Batch, ProtocolFamily};
@@ -14,15 +14,15 @@ use crate::{Batch, ProtocolFamily};
 /// family and contains [`Chain`]s that in turn hold the rules.
 ///
 /// [`Chain`]: struct.Chain.html
-#[derive(Default, PartialEq, Eq, Debug)]
 #[nfnetlink_struct(derive_deserialize = false)]
+#[derive(Default, PartialEq, Eq, Debug)]
 pub struct Table {
     family: ProtocolFamily,
     #[field(NFTA_TABLE_NAME)]
     name: String,
     #[field(NFTA_TABLE_FLAGS)]
     flags: u32,
-    #[field(NFTA_TABLE_USERDATA)]
+    #[field(optional = true, crate::sys::NFTA_TABLE_USERDATA)]
     userdata: Vec<u8>,
 }