From a4da57bde3330aa2d84815e16d8cf238cebf8d70 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 15 Jan 2014 07:35:20 +0000 Subject: meta: don't require "meta" keyword for a subset of meta expressions Don't require the meta keyword for mark, iif, oif, iifname, oifname, skuid, skgid, nftrace, rtclassid and secmark. The protocol and length types still need the meta keyword to avoid grammar conflicts. Signed-off-by: Patrick McHardy --- src/meta.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'src/meta.c') diff --git a/src/meta.c b/src/meta.c index 6d425255..098728bb 100644 --- a/src/meta.c +++ b/src/meta.c @@ -335,7 +335,18 @@ static const struct meta_template meta_templates[] = { static void meta_expr_print(const struct expr *expr) { - printf("meta %s", meta_templates[expr->meta.key].token); + switch (expr->meta.key) { + case NFT_META_LEN: + case NFT_META_NFPROTO: + case NFT_META_L4PROTO: + case NFT_META_PROTOCOL: + case NFT_META_PRIORITY: + printf("meta %s", meta_templates[expr->meta.key].token); + break; + default: + printf("%s", meta_templates[expr->meta.key].token); + break; + } } static void meta_expr_clone(struct expr *new, const struct expr *expr) -- cgit v1.2.3