From patchwork Sat Jun 4 12:42:30 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: 630167 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 3rMLGD6p21z9t5b for ; Sat, 4 Jun 2016 22:42:44 +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=a1bJ722K; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750862AbcFDMmm (ORCPT ); Sat, 4 Jun 2016 08:42:42 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:35337 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750838AbcFDMml (ORCPT ); Sat, 4 Jun 2016 08:42:41 -0400 Received: by mail-wm0-f66.google.com with SMTP id e3so5189850wme.2 for ; Sat, 04 Jun 2016 05:42:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h5+2QdPSkA2ZAOxCfsXd9QgAG1iaGB1Qid16x7Lu4z8=; b=a1bJ722KggLbefDDPIjCl2YeHoMbLdaFH8B8EYVezXfSFxkNN+a4+AxgtcMTTqldgG csfIyZo70uwFQ4fIlftQrcugu2X7SSY62YL+r8AU9RyI0AVMCvMRclwHp0+xlYwXkmRm 9FDcPBxFQeTxDQBa/RULX+gdkkug0wQ2rKpFLrM64HEyekSqda+rdwlNhVAZ5WZ+zGYC YpOOSrUpu6Gj77Ieeumku1ggUbrDA/FbCcSI3g3p5z9f9RSWP4olodXM+8x0qCXulc/S OAPLEVJqx9fxoCNR95QY/QK93oiZta45YMFCMv13qwEq2mULAhxfozy4BCwSlglBTAyn 7CwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h5+2QdPSkA2ZAOxCfsXd9QgAG1iaGB1Qid16x7Lu4z8=; b=J23W+Ux9rdkkCChc3lJG1MbU6g48hJG/hQvSV8MvInRtvZbeIHmI6yOYRhI7b0Vgun uSb17m8OKcGoEFPBzUpYWSg18Bo5hCnvgJ7eBGY9h+L3UzC/JM78M+9EgEwR+IHlzt7G iU6UsJhKia72vLalvn8EQf9iI+WRX4z9I0TLS+3QN3udv9n8+1k5//2SDQtZ5rg3vnQ1 qgmyoif3Zrus1lOZvFHXM/AqsQYQqgJ4uDVbTrjjYXRDyLsH66CDIWIoeINT6xOV6pLc QSyI4EPUBTk+c+BYWDNbXVOLOKvZ3AVG5Ioq25rJfhjtpHtCqJTaxDY8VPq/1QXf7rRl UEFQ== X-Gm-Message-State: ALyK8tIjrKJaxZ2LlhWKUmog6OlC7OtdfgNj7eD4CiyK5zXvvjr7P/6qe05L8jvmEdLwAg== X-Received: by 10.194.162.68 with SMTP id xy4mr7556118wjb.15.1465044159491; Sat, 04 Jun 2016 05:42:39 -0700 (PDT) Received: from devmnet.localdomain (62.100.102.254.static.user.ono.com. [62.100.102.254]) by smtp.gmail.com with ESMTPSA id c2sm4402547wme.4.2016.06.04.05.42.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Jun 2016 05:42:38 -0700 (PDT) From: rodanber@gmail.com To: netfilter-devel@vger.kernel.org Cc: =?UTF-8?q?Roberto=20Garc=C3=ADa?= Subject: [PATCH] iptables: extensions: libxt_MARK: Add translation to nft Date: Sat, 4 Jun 2016 14:42:30 +0200 Message-Id: <1465044150-13229-1-git-send-email-rodanber@gmail.com> X-Mailer: git-send-email 2.8.0 MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Roberto García Add translation for the MARK target to nftables. Examples: $ sudo iptables-translate -t mangle -A OUTPUT -p tcp --dport 22 -j MARK --set-mark 64 nft add rule ip mangle OUTPUT tcp dport 22 counter meta mark set 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -p tcp --dport 22 -j MARK --set-xmark 64 nft add rule ip mangle OUTPUT tcp dport 22 counter meta mark set 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -p tcp --dport 22 -j MARK --or-mark 64 nft add rule ip mangle OUTPUT tcp dport 22 counter meta mark set mark or 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -p tcp --dport 22 -j MARK --and-mark 64 nft add rule ip mangle OUTPUT tcp dport 22 counter meta mark set mark and 0x40 $ sudo iptables-translate -t mangle -A OUTPUT -p tcp --dport 22 -j MARK --xor-mark 64 nft add rule ip mangle OUTPUT tcp dport 22 counter meta mark set mark xor 0x40 Signed-off-by: Roberto García --- extensions/libxt_MARK.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/extensions/libxt_MARK.c b/extensions/libxt_MARK.c index 556dbde..9383f64 100644 --- a/extensions/libxt_MARK.c +++ b/extensions/libxt_MARK.c @@ -245,6 +245,26 @@ 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; + + if (info->mark == 0) + xt_xlate_add(xl, "meta mark set mark and 0x%x", + (unsigned int)(uint32_t)~info->mask); + else if (info->mark == info->mask) + xt_xlate_add(xl, "meta mark set mark or 0x%x", info->mark); + else if (info->mask == 0) + xt_xlate_add(xl, "meta mark set mark xor 0x%x", info->mark); + else if (info->mask == 0xffffffffU) + xt_xlate_add(xl, "meta mark set 0x%x", info->mark); + else + xt_xlate_add(xl, "meta mark xset 0x%x/0x%x", info->mark, info->mask); + + return 1; +} + static struct xtables_target mark_tg_reg[] = { { .family = NFPROTO_UNSPEC, @@ -287,6 +307,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, }, };