From 97842738468fca3653bb41ee7fee77032dfce9a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Date: Wed, 22 Jun 2016 14:31:31 +0200 Subject: iptables: extensions: libxt_MARK: Fix translation of --set-xmark option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix translation of MARK target's --set-xmark option. Before: #iptables-translate -t mangle -A PREROUTING -j MARK --set-xmark 0x64/0xaf nft add rule ip mangle PREROUTING counter meta mark set mark xor 0x64 and 0xaf After: # iptables-translate -t mangle -A PREROUTING -j MARK --set-xmark 0x64/0xaf nft add rule ip mangle PREROUTING counter meta mark set mark and 0xffffff50 \ xor 0x64 Signed-off-by: Roberto García Signed-off-by: Pablo Neira Ayuso --- extensions/libxt_MARK.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index 8bd4d410..c7b17943 100644 --- a/extensions/libxt_MARK.c +++ b/extensions/libxt_MARK.c @@ -261,8 +261,8 @@ static int mark_tg_xlate(const void *ip, const struct xt_entry_target *target, 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); + xt_xlate_add(xl, "mark and 0x%x xor 0x%x ", ~info->mask, + info->mark); return 1; } -- cgit v1.2.3