From patchwork Wed Jun 8 22:24:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roberto_Garc=C3=ADa?= X-Patchwork-Id: 632539 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3rQ30K1dwsz9s5l for ; Thu, 9 Jun 2016 08:25:05 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=VJ8zG90e; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424140AbcFHWZD (ORCPT ); Wed, 8 Jun 2016 18:25:03 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33882 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424070AbcFHWZB (ORCPT ); Wed, 8 Jun 2016 18:25:01 -0400 Received: by mail-wm0-f67.google.com with SMTP id n184so6305985wmn.1 for ; Wed, 08 Jun 2016 15:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:cc:to:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=IvK0PYibenDfXYd1M4nnAiDIhvc+dSu/gTDRs9cQD24=; b=VJ8zG90e7KiqCz4PvWVqwTnLqhJWloMSuEgKA5OaovI1Pt6IvOhYw9Yy1EfYqb/zjK fVFHXBwPEvpGqJ0A6TonKKZHyzD2UQlnSFouGOslXYnZ8tcc0zMSwdBDLDTGtTZmvr5M CZMMvjmigTO4lmYxB9baKEQTuVbKIM/8JVfvSP/seJZP9ilry2mErI2bR6e8bsqmpOrl O0++/6QlOceirZ3+LMakpKSJQYyYHIvA0HwJGW7n3c9YthlxL7UlFfe4a4NytsinMFYn a47GHmdGoLTFq9Yr6wcEawQCNQTKBJ5gAkgc/nZWoApdgPN6OEMK9zURLWjvIx1WiylM mhDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:cc:to:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=IvK0PYibenDfXYd1M4nnAiDIhvc+dSu/gTDRs9cQD24=; b=gKfjcazcQN+7+Q/ZT6+LBsaqdzrYhWcgVWTvp2DT6f00sqCirAnpdpJmASxd/mXKG0 wkYW0gYms7ZJ36jdPjLoh7a+fbWnuN81mejyPumPbr7hz7SMCcQ8EAdl/DMAi4QUSgI9 vW2TeopBaGz2oXyOTj8vvIBu2jsozoCJztMJbwmF/hF/2bTaZeZB2LGv5r+Gh9lwQoAg 5IXaU0f4hGF6Q+6GeCfa0GHf19EqsTlNCCeD/ZPetHkeQvYaNhpT2Qv3yiW6zbYIVrSw sFerTRZPXJPIzOPHXdxoxNLl6IsOc56Q7zYyrX2oBiC/NjIv2fccWauGqcebwO3C6mpc r3tQ== X-Gm-Message-State: ALyK8tJ9qBvQojX4zlQw/IOgxBzb1XWfZsNwVcHMIXMPOmAhl31yVM7Z5R/wZ6V9x8RG3Q== X-Received: by 10.194.203.37 with SMTP id kn5mr6634543wjc.42.1465424700069; Wed, 08 Jun 2016 15:25:00 -0700 (PDT) Received: from [172.26.10.215] (62.100.102.254.static.user.ono.com. [62.100.102.254]) by smtp.gmail.com with ESMTPSA id r76sm4329774wme.14.2016.06.08.15.24.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Jun 2016 15:24:58 -0700 (PDT) From: =?UTF-8?Q?Roberto_Garc=c3=ada?= Subject: [PATCH v2] iptables: extensions: libxt_MARK: Add translation to nft Cc: Arturo Borrero Gonzalez , Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Message-ID: Date: Thu, 9 Jun 2016 00:24:53 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- extensions/libxt_MARK.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) .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, }, }; -- 2.8.0 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index 556dbde..ec1ed05 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[] = { {