From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH nft v2 09/11] evaluate: print a hint about 'type,width' syntax on 0 keylen
Date: Fri, 13 Dec 2019 17:03:43 +0100 [thread overview]
Message-ID: <20191213160345.30057-10-fw@strlen.de> (raw)
In-Reply-To: <20191213160345.30057-1-fw@strlen.de>
If user says
'type integer; ...' in a set definition, don't just throw an error --
provide a hint that a width can be provided via ', bitsize'.
Signed-off-by: Florian Westphal <fw@strlen.de>
---
src/evaluate.c | 33 ++++++++++++++++++++++++++++-----
1 file changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/evaluate.c b/src/evaluate.c
index 91d6b254c659..2e93100349d7 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -3307,6 +3307,32 @@ static int setelem_evaluate(struct eval_ctx *ctx, struct expr **expr)
return 0;
}
+static int set_key_error(struct eval_ctx *ctx, const struct set *set,
+ const char *type)
+{
+ if (set->key->dtype == &integer_type ||
+ set->key->dtype == &string_type)
+ return set_error(ctx, set, "unqualified key type "
+ "specified in %s definition. Did you mean \"type %s,%d\"?",
+ type, set->key->dtype->name, 128);
+
+ return set_error(ctx, set, "unqualified key type %s "
+ "specified in %s definition",
+ set->key->dtype->name, type);
+}
+
+static int set_datamap_error(struct eval_ctx *ctx, const struct set *set)
+{
+ if (set->data->dtype == &integer_type ||
+ set->data->dtype == &string_type)
+ return set_error(ctx, set, "unqualified mapping data type "
+ "specified in map definition. Did you mean \"type %s,%d\"?",
+ set->data->dtype->name, 128);
+
+ return set_error(ctx, set, "unqualified mapping data "
+ "type specified in map definition");
+}
+
static int set_evaluate(struct eval_ctx *ctx, struct set *set)
{
struct table *table;
@@ -3331,9 +3357,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
return -1;
if (set->key->len == 0)
- return set_error(ctx, set, "unqualified key type %s "
- "specified in %s definition",
- set->key->dtype->name, type);
+ return set_key_error(ctx, set, type);
}
if (set->flags & NFT_SET_INTERVAL &&
set->key->etype == EXPR_CONCAT)
@@ -3345,8 +3369,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set)
"specify mapping data type");
if (set->data->len == 0 && set->data->dtype->type != TYPE_VERDICT)
- return set_error(ctx, set, "unqualified mapping data "
- "type specified in map definition");
+ return set_datamap_error(ctx, set);
} else if (set_is_objmap(set->flags)) {
if (set->data) {
assert(set->data->etype == EXPR_VALUE);
--
2.23.0
next prev parent reply other threads:[~2019-12-13 20:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 16:03 [PATCH nft v2 00/10] add typeof keyword Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 01/11] parser: add a helper for concat expression handling Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 02/11] libnftnl: split nft_ctx_new/free Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 03/11] src: store expr, not dtype to track data in sets Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 04/11] src: parser: add syntax to provide size of variable-sized data types Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 05/11] parser: add typeof keyword for declarations Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 06/11] src: add "typeof" print support Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 07/11] mnl: round up the map data size too Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 08/11] src: netlink: remove assertion Florian Westphal
2019-12-13 16:03 ` Florian Westphal [this message]
2019-12-13 16:03 ` [PATCH nft v2 10/11] doc: mention 'typeof' as alternative to 'type' keyword Florian Westphal
2019-12-13 16:03 ` [PATCH nft v2 11/11] tests: add typeof test cases Florian Westphal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213160345.30057-10-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox