From patchwork Wed Mar 2 09:57:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivani Bhardwaj X-Patchwork-Id: 590898 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 5A80614033B for ; Wed, 2 Mar 2016 20:57:59 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=pDlXQGc7; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752538AbcCBJ56 (ORCPT ); Wed, 2 Mar 2016 04:57:58 -0500 Received: from mail-pa0-f65.google.com ([209.85.220.65]:33875 "EHLO mail-pa0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751535AbcCBJ54 (ORCPT ); Wed, 2 Mar 2016 04:57:56 -0500 Received: by mail-pa0-f65.google.com with SMTP id hj7so647095pac.1 for ; Wed, 02 Mar 2016 01:57:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=d0Ml6bty41jvBl0tmm3vRCgr8/yr8E1mxCLYQKbs14Q=; b=pDlXQGc7Jd1gAZO8tfsfHua+/mgqUQp75PwyRNIj2GI+v5hXz2wwmkBEIHDu2mkfYt qrRlQiluBKQnne4u4ZnjeGr/oQOtpxHTFNZbZCbjnzOsJ2QO11S6bl399KNX81VCgLn8 mk+25ywl7KYHBJ3F8vFie+OLe36gmMgEK/j903EVnmje3G3RVAhD1fMq/D43axdvfLeX qFB/OtJUK8Qaihvc0T6hTejE0tnvWMelOMvNrxCrVTBfka++nR0SrpzkXjRM8HYKKzap 5HWHJRh9fyJVX2Am7FnBIOecRDrTUNt6zqGspCgY0zfsPC4Gxdsnz1gWRYf9js2ZHan1 wATQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=d0Ml6bty41jvBl0tmm3vRCgr8/yr8E1mxCLYQKbs14Q=; b=gFi0GJzKyL/6vqZBy07mIlSTWBeoqN4G63YYQgY5uqaRK5KerUFst4IwqBWvUOAOXR 6XuBCtVDU1Me3Q8RjtqL8H7+ElBC3KpSGKzTJ/o2GcgeADm09yrM5iH1jX0sR76LExkn kburxZf9YPehQi+ocSzRfodGFdfLy/PZx7cM+wfalVqgTZ6mxpDuJGz8r3tHudAP4Cw9 1KfXXTaSqQMn2fcpquiyZLImKoEsuodctkY0Q4ftabJ9qCJFxnu2xvyLnCbacMN4wYb9 nWADCo1rfDarExIHk7kzBNdPQ2+h2eT69evohnjN34iAoM6xRsFsyoD5y9sJiz1WRz9J 9G9g== X-Gm-Message-State: AD7BkJJKieIYC1Q9Jq8hAjw4m/oo0MBsYwllUEO04pJNeDdZ0E40TiLPg9GjsGiSuPnVvA== X-Received: by 10.66.187.36 with SMTP id fp4mr37154614pac.47.1456912675988; Wed, 02 Mar 2016 01:57:55 -0800 (PST) Received: from gmail.com ([223.176.178.213]) by smtp.gmail.com with ESMTPSA id h2sm18180253pfd.91.2016.03.02.01.57.53 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 02 Mar 2016 01:57:54 -0800 (PST) Date: Wed, 2 Mar 2016 15:27:49 +0530 From: Shivani Bhardwaj To: netfilter-devel@vger.kernel.org Subject: [PATCH v2] extensions: libipt_MASQUERADE: Add translation to nft Message-ID: <20160302095749.GA6686@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add translation for masquerade to nftables. Examples: $ sudo iptables-translate -t nat -A POSTROUTING -j MASQUERADE nft add rule ip nat POSTROUTING counter masquerade $ sudo iptables-translate -t nat -A POSTROUTING -p tcp -j MASQUERADE --to-ports 10 nft add rule ip nat POSTROUTING ip protocol tcp counter masquerade to :10 $ sudo iptables-translate -t nat -A POSTROUTING -p tcp -j MASQUERADE --to-ports 10-20 --random nft add rule ip nat POSTROUTING ip protocol tcp counter masquerade to :10-20 random Signed-off-by: Shivani Bhardwaj --- Changes in v2: Add code for masquerade port range selection extensions/libipt_MASQUERADE.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index ea07445..d1393c1 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -134,6 +134,29 @@ MASQUERADE_save(const void *ip, const struct xt_entry_target *target) printf(" --random"); } +static int +MASQUERADE_xlate(const struct xt_entry_target *target, + struct xt_xlate *xl, int numeric) +{ + const struct nf_nat_ipv4_multi_range_compat *mr = + (const void *)target->data; + const struct nf_nat_ipv4_range *r = &mr->range[0]; + + xt_xlate_add(xl, "masquerade"); + + if (r->flags & NF_NAT_RANGE_PROTO_SPECIFIED) { + xt_xlate_add(xl, " to :%hu", ntohs(r->min.tcp.port)); + if (r->max.tcp.port != r->min.tcp.port) + xt_xlate_add(xl, "-%hu", ntohs(r->max.tcp.port)); + } + + xt_xlate_add(xl, " "); + if (r->flags & NF_NAT_RANGE_PROTO_RANDOM) + xt_xlate_add(xl, "random "); + + return 1; +} + static struct xtables_target masquerade_tg_reg = { .name = "MASQUERADE", .version = XTABLES_VERSION, @@ -146,6 +169,7 @@ static struct xtables_target masquerade_tg_reg = { .print = MASQUERADE_print, .save = MASQUERADE_save, .x6_options = MASQUERADE_opts, + .xlate = MASQUERADE_xlate, }; void _init(void)