From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A85BCC433FF for ; Fri, 2 Aug 2019 07:29:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81D5320657 for ; Fri, 2 Aug 2019 07:29:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732932AbfHBH3h (ORCPT ); Fri, 2 Aug 2019 03:29:37 -0400 Received: from vxsys-smtpclusterma-03.srv.cat ([46.16.60.198]:36209 "EHLO vxsys-smtpclusterma-03.srv.cat" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730790AbfHBH3g (ORCPT ); Fri, 2 Aug 2019 03:29:36 -0400 Received: from bubu.das-nano.com (242.red-83-48-67.staticip.rima-tde.net [83.48.67.242]) by vxsys-smtpclusterma-03.srv.cat (Postfix) with ESMTPA id BF9B224330 for ; Fri, 2 Aug 2019 09:29:33 +0200 (CEST) From: Ander Juaristi To: netfilter-devel@vger.kernel.org Subject: [PATCH] meta: Introduce new conditions 'time', 'day' and 'hour' Date: Fri, 2 Aug 2019 09:29:23 +0200 Message-Id: <20190802072923.21578-1-a@juaristi.eus> X-Mailer: git-send-email 2.17.1 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Ander Juaristi --- include/linux/netfilter/nf_tables.h | 6 ++++++ src/expr/meta.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/netfilter/nf_tables.h b/include/linux/netfilter/nf_tables.h index 1bf4346..0a6bc7f 100644 --- a/include/linux/netfilter/nf_tables.h +++ b/include/linux/netfilter/nf_tables.h @@ -794,6 +794,9 @@ enum nft_exthdr_attributes { * @NFT_META_SECPATH: boolean, secpath_exists (!!skb->sp) * @NFT_META_IIFKIND: packet input interface kind name (dev->rtnl_link_ops->kind) * @NFT_META_OIFKIND: packet output interface kind name (dev->rtnl_link_ops->kind) + * @NFT_META_TIME: a UNIX timestamp + * @NFT_META_TIME_DAY: day of week + * @NFT_META_TIME_HOUR: hour of day */ enum nft_meta_keys { NFT_META_LEN, @@ -824,6 +827,9 @@ enum nft_meta_keys { NFT_META_SECPATH, NFT_META_IIFKIND, NFT_META_OIFKIND, + NFT_META_TIME, + NFT_META_TIME_DAY, + NFT_META_TIME_HOUR, }; /** diff --git a/src/expr/meta.c b/src/expr/meta.c index f1984f6..c2ac72e 100644 --- a/src/expr/meta.c +++ b/src/expr/meta.c @@ -22,7 +22,7 @@ #include #ifndef NFT_META_MAX -#define NFT_META_MAX (NFT_META_OIFKIND + 1) +#define NFT_META_MAX (NFT_META_TIME_HOUR + 1) #endif struct nftnl_expr_meta { @@ -161,6 +161,9 @@ static const char *meta_key2str_array[NFT_META_MAX] = { [NFT_META_SECPATH] = "secpath", [NFT_META_IIFKIND] = "iifkind", [NFT_META_OIFKIND] = "oifkind", + [NFT_META_TIME] = "time", + [NFT_META_TIME_DAY] = "day", + [NFT_META_TIME_HOUR] = "hour", }; static const char *meta_key2str(uint8_t key) -- 2.17.1