From fecb6b4fa737ae374a738d207fa35f16e3813434 Mon Sep 17 00:00:00 2001 From: Ana Rey Date: Mon, 3 Nov 2014 18:10:51 +0100 Subject: src: Add cgroup support in meta expresion The new attribute of meta is "cgroup". Example of use in nft: # nft add rule ip test output meta cgroup != 0x100001 counter drop Moreover, this adds tests to the meta.t test file. The kernel support is addedin the commit: ce67417 ("netfilter: nft_meta: add cgroup support") The libnftnl support is add in the commit: 1d4a480 ("expr: meta: Add cgroup support") More information about the steps to use cgroup: https://www.kernel.org/doc/Documentation/cgroups/net_cls.txt More info about cgroup in iptables: http://git.kernel.org/cgit/linux/kernel/git/pablo/nftables.git/commit/net/netfilter/xt_cgroup.c?id=82a37132f300ea53bdcd812917af5a6329ec80c3 Signed-off-by: Ana Rey Signed-off-by: Pablo Neira Ayuso --- src/meta.c | 3 +++ src/parser.y | 2 ++ src/scanner.l | 1 + 3 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/meta.c b/src/meta.c index faa29eb8..61dc5cf0 100644 --- a/src/meta.c +++ b/src/meta.c @@ -436,6 +436,9 @@ static const struct meta_template meta_templates[] = { [NFT_META_OIFGROUP] = META_TEMPLATE("oifgroup", &devgroup_type, 4 * BITS_PER_BYTE, BYTEORDER_HOST_ENDIAN), + [NFT_META_CGROUP] = META_TEMPLATE("cgroup", &integer_type, + 4 * BITS_PER_BYTE, + BYTEORDER_HOST_ENDIAN), }; static void meta_expr_print(const struct expr *expr) diff --git a/src/parser.y b/src/parser.y index 3992c6a5..9108dd22 100644 --- a/src/parser.y +++ b/src/parser.y @@ -324,6 +324,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token CPU "cpu" %token IIFGROUP "iifgroup" %token OIFGROUP "oifgroup" +%token CGROUP "cgroup" %token CT "ct" %token DIRECTION "direction" @@ -1783,6 +1784,7 @@ meta_key_unqualified : MARK { $$ = NFT_META_MARK; } | CPU { $$ = NFT_META_CPU; } | IIFGROUP { $$ = NFT_META_IIFGROUP; } | OIFGROUP { $$ = NFT_META_OIFGROUP; } + | CGROUP { $$ = NFT_META_CGROUP; } ; meta_stmt : META meta_key SET expr diff --git a/src/scanner.l b/src/scanner.l index e36c3b13..9c8546e2 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -433,6 +433,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "cpu" { return CPU; } "iifgroup" { return IIFGROUP; } "oifgroup" { return OIFGROUP; } +"cgroup" { return CGROUP; } "ct" { return CT; } "direction" { return DIRECTION; } -- cgit v1.2.3