From 1249016780ed5263398c913d06c13177f4893e89 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 3 Jul 2015 19:31:14 +0200 Subject: src: add chain declarations to cache Signed-off-by: Pablo Neira Ayuso --- src/evaluate.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'src/evaluate.c') 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); -- cgit v1.2.3