From patchwork Mon Jul 6 18:17:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 491742 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 59060140DB8 for ; Tue, 7 Jul 2015 04:11:55 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754199AbbGFSLy (ORCPT ); Mon, 6 Jul 2015 14:11:54 -0400 Received: from mail.us.es ([193.147.175.20]:40466 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754144AbbGFSLp (ORCPT ); Mon, 6 Jul 2015 14:11:45 -0400 Received: (qmail 30066 invoked from network); 6 Jul 2015 20:11:44 +0200 Received: from unknown (HELO us.es) (192.168.2.14) by us.es with SMTP; 6 Jul 2015 20:11:44 +0200 Received: (qmail 28705 invoked by uid 507); 6 Jul 2015 18:11:44 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus4 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20651. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-103.2/7.5):. Processed in 1.922931 secs); 06 Jul 2015 18:11:44 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus4 X-Spam-Level: X-Spam-Status: No, score=-103.2 required=7.5 tests=BAYES_50,SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS12715 87.216.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus4) (127.0.0.1) by us.es with SMTP; 6 Jul 2015 18:11:42 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus4 (F-Secure/fsigk_smtp/412/antivirus4); Mon, 06 Jul 2015 20:11:41 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus4) Received: (qmail 30763 invoked from network); 6 Jul 2015 20:11:41 +0200 Received: from 129.166.216.87.static.jazztel.es (HELO salvia.here) (pneira@us.es@87.216.166.129) by mail.us.es with SMTP; 6 Jul 2015 20:11:41 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft,v4 14/16] src: add chain declarations to cache Date: Mon, 6 Jul 2015 20:17:06 +0200 Message-Id: <1436206628-23894-15-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1436206628-23894-1-git-send-email-pablo@netfilter.org> References: <1436206628-23894-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Signed-off-by: Pablo Neira Ayuso --- src/evaluate.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/evaluate.c b/src/evaluate.c index 022e1ff..d101f8a 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1850,8 +1850,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); @@ -1913,8 +1931,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);