From patchwork Sun Aug 21 14:34:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liping Zhang X-Patchwork-Id: 661240 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 3sHK4k4BsNz9sxb for ; Mon, 22 Aug 2016 00:35:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=XkEZQEjL; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753046AbcHUOft (ORCPT ); Sun, 21 Aug 2016 10:35:49 -0400 Received: from m12-17.163.com ([220.181.12.17]:48700 "EHLO m12-17.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751549AbcHUOfs (ORCPT ); Sun, 21 Aug 2016 10:35:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=HA2Zvnx02cXxk535an LK9h4qknBjWFEosENcu8NKWog=; b=XkEZQEjLGeY2LFDdRhY/aY7c9G0PZFgVXy 5fabugWX5n3+o9kPCEZydLfW/OGOceyHPQ8ap2ytovzDkOSbwostYGrHmm5YvTri t/U1bNKt6oVrbtsEIa5nK9saLaa57G0FQxX+j/6+Rg3dplcpkLR/S+VyjRPG+1QF wW5g71nOg= Received: from MiWiFi-R2D-srv.localdomain (unknown [180.170.252.41]) by smtp13 (Coremail) with SMTP id EcCowAAXT4smvLlXpCrkCw--.6221S2; Sun, 21 Aug 2016 22:35:32 +0800 (CST) From: Liping Zhang To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, Liping Zhang Subject: [PATCH iptables] extensions: libxt_CLASSIFY: Add translation to nft Date: Sun, 21 Aug 2016 22:34:55 +0800 Message-Id: <1471790095-29856-1-git-send-email-zlpnobody@163.com> X-Mailer: git-send-email 2.5.5 X-CM-TRANSID: EcCowAAXT4smvLlXpCrkCw--.6221S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7uF45uFWxXFyfZF48ArWDJwb_yoW8ZF4xpa 1kJay5Kw45uFWfCFnIyFn0yF13ur1xCrW8Ar4xW34kt3y3tFWrWw1xKrW7uF13Aa4kGr13 Jw4YyFn5Wa17J37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jUAwsUUUUU= X-Originating-IP: [180.170.252.41] X-CM-SenderInfo: x2os00perg5qqrwthudrp/1tbiNh7Jl1WBTTUYjgABsN Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Liping Zhang For examples: # iptables-translate -A OUTPUT -j CLASSIFY --set-class 0:0 nft add rule ip filter OUTPUT counter meta priority set none # iptables-translate -A OUTPUT -j CLASSIFY --set-class ffff:ffff nft add rule ip filter OUTPUT counter meta priority set root # iptables-translate -A OUTPUT -j CLASSIFY --set-class 1:234 nft add rule ip filter OUTPUT counter meta priority set 1:234 Signed-off-by: Liping Zhang --- extensions/libxt_CLASSIFY.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c index cd016d8..ba88f75 100644 --- a/extensions/libxt_CLASSIFY.c +++ b/extensions/libxt_CLASSIFY.c @@ -80,6 +80,31 @@ arpCLASSIFY_print(const void *ip, const struct xt_entry_target *target, CLASSIFY_save(ip, target); } +static int CLASSIFY_xlate(struct xt_xlate *xl, + const struct xt_xlate_tg_params *params) +{ + const struct xt_classify_target_info *clinfo = + (const struct xt_classify_target_info *)params->target->data; + __u32 handle = clinfo->priority; + + xt_xlate_add(xl, "meta priority set "); + + switch (handle) { + case TC_H_ROOT: + xt_xlate_add(xl, "root"); + break; + case TC_H_UNSPEC: + xt_xlate_add(xl, "none"); + break; + default: + xt_xlate_add(xl, "%0x:%0x", TC_H_MAJ(handle) >> 16, + TC_H_MIN(handle)); + break; + } + + return 1; +} + static struct xtables_target classify_target[] = { { .family = NFPROTO_UNSPEC, @@ -92,6 +117,7 @@ static struct xtables_target classify_target[] = { .save = CLASSIFY_save, .x6_parse = CLASSIFY_parse, .x6_options = CLASSIFY_opts, + .xlate = CLASSIFY_xlate, }, { .family = NFPROTO_ARP, @@ -103,6 +129,7 @@ static struct xtables_target classify_target[] = { .print = arpCLASSIFY_print, .x6_parse = CLASSIFY_parse, .x6_options = CLASSIFY_opts, + .xlate = CLASSIFY_xlate, }, };