From patchwork Fri Apr 4 13:54:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 336969 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 608F41400A1 for ; Sat, 5 Apr 2014 00:55:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752982AbaDDNzK (ORCPT ); Fri, 4 Apr 2014 09:55:10 -0400 Received: from mail.us.es ([193.147.175.20]:49240 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752932AbaDDNzH (ORCPT ); Fri, 4 Apr 2014 09:55:07 -0400 Received: (qmail 19689 invoked from network); 4 Apr 2014 15:55:05 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 4 Apr 2014 15:55:05 +0200 Received: (qmail 31487 invoked by uid 507); 4 Apr 2014 13:55:05 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.1/18740. spamassassin: 3.3.2. Clear:RC:1(127.0.0.1):SA:0(-97.6/7.5):. Processed in 5.259221 secs); 04 Apr 2014 13:55:05 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-97.6 required=7.5 tests=BAYES_50,RCVD_IN_BRBL, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.3.2 X-Spam-ASN: AS12715 95.20.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 4 Apr 2014 13:55:00 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/412/antivirus2); Fri, 04 Apr 2014 15:55:00 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus2) Received: (qmail 12953 invoked from network); 4 Apr 2014 15:54:59 +0200 Received: from 60.57.20.95.dynamic.jazztel.es (HELO localhost.localdomain) (pneira@us.es@95.20.57.60) by mail.us.es with SMTP; 4 Apr 2014 15:54:59 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH libnftnl 1/2] include: synchronize nf_tables.h with nftables tree Date: Fri, 4 Apr 2014 15:54:54 +0200 Message-Id: <1396619695-28109-1-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Pablo Neira Ayuso --- include/linux/netfilter/nf_tables.h | 28 ++++++++++++++++++++++++++-- src/expr/ct.c | 4 ++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index bb160d5..0167279 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -212,6 +212,29 @@ enum nft_set_flags { }; /** + * enum nft_set_policies - set selection policy + * + * @NFT_SET_POL_PERFORMANCE: prefer high performance over low memory use + * @NFT_SET_POL_MEMORY: prefer low memory use over high performance + */ +enum nft_set_policies { + NFT_SET_POL_PERFORMANCE, + NFT_SET_POL_MEMORY, +}; + +/** + * enum nft_set_desc_attributes - set element description + * + * @NFTA_SET_DESC_SIZE: number of elements in set (NLA_U32) + */ +enum nft_set_desc_attributes { + NFTA_SET_DESC_UNSPEC, + NFTA_SET_DESC_SIZE, + __NFTA_SET_DESC_MAX +}; +#define NFTA_SET_DESC_MAX (__NFTA_SET_DESC_MAX - 1) + +/** * enum nft_set_attributes - nf_tables set netlink attributes * * @NFTA_SET_TABLE: table name (NLA_STRING) @@ -221,6 +244,8 @@ enum nft_set_flags { * @NFTA_SET_KEY_LEN: key data length (NLA_U32) * @NFTA_SET_DATA_TYPE: mapping data type (NLA_U32) * @NFTA_SET_DATA_LEN: mapping data length (NLA_U32) + * @NFTA_SET_POLICY: selection policy (NLA_U32) + * @NFTA_SET_DESC: set description (NLA_NESTED) */ enum nft_set_attributes { NFTA_SET_UNSPEC, @@ -589,7 +614,6 @@ enum nft_meta_attributes { * @NFT_CT_PROTOCOL: conntrack layer 4 protocol * @NFT_CT_PROTO_SRC: conntrack layer 4 protocol source * @NFT_CT_PROTO_DST: conntrack layer 4 protocol destination - * @NFT_CT_LABEL: conntrack label */ enum nft_ct_keys { NFT_CT_STATE, @@ -605,7 +629,7 @@ enum nft_ct_keys { NFT_CT_PROTOCOL, NFT_CT_PROTO_SRC, NFT_CT_PROTO_DST, - NFT_CT_LABEL, + NFT_CT_LABELS, }; /** diff --git a/src/expr/ct.c b/src/expr/ct.c index 4c18dde..38f5169 100644 --- a/src/expr/ct.c +++ b/src/expr/ct.c @@ -33,7 +33,7 @@ struct nft_expr_ct { #define IP_CT_DIR_REPLY 1 #ifndef NFT_CT_MAX -#define NFT_CT_MAX (NFT_CT_LABEL + 1) +#define NFT_CT_MAX (NFT_CT_LABELS + 1) #endif static int @@ -171,7 +171,7 @@ const char *ctkey2str_array[NFT_CT_MAX] = { [NFT_CT_DST] = "dst", [NFT_CT_PROTO_SRC] = "proto_src", [NFT_CT_PROTO_DST] = "proto_dst", - [NFT_CT_LABEL] = "label", + [NFT_CT_LABELS] = "label", }; static const char *ctkey2str(uint32_t ctkey)