iptables: extensions: libxt_CONNMARK: Add translation to nft
PATCH 1/1 iptables: extensions: libxt_CONNMARK: Add translation to nft
From: Roberto García <[email protected]>
Add translation for the CONNMARK target to nftables.
The following options have no available translation:
--save-mark [--nfmask nfmask] [--ctmask ctmask] --restore-mark [--nfmask nfmask] [--ctmask ctmask]
Examples:
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --set-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set 0x16
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --set-xmark 0x16/0x12 nft add rule ip mangle PREROUTING counter ct mark set ct mark xor 0x16 and 0xffffffed
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --and-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set ct mark and 0x16
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --or-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set ct mark or 0x16
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --save-mark nft add rule ip mangle PREROUTING counter ct mark set mark
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --save-mark \
--mask 0x12
nft add rule ip mangle PREROUTING counter ct mark set mark and 0x12# iptables-translate -t mangle -A PREROUTING -j CONNMARK --restore-mark nft add rule ip mangle PREROUTING counter meta mark set ct mark
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --restore-mark \
--mask 0x12
nft add rule ip mangle PREROUTING counter meta mark set ct mark and 0x12--- extensions/libxt_CONNMARK.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
extensions/libxt_CONNMARK.c +45 -0
@@ -347,6 +347,50 @@ connmark_tg_save(const void *ip, const struct xt_entry_target *target) } } +static int +connmark_tg_xlate (const void *ip,const struct xt_entry_target *target, +struct xt_xlate *xl,int numeric) +{ +const struct xt_connmark_tginfo1 *info = (const void *)target->data; + +switch (info->mode) { +case XT_CONNMARK_SET : +xt_xlate_add (xl,"ct mark set " ); +if (info->ctmark ==0 ) +xt_xlate_add (xl,"ct mark and 0x%x" , ~info->ctmask); +else if (info->ctmark == info->ctmask) +xt_xlate_add (xl,"ct mark or 0x%x" , + info->ctmark); +else if (info->ctmask ==0 ) +xt_xlate_add (xl,"ct mark xor 0x%x" , + info->ctmark); +else if (info->ctmask ==0xFFFFFFFFU ) +xt_xlate_add (xl,"0x%x " , info->ctmark); +else +xt_xlate_add (xl,"ct mark xor 0x%x and 0x%x" , + info->ctmark, ~info->ctmask); +break ; +case XT_CONNMARK_SAVE : +xt_xlate_add (xl,"ct mark set mark" ); +if (!(info->nfmask ==UINT32_MAX && info->ctmask ==UINT32_MAX )) + { +if (info->nfmask == info->ctmask) +xt_xlate_add (xl," and 0x%x" , info->nfmask); + } +break ; +case XT_CONNMARK_RESTORE : +xt_xlate_add (xl,"meta mark set ct mark" ); +if (!(info->nfmask ==UINT32_MAX && info->ctmask ==UINT32_MAX )) + { +if (info->nfmask == info->ctmask) +xt_xlate_add (xl," and 0x%x" , info->nfmask); + } +break ; + } + +return 1 ; +} +static struct xtables_target connmark_tg_reg[] = { { .family =NFPROTO_UNSPEC ,
@@ -377,6 +421,7 @@ static struct xtables_target connmark_tg_reg[] = { .x6_parse = connmark_tg_parse, .x6_fcheck = connmark_tg_check, .x6_options = connmark_tg_opts, + .xlate = connmark_tg_xlate, }, };
Signature · 6 lines
2.8.0 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 34 lines · On 17 June 2016 at 18:10, <[email protected]> wrote:
From: Roberto García <[email protected]>
Add translation for the CONNMARK target to nftables.
The following options have no available translation:
--save-mark [--nfmask nfmask] [--ctmask ctmask] --restore-mark [--nfmask nfmask] [--ctmask ctmask]
Examples:
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --set-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set 0x16# iptables-translate -t mangle -A PREROUTING -j CONNMARK --set-xmark 0x16/0x12 nft add rule ip mangle PREROUTING counter ct mark set ct mark xor 0x16 and 0xffffffed# iptables-translate -t mangle -A PREROUTING -j CONNMARK --and-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set ct mark and 0x16# iptables-translate -t mangle -A PREROUTING -j CONNMARK --or-mark 0x16 nft add rule ip mangle PREROUTING counter ct mark set ct mark or 0x16# iptables-translate -t mangle -A PREROUTING -j CONNMARK --save-mark nft add rule ip mangle PREROUTING counter ct mark set mark# iptables-translate -t mangle -A PREROUTING -j CONNMARK --save-mark \ --mask 0x12 nft add rule ip mangle PREROUTING counter ct mark set mark and 0x12# iptables-translate -t mangle -A PREROUTING -j CONNMARK --restore-mark nft add rule ip mangle PREROUTING counter meta mark set ct mark
Quoted 8 lines
# iptables-translate -t mangle -A PREROUTING -j CONNMARK --restore-mark \ --mask 0x12 nft add rule ip mangle PREROUTING counter meta mark set ct mark and 0x12Signed-off-by Roberto García <[email protected]>--- extensions/libxt_CONNMARK.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+)
Signature · 5 lines
Arturo Borrero González -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Pablo Neira Ayuso
maintainerApplied with minor glitches.
extensions/libxt_CONNMARK.c connmark_tg_save(const void *ip, const struct xt_entry_target *target) · line 355
Quoted 6 lines · On Fri, Jun 17, 2016 at 06:10:50PM +0200, [email protected] wrote:
extensions/libxt_CONNMARK.c +6
-0+static int +connmark_tg_xlate (const void *ip,const struct xt_entry_target *target, +struct xt_xlate *xl,int numeric) +{ +const struct xt_connmark_tginfo1 *info = (const void *)target->data; +
^^^^^
I can see there unnecessary indentation for an empty line.
Quoted 11 lines
extensions/libxt_CONNMARK.c +11
-0+switch (info->mode) { +case XT_CONNMARK_SET : +xt_xlate_add (xl,"ct mark set " ); +if (info->ctmark ==0 ) +xt_xlate_add (xl,"ct mark and 0x%x" , ~info->ctmask); +else if (info->ctmark == info->ctmask) +xt_xlate_add (xl,"ct mark or 0x%x" , + info->ctmark); +else if (info->ctmask ==0 ) +xt_xlate_add (xl,"ct mark xor 0x%x" , + info->ctmark);
extensions/libxt_CONNMARK.c connmark_tg_save(const void *ip, const struct xt_entry_target *target) · line 376
Quoted 10 lines
extensions/libxt_CONNMARK.c +10
-0+else if (info->ctmask ==0xFFFFFFFFU ) +xt_xlate_add (xl,"0x%x " , info->ctmark); +else +xt_xlate_add (xl,"ct mark xor 0x%x and 0x%x" , + info->ctmark, ~info->ctmask); +break ; +case XT_CONNMARK_SAVE : +xt_xlate_add (xl,"ct mark set mark" ); +if (!(info->nfmask ==UINT32_MAX && info->ctmask ==UINT32_MAX )) + {
Wrong coding style, instead:
if (!(info->nfmask == UINT32_MAX &&
info->ctmask == UINT32_MAX)) {
...I have fixed this here this time. Thanks.