From patchwork Mon Apr 23 23:05:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 903218 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netfilter.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40VMWD4wwRz9s02 for ; Tue, 24 Apr 2018 09:05:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932589AbeDWXF0 (ORCPT ); Mon, 23 Apr 2018 19:05:26 -0400 Received: from mail.us.es ([193.147.175.20]:57148 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932575AbeDWXFY (ORCPT ); Mon, 23 Apr 2018 19:05:24 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id F2ABA210561 for ; Tue, 24 Apr 2018 01:04:43 +0200 (CEST) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id E545FDA4F6 for ; Tue, 24 Apr 2018 01:04:43 +0200 (CEST) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id DAE6EDA4F8; Tue, 24 Apr 2018 01:04:43 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 1443CDA4F6 for ; Tue, 24 Apr 2018 01:04:42 +0200 (CEST) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Tue, 24 Apr 2018 01:04:42 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (sys.soleta.eu [212.170.55.40]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id ECC114265A2F for ; Tue, 24 Apr 2018 01:04:41 +0200 (CEST) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Subject: [PATCH nft 2/4] netlink: netlink_list_chains() callers always wants all existing chains Date: Tue, 24 Apr 2018 01:05:11 +0200 Message-Id: <20180423230513.21127-2-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180423230513.21127-1-pablo@netfilter.org> References: <20180423230513.21127-1-pablo@netfilter.org> X-Virus-Scanned: ClamAV using ClamSMTP Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove dead code, callers always need this to dump all of the existing chains. Signed-off-by: Pablo Neira Ayuso --- src/netlink.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/netlink.c b/src/netlink.c index d668fa8cdea3..8e34553635d0 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -711,7 +711,6 @@ int netlink_list_chains(struct netlink_ctx *ctx, const struct handle *h, const struct location *loc) { struct nftnl_chain_list *chain_cache; - struct chain *chain; chain_cache = mnl_nft_chain_dump(ctx, h->family); if (chain_cache == NULL) { @@ -725,20 +724,7 @@ int netlink_list_chains(struct netlink_ctx *ctx, const struct handle *h, nftnl_chain_list_foreach(chain_cache, list_chain_cb, ctx); nftnl_chain_list_free(chain_cache); - /* Caller wants all existing chains */ - if (h->chain == NULL) - return 0; - - /* Check if this chain exists, otherwise return an error */ - list_for_each_entry(chain, &ctx->list, list) { - if (strcmp(chain->handle.chain, h->chain) == 0) - return 0; - } - - return netlink_io_error(ctx, NULL, - "Could not find chain `%s' in table `%s': %s", - h->chain, h->table, - strerror(ENOENT)); + return 0; } int netlink_flush_chain(struct netlink_ctx *ctx, const struct cmd *cmd)