From patchwork Tue Aug 5 18:30:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ana Rey X-Patchwork-Id: 376764 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 42C6914008B for ; Wed, 6 Aug 2014 04:28:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756279AbaHES2p (ORCPT ); Tue, 5 Aug 2014 14:28:45 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:56849 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756274AbaHES2o (ORCPT ); Tue, 5 Aug 2014 14:28:44 -0400 Received: by mail-wg0-f51.google.com with SMTP id b13so1439574wgh.34 for ; Tue, 05 Aug 2014 11:28:43 -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:in-reply-to:references; bh=SbMBireS/9bZONZBcggblHpOOl4iqBlcF042MuqGFXc=; b=mD21NlbPPXTx/WfHf/jyriLrKE5vFlW+umAC3sHXQTUdrUnagSu19SRREi8NxdJjQE 1XOXGvtOLzdVPTpWutmTFyXDCaTzq6NFxrfrkSvmkMHrLRHEr1kprkMDPalu9hsyYTXw jOvuk7iOfm52DWExtAcTKDNgMoXCFHbtJL2Yc5bWA5fbyCi45BG5xNoW27fnp1lxEo4e +8HIj4qPrZzujIrS+ubq2m0AX0tX15gsPNlRtTVPMqbzNh5i8jX1N8c0YMzofHbPwwsU o9kgRF4NlDxXgp59vmBCeabKQOLoyty+uFeZvtELQlP2F4DvW9PYY4HF4Htq66ZlW50G dbag== X-Received: by 10.180.19.97 with SMTP id d1mr9179775wie.19.1407263323104; Tue, 05 Aug 2014 11:28:43 -0700 (PDT) Received: from localhost.localdomain ([188.84.98.232]) by mx.google.com with ESMTPSA id ca8sm5915477wjc.0.2014.08.05.11.28.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Aug 2014 11:28:42 -0700 (PDT) From: Ana Rey To: netfilter-devel@vger.kernel.org Cc: Ana Rey , Alvaro Neira Ayuso Subject: [libnftnl PATCH v2] expr: meta: Add pkttype support Date: Tue, 5 Aug 2014 20:30:18 +0200 Message-Id: <1407263418-4371-1-git-send-email-anarey@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402593473-4904-1-git-send-email-anarey@gmail.com> References: <1402593473-4904-1-git-send-email-anarey@gmail.com> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add pkttype support in meta. The pkttype option does not set. Signed-off-by: Alvaro Neira Ayuso Signed-off-by: Ana Rey --- [Changes in v2:] Fix the description of @NFT_META_PKTTYPE expression keys include/linux/netfilter/nf_tables.h | 2 ++ src/expr/meta.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 801bdd1..72ad208 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -571,6 +571,7 @@ enum nft_exthdr_attributes { * @NFT_META_L4PROTO: layer 4 protocol number * @NFT_META_BRI_IIFNAME: packet input bridge interface name * @NFT_META_BRI_OIFNAME: packet output bridge interface name + * @NFT_META_PKTTYPE: Packet type */ enum nft_meta_keys { NFT_META_LEN, @@ -592,6 +593,7 @@ enum nft_meta_keys { NFT_META_L4PROTO, NFT_META_BRI_IIFNAME, NFT_META_BRI_OIFNAME, + NFT_META_PKTTYPE, }; /** diff --git a/src/expr/meta.c b/src/expr/meta.c index 85097b5..35ca177 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -23,7 +23,7 @@ #include "expr_ops.h" #ifndef NFT_META_MAX -#define NFT_META_MAX (NFT_META_BRI_OIFNAME + 1) +#define NFT_META_MAX (NFT_META_PKTTYPE + 1) #endif struct nft_expr_meta { @@ -153,6 +153,7 @@ static const char *meta_key2str_array[NFT_META_MAX] = { [NFT_META_SECMARK] = "secmark", [NFT_META_BRI_IIFNAME] = "bri_iifname", [NFT_META_BRI_OIFNAME] = "bri_oifname", + [NFT_META_PKTTYPE] = "pkttype" }; static const char *meta_key2str(uint8_t key)