From patchwork Mon Aug 10 11:50:47 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: 505587 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 64599140157 for ; Mon, 10 Aug 2015 21:45:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752420AbbHJLpO (ORCPT ); Mon, 10 Aug 2015 07:45:14 -0400 Received: from mail.us.es ([193.147.175.20]:56030 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752270AbbHJLpI (ORCPT ); Mon, 10 Aug 2015 07:45:08 -0400 Received: (qmail 15299 invoked from network); 10 Aug 2015 13:45:07 +0200 Received: from unknown (HELO us.es) (192.168.2.11) by us.es with SMTP; 10 Aug 2015 13:45:07 +0200 Received: (qmail 6169 invoked by uid 507); 10 Aug 2015 11:45:07 -0000 X-Qmail-Scanner-Diagnostics: from 127.0.0.1 by antivirus1 (envelope-from , uid 501) with qmail-scanner-2.10 (clamdscan: 0.98.7/20770. spamassassin: 3.4.0. Clear:RC:1(127.0.0.1):SA:0(-99.6/7.5):. Processed in 1.790315 secs); 10 Aug 2015 11:45:07 -0000 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on antivirus1 X-Spam-Level: X-Spam-Status: No, score=-99.6 required=7.5 tests=BAYES_50,RCVD_IN_BRBL, RCVD_IN_BRBL_LASTEXT,RCVD_IN_PBL,RCVD_IN_RP_RNBL,RCVD_IN_SORBS_DUL, RDNS_DYNAMIC, SMTPAUTH_US, USER_IN_WHITELIST autolearn=disabled version=3.4.0 X-Spam-ASN: AS12715 37.132.0.0/16 X-Envelope-From: pablo@netfilter.org Received: from unknown (HELO antivirus1) (127.0.0.1) by us.es with SMTP; 10 Aug 2015 11:45:05 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus1 (F-Secure/fsigk_smtp/412/antivirus1); Mon, 10 Aug 2015 13:45:05 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/412/antivirus1) Received: (qmail 17528 invoked from network); 10 Aug 2015 13:45:04 +0200 Received: from 66.5.132.37.dynamic.jazztel.es (HELO salvia.here) (pneira@us.es@37.132.5.66) by mail.us.es with SMTP; 10 Aug 2015 13:45:04 +0200 From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: kaber@trash.net Subject: [PATCH nft v5 13/14] src: use cache infrastructure for set element objects Date: Mon, 10 Aug 2015 13:50:47 +0200 Message-Id: <1439207448-22485-14-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1439207448-22485-1-git-send-email-pablo@netfilter.org> References: <1439207448-22485-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 Populate the cache iff the user requests a ruleset listing. Signed-off-by: Pablo Neira Ayuso --- src/rule.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/src/rule.c b/src/rule.c index cd18ca8..310ff95 100644 --- a/src/rule.c +++ b/src/rule.c @@ -72,6 +72,7 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd) struct table *table; struct chain *chain; struct rule *rule, *nrule; + struct set *set; int ret; list_for_each_entry(table, &table_list, list) { @@ -94,6 +95,13 @@ static int cache_init_objects(struct netlink_ctx *ctx, enum cmd_ops cmd) continue; } + list_for_each_entry(set, &table->sets, list) { + ret = netlink_get_setelems(ctx, &set->handle, + &internal_location, set); + if (ret < 0) + return -1; + } + ret = netlink_list_chains(ctx, &table->handle, &internal_location); if (ret < 0) @@ -932,18 +940,6 @@ static int do_command_delete(struct netlink_ctx *ctx, struct cmd *cmd) } } -static int do_list_sets(struct netlink_ctx *ctx, const struct location *loc, - struct table *table) -{ - struct set *set; - - list_for_each_entry(set, &table->sets, list) { - if (netlink_get_setelems(ctx, &set->handle, loc, set) < 0) - return -1; - } - return 0; -} - static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd) { struct nft_ruleset *rs = netlink_dump_ruleset(ctx, &cmd->handle, @@ -962,25 +958,18 @@ static int do_command_export(struct netlink_ctx *ctx, struct cmd *cmd) static int do_list_table(struct netlink_ctx *ctx, struct cmd *cmd, struct table *table) { - if (do_list_sets(ctx, &cmd->location, table) < 0) - return -1; table_print(table); return 0; } -static int do_list_sets_global(struct netlink_ctx *ctx, struct cmd *cmd) +static int do_list_sets(struct netlink_ctx *ctx, struct cmd *cmd) { struct table *table; struct set *set; list_for_each_entry(table, &table_list, list) { - list_for_each_entry(set, &table->sets, list) { - if (netlink_get_setelems(ctx, &set->handle, - &cmd->location, set) < 0) - return -1; - + list_for_each_entry(set, &table->sets, list) set_print(set); - } } return 0; } @@ -1029,9 +1018,6 @@ static int do_list_set(struct netlink_ctx *ctx, struct cmd *cmd, if (set == NULL) return -1; - if (netlink_get_setelems(ctx, &cmd->handle, &cmd->location, set) < 0) - return -1; - set_print(set); return 0; } @@ -1051,7 +1037,7 @@ static int do_command_list(struct netlink_ctx *ctx, struct cmd *cmd) case CMD_OBJ_CHAIN: return do_list_table(ctx, cmd, table); case CMD_OBJ_SETS: - return do_list_sets_global(ctx, cmd); + return do_list_sets(ctx, cmd); case CMD_OBJ_SET: return do_list_set(ctx, cmd, table); case CMD_OBJ_RULESET: