From patchwork Tue Jan 12 14:28:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shivani Bhardwaj X-Patchwork-Id: 566573 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 49E1E140B9C for ; Wed, 13 Jan 2016 01:28:41 +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=TCMis2rG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762508AbcALO2j (ORCPT ); Tue, 12 Jan 2016 09:28:39 -0500 Received: from mail-pf0-f195.google.com ([209.85.192.195]:33528 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762521AbcALO2g (ORCPT ); Tue, 12 Jan 2016 09:28:36 -0500 Received: by mail-pf0-f195.google.com with SMTP id e65so4923208pfe.0 for ; Tue, 12 Jan 2016 06:28:36 -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-type :content-disposition:user-agent; bh=aQ1tLKGDOpp4LIpi8yLoAKnn2lPY4l/OR5y59NyWQjs=; b=TCMis2rGrZtnMHbX5g9usP356Q5MfNTrBixAHcR3MQVXBhRBBHFwtNEJNnob4lUGVk x1v9WLpWwdJBxeoVk61VZAfLjfITg8I9/w/phj/yku9mbTK2XzMNUwxEOmyBqRxvb8Dl AT4ONVnXjKkyDG4Pc8ZU7oRRnMW+/EY4JYYbM0Hs2ExR6Ek82C7nQTXoAaOBieQUnaEW JqsS7K87OW7AAE92oSMx2gw99IiTVNTmdEYkuQuOBcwcRPXdbAmfblgOFs3lhNFateAH fOBr5jsCUlvDrdnqyCCzprsXiqtkxcJb5tl0UjmZflfXlcwpgZKRMmtwycu3PE8fhx7a 80UQ== X-Received: by 10.98.13.7 with SMTP id v7mr34456171pfi.150.1452608916209; Tue, 12 Jan 2016 06:28:36 -0800 (PST) Received: from gmail.com ([106.204.22.198]) by smtp.gmail.com with ESMTPSA id 11sm30942224pfq.87.2016.01.12.06.28.34 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 12 Jan 2016 06:28:35 -0800 (PST) Date: Tue, 12 Jan 2016 19:58:29 +0530 From: Shivani Bhardwaj To: netfilter-devel@vger.kernel.org Subject: [PATCH v2] extensions: libip6t_hl: Add translation to nft Message-ID: <20160112142829.GA5879@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 hop limit to nftables. Examples: $ sudo ip6tables-translate -t nat -A postrouting -m hl --hl-gt 3 nft add rule ip6 nat postrouting ip6 hoplimit gt 3 counter $ sudo ip6tables-translate -t nat -A postrouting -m hl ! --hl-eq 3 nft add rule ip6 nat postrouting ip6 hoplimit != 3 counter Signed-off-by: Shivani Bhardwaj --- Changes in v2: Alter the contents of array op extensions/libip6t_hl.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c index 3559db4..226b69c 100644 --- a/extensions/libip6t_hl.c +++ b/extensions/libip6t_hl.c @@ -83,6 +83,23 @@ static void hl_save(const void *ip, const struct xt_entry_match *match) printf(" %s %u", op[info->mode], info->hop_limit); } +static int hl_xlate(const struct xt_entry_match *match, + struct xt_buf *buf, int numeric) +{ + static const char *const op[] = { + [IP6T_HL_EQ] = "", + [IP6T_HL_NE] = "!= ", + [IP6T_HL_LT] = "lt ", + [IP6T_HL_GT] = "gt " }; + + const struct ip6t_hl_info *info = + (struct ip6t_hl_info *) match->data; + + xt_buf_add(buf, "ip6 hoplimit %s%u ", op[info->mode], info->hop_limit); + + return 1; +} + #define s struct ip6t_hl_info static const struct xt_option_entry hl_opts[] = { {.name = "hl-lt", .id = O_HL_LT, .excl = F_ANY, .type = XTTYPE_UINT8, @@ -109,6 +126,7 @@ static struct xtables_match hl_mt6_reg = { .x6_parse = hl_parse, .x6_fcheck = hl_check, .x6_options = hl_opts, + .xlate = hl_xlate, };