iptables-compat: use nft built-in comments support
PATCH 1/1 iptables-compat: use nft built-in comments support
After this patch, iptables-compat uses nft built-in comments support instead of comment match.
This change simplifies the treatment of comments in nft after load a rule set through iptables-compat-restore.
Signed-off-by Pablo M. Bermudo Garay <[email protected]>
--- iptables/nft-ipv4.c | 13 +++++++++++-- iptables/nft-ipv6.c | 13 +++++++++++-- iptables/nft.c | 26 ++++++++++++++++++++++++++ iptables/nft.h | 1 + 4 files changed, 49 insertions(+), 4 deletions(-)
iptables/nft-ipv4.c +11 -2
@@ -31,6 +31,7 @@ static int nft_ipv4_add(struct nftnl_rule *r, void *data)struct iptables_command_state *cs = data;struct xtables_rule_match *matchp;uint32_t op; +int ret;if (cs->fw.ip.iniface[0 ] !='\0' ) { op =nft_invflags2cmp (cs->fw.ip.invflags,IPT_INV_VIA_IN );
@@ -74,8 +75,16 @@ static int nft_ipv4_add(struct nftnl_rule *r, void *data)add_compat (r, cs->fw.ip.proto, cs->fw.ip.invflags);for (matchp = cs->matches; matchp; matchp = matchp->next) { -if (add_match (r, matchp->match->m) <0 ) -break ; +/* Use nft built-in comments support instead of comment match */ +if (strcmp (matchp->match->name,"comment" ) ==0 ) { + ret =add_comment (r, (char *)matchp->match->m->data); +if (ret <0 ) +return ret; + }else { + ret =add_match (r, matchp->match->m); +if (ret <0 ) +return ret; + } }/* Counters need to me added before the target, otherwise they are
iptables/nft-ipv6.c +11 -2
@@ -30,6 +30,7 @@ static int nft_ipv6_add(struct nftnl_rule *r, void *data)struct iptables_command_state *cs = data;struct xtables_rule_match *matchp;uint32_t op; +int ret;if (cs->fw6.ipv6.iniface[0 ] !='\0' ) { op =nft_invflags2cmp (cs->fw6.ipv6.invflags,IPT_INV_VIA_IN );
@@ -62,8 +63,16 @@ static int nft_ipv6_add(struct nftnl_rule *r, void *data)add_compat (r, cs->fw6.ipv6.proto, cs->fw6.ipv6.invflags);for (matchp = cs->matches; matchp; matchp = matchp->next) { -if (add_match (r, matchp->match->m) <0 ) -break ; +/* Use nft built-in comments support instead of comment match */ +if (strcmp (matchp->match->name,"comment" ) ==0 ) { + ret =add_comment (r, (char *)matchp->match->m->data); +if (ret <0 ) +return ret; + }else { + ret =add_match (r, matchp->match->m); +if (ret <0 ) +return ret; + } }/* Counters need to me added before the target, otherwise they are
iptables/nft.c +26 -0
@@ -43,6 +43,7 @@#include <libnftnl/rule.h> #include <libnftnl/expr.h> #include <libnftnl/set.h> +#include <libnftnl/udata.h> #include <netinet/in.h> /* inet_ntoa */ #include <arpa/inet.h>
@@ -1007,6 +1008,31 @@ int add_counters(struct nftnl_rule *r, uint64_t packets, uint64_t bytes)return 0 ; } +enum udata_type { +UDATA_TYPE_COMMENT , + __UDATA_TYPE_MAX, +}; +#define UDATA_TYPE_MAX (__UDATA_TYPE_MAX - 1) + +int add_comment (struct nftnl_rule *r,const char *comment) +{ +struct nftnl_udata_buf *udata; + + udata =nftnl_udata_buf_alloc (NFT_USERDATA_MAXLEN ); +if (!udata) +return -ENOMEM ; + +if (!nftnl_udata_put_strz (udata,UDATA_TYPE_COMMENT , comment)) +return -ENOMEM ; +nftnl_rule_set_data (r,NFTNL_RULE_USERDATA , +nftnl_udata_buf_data (udata), +nftnl_udata_buf_len (udata)); + +nftnl_udata_buf_free (udata); + +return 0 ; +} +void add_compat (struct nftnl_rule *r,uint32_t proto,bool inv) {nftnl_rule_set_u32 (r,NFTNL_RULE_COMPAT_PROTO , proto);
iptables/nft.h +1 -0
@@ -104,6 +104,7 @@ int add_match(struct nftnl_rule *r, struct xt_entry_match *m);int add_target (struct nftnl_rule *r,struct xt_entry_target *t);int add_jumpto (struct nftnl_rule *r,const char *name,int verdict);int add_action (struct nftnl_rule *r,struct iptables_command_state *cs,bool goto_set); +int add_comment (struct nftnl_rule *r,const char *comment);enum nft_rule_print {NFT_RULE_APPEND ,
Signature · 1 line
2.9.0
Quoted 5 lines · Pablo M. Bermudo Garay
After this patch, iptables-compat uses nft built-in comments support instead of comment match.
This change simplifies the treatment of comments in nft after load a rule set through iptables-compat-restore.
Applied, thanks.