From fa145fdf73d663eb69751800911cdd2853689dee Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 1 Dec 2018 11:33:31 +0100 Subject: src: introduce simple hints on incorrect object MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # nft add counter x test # nft list counter x test Error: No such file or directory; did you mean obj ‘test’ in table ip ‘x’? list counter x text ^^^^ Signed-off-by: Pablo Neira Ayuso --- src/evaluate.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'src/evaluate.c') diff --git a/src/evaluate.c b/src/evaluate.c index 14c76420..329fd42d 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -3450,6 +3450,23 @@ static int cmd_evaluate_get(struct eval_ctx *ctx, struct cmd *cmd) } } +static int obj_not_found(struct eval_ctx *ctx, const struct location *loc, + const char *obj_name) +{ + const struct table *table; + struct obj *obj; + + obj = obj_lookup_fuzzy(obj_name, &ctx->nft->cache, &table); + if (obj == NULL) + return cmd_error(ctx, loc, "%s", strerror(ENOENT)); + + return cmd_error(ctx, loc, + "%s; did you mean obj ‘%s’ in table %s ‘%s’?", + strerror(ENOENT), obj->handle.obj.name, + family2str(obj->handle.family), + table->handle.table.name); +} + static int cmd_evaluate_list_obj(struct eval_ctx *ctx, const struct cmd *cmd, uint32_t obj_type) { @@ -3463,9 +3480,9 @@ static int cmd_evaluate_list_obj(struct eval_ctx *ctx, const struct cmd *cmd, return table_not_found(ctx); if (obj_lookup(table, cmd->handle.obj.name, obj_type) == NULL) - return cmd_error(ctx, &cmd->handle.obj.location, - "Could not process rule: %s", - strerror(ENOENT)); + return obj_not_found(ctx, &cmd->handle.obj.location, + cmd->handle.obj.name); + return 0; } -- cgit v1.2.3