diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-07-06 20:02:50 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-18 01:13:35 +0200 |
| commit | 2c6702b391f12723f1d4cf258e4a24100e931da9 (patch) | |
| tree | 98b29082fd6ae5697d883a5fc70e1586a2e65d88 | |
| parent | bd21392a7cdfefdd4a069707da31474da5fe9458 (diff) | |
src: add cmd_evaluate_list()
This function validates that the table that we want to list already exists by
looking it up from the cache.
This also adds cmd_error() to display an error from the evaluation step, when
the objects that the rule indicates do not exist.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | src/evaluate.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 018d1b98..d18b8f63 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -62,6 +62,8 @@ static int __fmtstring(4, 5) __stmt_binary_error(struct eval_ctx *ctx, __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) #define monitor_error(ctx, s1, fmt, args...) \ __stmt_binary_error(ctx, &(s1)->location, NULL, fmt, ## args) +#define cmd_error(ctx, fmt, args...) \ + __stmt_binary_error(ctx, &(ctx->cmd)->location, NULL, fmt, ## args) static int __fmtstring(3, 4) set_error(struct eval_ctx *ctx, const struct set *set, @@ -1937,6 +1939,26 @@ static int cmd_evaluate_delete(struct eval_ctx *ctx, struct cmd *cmd) } } +static int cmd_evaluate_list(struct eval_ctx *ctx, struct cmd *cmd) +{ + switch (cmd->obj) { + case CMD_OBJ_TABLE: + if (cmd->handle.table == NULL) + return 0; + case CMD_OBJ_CHAIN: + case CMD_OBJ_SET: + if (table_lookup(&cmd->handle) == NULL) + return cmd_error(ctx, "Could not process rule: Table '%s' does not exist", + cmd->handle.table); + return 0; + case CMD_OBJ_SETS: + case CMD_OBJ_RULESET: + return 0; + default: + BUG("invalid command object type %u\n", cmd->obj); + } +} + enum { CMD_MONITOR_EVENT_ANY, CMD_MONITOR_EVENT_NEW, @@ -2028,6 +2050,7 @@ int cmd_evaluate(struct eval_ctx *ctx, struct cmd *cmd) case CMD_DELETE: return cmd_evaluate_delete(ctx, cmd); case CMD_LIST: + return cmd_evaluate_list(ctx, cmd); case CMD_FLUSH: case CMD_RENAME: case CMD_EXPORT: |