From e5666f68d98bc2eedd5b3aad5bdd1840c4ced193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Tue, 14 Jun 2016 19:12:22 +0200 Subject: extensions: libxt_MARK: Add translation to nft MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add translation for the MARK target to nftables. Examples: $ sudo iptables-translate -t mangle -A OUTPUT -j MARK --set-mark 64 nft add rule ip mangle OUTPUT counter meta mark set 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -j MARK --set-xmark 0x40/0x32 nft add rule ip mangle OUTPUT counter meta mark set mark xor 0x40 and 0x32 $ sudo iptables-translate -t mangle -A OUTPUT -j MARK --or-mark 64 nft add rule ip mangle OUTPUT counter meta mark set mark or 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -j MARK --and-mark 64 nft add rule ip mangle OUTPUT counter meta mark set mark and 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -j MARK --xor-mark 64 nft add rule ip mangle OUTPUT counter meta mark set mark xor 0x40 Signed-off-by: Roberto García Signed-off-by: Pablo Neira Ayuso --- extensions/libxt_MARK.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index 556dbde5..ec1ed056 100644 --- a/extensions/libxt_MARK.c +++ b/extensions/libxt_MARK.c @@ -245,6 +245,28 @@ static void mark_tg_save(const void *ip, const struct xt_entry_target *target) printf(" --set-xmark 0x%x/0x%x", info->mark, info->mask); } +static int mark_tg_xlate(const void *ip, const struct xt_entry_target *target, + struct xt_xlate *xl, int numeric) +{ + const struct xt_mark_tginfo2 *info = (const void *)target->data; + + xt_xlate_add(xl, "meta mark set "); + + if (info->mark == 0) + xt_xlate_add(xl, "mark and 0x%x ", ~info->mask); + else if (info->mark == info->mask) + xt_xlate_add(xl, "mark or 0x%x ", info->mark); + else if (info->mask == 0) + xt_xlate_add(xl, "mark xor 0x%x ", info->mark); + else if (info->mask == 0xffffffffU) + xt_xlate_add(xl, "0x%x ", info->mark); + else + xt_xlate_add(xl, "mark xor 0x%x and 0x%x ", info->mark, + info->mask); + + return 1; +} + static struct xtables_target mark_tg_reg[] = { { .family = NFPROTO_UNSPEC, @@ -287,6 +309,7 @@ static struct xtables_target mark_tg_reg[] = { .x6_parse = mark_tg_parse, .x6_fcheck = mark_tg_check, .x6_options = mark_tg_opts, + .xlate = mark_tg_xlate, }, }; -- cgit v1.2.3