From: Elise Lennion Date: Thu, 26 Jan 2017 17:14:30 +0000 (-0200) Subject: evaluate: Evaluate table name before reset stateful objects in a table X-Git-Tag: v0.8~254 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b5dc09f718ee27b95cc1153599cd72b2076929c;p=thirdparty%2Fnftables.git evaluate: Evaluate table name before reset stateful objects in a table Reseting stateful objects in a single table is already implemented and cmd_evaluate_reset() now tests for the table name. Signed-off-by: Elise Lennion Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/evaluate.c b/src/evaluate.c index dab7cfca..ed41bd8a 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2974,13 +2974,14 @@ static int cmd_evaluate_reset(struct eval_ctx *ctx, struct cmd *cmd) switch (cmd->obj) { case CMD_OBJ_COUNTER: case CMD_OBJ_QUOTA: + case CMD_OBJ_COUNTERS: + case CMD_OBJ_QUOTAS: + if (cmd->handle.table == NULL) + return 0; 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_COUNTERS: - case CMD_OBJ_QUOTAS: - return 0; default: BUG("invalid command object type %u\n", cmd->obj); }