From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Phil Sutter <phil@nwl.cc>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [iptables PATCH v2 04/10] nft: Eliminate nft_chain_list_get()
Date: Mon, 12 Oct 2020 14:03:41 +0200 [thread overview]
Message-ID: <20201012120341.GD26845@salvia> (raw)
In-Reply-To: <20200923174849.5773-5-phil@nwl.cc>
On Wed, Sep 23, 2020 at 07:48:43PM +0200, Phil Sutter wrote:
> Since introduction of nft_cache_add_chain(), there is merely a single
> user of nft_chain_list_get() left. Hence fold the function into its
> caller.
Why this last update regarding nft_chain_list_get() and not in 02/10 ?
> Signed-off-by: Phil Sutter <phil@nwl.cc>
> ---
> iptables/nft-cache.c | 13 -------------
> iptables/nft-cache.h | 2 --
> iptables/nft.c | 8 +++++---
> 3 files changed, 5 insertions(+), 18 deletions(-)
>
> diff --git a/iptables/nft-cache.c b/iptables/nft-cache.c
> index a22e693320451..109524c3fbc79 100644
> --- a/iptables/nft-cache.c
> +++ b/iptables/nft-cache.c
> @@ -684,16 +684,3 @@ nft_set_list_get(struct nft_handle *h, const char *table, const char *set)
>
> return h->cache->table[t->type].sets;
> }
> -
> -struct nftnl_chain_list *
> -nft_chain_list_get(struct nft_handle *h, const char *table, const char *chain)
> -{
> - const struct builtin_table *t;
> -
> - t = nft_table_builtin_find(h, table);
> - if (!t)
> - return NULL;
> -
> - return h->cache->table[t->type].chains;
> -}
> -
> diff --git a/iptables/nft-cache.h b/iptables/nft-cache.h
> index d97f8de255f02..52ad2d396199e 100644
> --- a/iptables/nft-cache.h
> +++ b/iptables/nft-cache.h
> @@ -16,8 +16,6 @@ void nft_cache_build(struct nft_handle *h);
> int nft_cache_add_chain(struct nft_handle *h, const struct builtin_table *t,
> struct nftnl_chain *c);
>
> -struct nftnl_chain_list *
> -nft_chain_list_get(struct nft_handle *h, const char *table, const char *chain);
> struct nftnl_set_list *
> nft_set_list_get(struct nft_handle *h, const char *table, const char *set);
>
> diff --git a/iptables/nft.c b/iptables/nft.c
> index 8e1a33ba69bf1..5967d36038953 100644
> --- a/iptables/nft.c
> +++ b/iptables/nft.c
> @@ -1837,13 +1837,15 @@ out:
> static struct nftnl_chain *
> nft_chain_find(struct nft_handle *h, const char *table, const char *chain)
> {
> + const struct builtin_table *t;
> struct nftnl_chain_list *list;
>
> - list = nft_chain_list_get(h, table, chain);
> - if (list == NULL)
> + t = nft_table_builtin_find(h, table);
> + if (!t)
> return NULL;
>
> - return nftnl_chain_list_lookup_byname(list, chain);
> + list = h->cache->table[t->type].chains;
> + return list ? nftnl_chain_list_lookup_byname(list, chain) : NULL;
> }
>
> bool nft_chain_exists(struct nft_handle *h,
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-10-12 12:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-23 17:48 [iptables PATCH v2 00/10] nft: Sorted chain listing et al Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 01/10] nft: Fix selective chain compatibility checks Phil Sutter
2020-10-12 11:54 ` Pablo Neira Ayuso
2020-10-13 9:29 ` Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 02/10] nft: Implement nft_chain_foreach() Phil Sutter
2020-10-12 12:01 ` Pablo Neira Ayuso
2020-10-13 9:40 ` Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 03/10] nft: cache: Introduce nft_cache_add_chain() Phil Sutter
2020-10-12 12:02 ` Pablo Neira Ayuso
2020-12-09 11:24 ` Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 04/10] nft: Eliminate nft_chain_list_get() Phil Sutter
2020-10-12 12:03 ` Pablo Neira Ayuso [this message]
2020-10-13 9:44 ` Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 05/10] nft: cache: Move nft_chain_find() over Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 06/10] nft: Introduce struct nft_chain Phil Sutter
2020-10-12 12:08 ` Pablo Neira Ayuso
2020-10-13 9:56 ` Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 07/10] nft: Introduce a dedicated base chain array Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 08/10] nft: cache: Sort custom chains by name Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 09/10] tests: shell: Drop any dump sorting in place Phil Sutter
2020-09-23 17:48 ` [iptables PATCH v2 10/10] nft: Avoid pointless table/chain creation Phil Sutter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012120341.GD26845@salvia \
--to=pablo@netfilter.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=phil@nwl.cc \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.