extensions: libxt_mark: Add translation to nft
PATCH v4 1/1 extensions: libxt_mark: Add translation to nft
Add translation for metainformation mark to nftables.
Examples:
$ sudo iptables-translate -I INPUT -m mark --mark 12 nft insert rule ip filter INPUT mark 0xc counter
$ sudo iptables-translate -A FORWARD -m mark --mark 22 -j ACCEPT nft add rule ip filter FORWARD mark 0x16 counter accept
$ sudo iptables-translate -t mangle -A PREROUTING -p tcp --dport 4600 -m mark --mark 0x40 nft add rule ip mangle PREROUTING tcp dport 4600 mark 0x40 counter
$ sudo iptables-translate -A FORWARD -m mark --mark 0x400/0x400 -j ACCEPT nft add rule ip filter FORWARD mark and 0x400 == 0x400 counter accept
---
Changes in v4:
Fix indentation errors shown by checkpatch Add tested and verified examples in commit message
extensions/libxt_mark.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-)
extensions/libxt_mark.c +40 -2
@@ -75,7 +75,7 @@ mark_print(const void *ip, const struct xt_entry_match *match, int numeric)if (info->invert)printf (" !" ); - +print_mark (info->mark, info->mask); }
@@ -97,11 +97,47 @@ mark_save(const void *ip, const struct xt_entry_match *match)if (info->invert)printf (" !" ); - +printf (" --mark" );print_mark (info->mark, info->mask); } +static void +print_mark_xlate (struct xt_buf *buf, +unsigned int mark,unsigned int mask) +{ +if (mask !=0xffffffffU ) +xt_buf_add (buf," and 0x%x == 0x%x" , mark, mask); +else +xt_buf_add (buf," 0x%x" , mark); +} + +static int +mark_mt_xlate (const struct xt_entry_match *match, +struct xt_buf *buf,int numeric) +{ +const struct xt_mark_mtinfo1 *info = (const void *)match->data; + +xt_buf_add (buf,"mark %s" , info->invert ?" !=" :"" ); +print_mark_xlate (buf, info->mark, info->mask); +xt_buf_add (buf," " ); + +return 1 ; +} + +static int +mark_xlate (const struct xt_entry_match *match, +struct xt_buf *buf,int numeric) +{ +const struct xt_mark_info *info = (const void *)match->data; + +xt_buf_add (buf,"mark %s" , info->invert ?" !=" :"" ); +print_mark_xlate (buf, info->mark, info->mask); +xt_buf_add (buf," " ); + +return 1 ; +} +static struct xtables_match mark_mt_reg[] = { { .family =NFPROTO_UNSPEC ,
@@ -115,6 +151,7 @@ static struct xtables_match mark_mt_reg[] = { .save = mark_save, .x6_parse = mark_parse, .x6_options = mark_mt_opts, + .xlate = mark_xlate, }, { .version = XTABLES_VERSION,
@@ -128,6 +165,7 @@ static struct xtables_match mark_mt_reg[] = { .save = mark_mt_save, .x6_parse = mark_mt_parse, .x6_options = mark_mt_opts, + .xlate = mark_mt_xlate, }, };
Signature · 1 line
1.9.1
Pablo Neira Ayuso
maintainerQuoted 11 lines · Pablo Neira Ayuso
Quoted 10 lines · Shivani Bhardwaj
Add translation for metainformation mark to nftables.
Examples:
$ sudo iptables-translate -I INPUT -m mark --mark 12 nft insert rule ip filter INPUT mark 0xc counter$ sudo iptables-translate -A FORWARD -m mark --mark 22 -j ACCEPT nft add rule ip filter FORWARD mark 0x16 counter accept
Quoted 7 lines
Quoted 5 lines
$ sudo iptables-translate -t mangle -A PREROUTING -p tcp --dport 4600 -m mark --mark 0x40 nft add rule ip mangle PREROUTING tcp dport 4600 mark 0x40 counter$ sudo iptables-translate -A FORWARD -m mark --mark 0x400/0x400 -j ACCEPT nft add rule ip filter FORWARD mark and 0x400 == 0x400 counter acceptApplied with minor glitch I have fixed here.
I noticed another problem.
This translation doesn't look OK.
# iptables-translate -I INPUT -p tcp -m mark ! --mark 0xa/0xa nft insert rule ip filter INPUT ip protocol tcp mark != and 0xa == 0xa counter
No problem, please just send me a follow up patch to fix this and make sure you test all possible code branches next time.
Thanks.
Pablo Neira Ayuso
maintainerQuoted 7 lines · Shivani Bhardwaj
Add translation for metainformation mark to nftables.
Examples:
$ sudo iptables-translate -I INPUT -m mark --mark 12 nft insert rule ip filter INPUT mark 0xc counter
Quoted 8 lines
$ sudo iptables-translate -A FORWARD -m mark --mark 22 -j ACCEPT nft add rule ip filter FORWARD mark 0x16 counter accept$ sudo iptables-translate -t mangle -A PREROUTING -p tcp --dport 4600 -m mark --mark 0x40 nft add rule ip mangle PREROUTING tcp dport 4600 mark 0x40 counter$ sudo iptables-translate -A FORWARD -m mark --mark 0x400/0x400 -j ACCEPT nft add rule ip filter FORWARD mark and 0x400 == 0x400 counter accept
Applied with minor glitch I have fixed here.
Quoted 7 lines
extensions/libxt_mark.c +7
-0+static void +print_mark_xlate (struct xt_buf *buf, +unsigned int mark,unsigned int mask) +{ +if (mask !=0xffffffffU ) +xt_buf_add (buf," and 0x%x == 0x%x" , mark, mask); +else
extensions/libxt_mark.c mark_save(const void *ip, const struct xt_entry_match *match) · line 121
Quoted 10 lines
extensions/libxt_mark.c +10
-0+xt_buf_add (buf," 0x%x" , mark); +} + +static int +mark_mt_xlate (const struct xt_entry_match *match, +struct xt_buf *buf,int numeric) +{ +const struct xt_mark_mtinfo1 *info = (const void *)match->data; + +xt_buf_add (buf,"mark %s" , info->invert ?" !=" :"" );
I have edited the line above to become:
xt_buf_add(buf, "mark%s", info->invert ? " !=" : "");
So we get rid of the extra space:
Quoted 1 line
nft add rule ip filter FORWARD mark and
0x400==0x400counter accept
^
hereReview
Quoted 2 lines
(quoted diff) +2
-0+ print_mark_xlate(buf, info->mark, info->mask); + xt_buf_add(buf, " ");
Removed this xt_buf_add(buf, " ") and added the space to print_mark_xlate().