summaryrefslogtreecommitdiffstats
path: root/src/evaluate.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2015-07-03 19:31:14 +0200
committerPablo Neira Ayuso <pablo@netfilter.org>2015-08-18 01:36:12 +0200
commit1249016780ed5263398c913d06c13177f4893e89 (patch)
tree975f6ee0375cb53da4a6185c245e2bd37f86f2d6 /src/evaluate.c
parentd1169e46f3f45b9a3bb8e164717f91cd6917ad3e (diff)
src: add chain declarations to cache
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/evaluate.c')
-rw-r--r--src/evaluate.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/src/evaluate.c b/src/evaluate.c
index 511b71b5..00e9c4b4 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1854,8 +1854,26 @@ static uint32_t str2hooknum(uint32_t family, const char *hook)
static int chain_evaluate(struct eval_ctx *ctx, struct chain *chain)
{
+ struct table *table;
struct rule *rule;
+ table = table_lookup(&ctx->cmd->handle);
+ if (table == NULL)
+ return cmd_error(ctx, "Table '%s' does not exist",
+ ctx->cmd->handle.table);
+
+ if (chain == NULL) {
+ if (chain_lookup(table, &ctx->cmd->handle) == NULL) {
+ chain = chain_alloc(NULL);
+ handle_merge(&chain->handle, &ctx->cmd->handle);
+ chain_add_hash(chain, table);
+ }
+ return 0;
+ } else {
+ if (chain_lookup(table, &chain->handle) == NULL)
+ chain_add_hash(chain_get(chain), table);
+ }
+
if (chain->flags & CHAIN_F_BASECHAIN) {
chain->hooknum = str2hooknum(chain->handle.family,
chain->hookstr);
@@ -1917,8 +1935,6 @@ static int cmd_evaluate_add(struct eval_ctx *ctx, struct cmd *cmd)
handle_merge(&cmd->rule->handle, &cmd->handle);
return rule_evaluate(ctx, cmd->rule);
case CMD_OBJ_CHAIN:
- if (cmd->data == NULL)
- return 0;
return chain_evaluate(ctx, cmd->chain);
case CMD_OBJ_TABLE:
return table_evaluate(ctx, cmd->table);