From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shivani Bhardwaj Subject: [PATCH v2] extensions: libxt_connmark: Add translation to nft Date: Wed, 23 Dec 2015 01:53:06 +0530 Message-ID: <20151222202306.GA13145@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii To: netfilter-devel@vger.kernel.org Return-path: Received: from mail-pf0-f195.google.com ([209.85.192.195]:33697 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753309AbbLVUXM (ORCPT ); Tue, 22 Dec 2015 15:23:12 -0500 Received: by mail-pf0-f195.google.com with SMTP id 78so2735811pfw.0 for ; Tue, 22 Dec 2015 12:23:12 -0800 (PST) Received: from gmail.com ([223.176.190.114]) by smtp.gmail.com with ESMTPSA id i66sm9428054pfj.28.2015.12.22.12.23.10 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 22 Dec 2015 12:23:11 -0800 (PST) Content-Disposition: inline Sender: netfilter-devel-owner@vger.kernel.org List-ID: Add translation for connmark to nftables. Examples: $ sudo iptables-translate -A INPUT -m connmark --mark 10/10 -j ACCEPT nft add rule ip filter INPUT ct mark and 0xa == 0xa counter accept $ sudo iptables-translate -A INPUT -m connmark ! --mark 10/10 -j ACCEPT nft add rule ip filter INPUT ct mark and 0xa != 0xa counter accept $ sudo iptables-translate -t mangle -A PREROUTING -p tcp --dport 40 -m connmark --mark 0x40 nft add rule ip mangle PREROUTING tcp dport 40 ct mark 0x40 counter Signed-off-by: Shivani Bhardwaj --- Changes in v2: Fix coding errors for invert test case extensions/libxt_connmark.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/extensions/libxt_connmark.c b/extensions/libxt_connmark.c index 95477de..385ed6e 100644 --- a/extensions/libxt_connmark.c +++ b/extensions/libxt_connmark.c @@ -89,7 +89,8 @@ connmark_print(const void *ip, const struct xt_entry_match *match, int numeric) } static void -connmark_mt_print(const void *ip, const struct xt_entry_match *match, int numeric) +connmark_mt_print(const void *ip, const struct xt_entry_match *match, + int numeric) { const struct xt_connmark_mtinfo1 *info = (const void *)match->data; @@ -122,6 +123,46 @@ connmark_mt_save(const void *ip, const struct xt_entry_match *match) print_mark(info->mark, info->mask); } +static void print_mark_xlate(unsigned int mark, unsigned int mask, + struct xt_buf *buf, const char *str) +{ + if (mask != 0xffffffffU) + xt_buf_add(buf, " and 0x%x %s 0x%x ", mark, str, mask); + else + xt_buf_add(buf, " 0x%x ", mark); +} + +static int connmark_xlate(const struct xt_entry_match *match, + struct xt_buf *buf, int numeric) +{ + const struct xt_connmark_info *info = (const void *)match->data; + const char *str = "=="; + + if (info->invert) + str = "!="; + + xt_buf_add(buf, "ct mark"); + print_mark_xlate(info->mark, info->mask, buf, str); + + return 1; +} + +static int +connmark_mt_xlate(const struct xt_entry_match *match, + struct xt_buf *buf, int numeric) +{ + const struct xt_connmark_mtinfo1 *info = (const void *)match->data; + const char *str = "=="; + + if (info->invert) + str = "!="; + + xt_buf_add(buf, "ct mark"); + print_mark_xlate(info->mark, info->mask, buf, str); + + return 1; +} + static struct xtables_match connmark_mt_reg[] = { { .family = NFPROTO_UNSPEC, @@ -135,6 +176,7 @@ static struct xtables_match connmark_mt_reg[] = { .save = connmark_save, .x6_parse = connmark_parse, .x6_options = connmark_mt_opts, + .xlate = connmark_xlate, }, { .version = XTABLES_VERSION, @@ -148,6 +190,7 @@ static struct xtables_match connmark_mt_reg[] = { .save = connmark_mt_save, .x6_parse = connmark_mt_parse, .x6_options = connmark_mt_opts, + .xlate = connmark_mt_xlate, }, }; -- 1.9.1