diff options
| author | Phil Sutter <phil@nwl.cc> | 2019-08-21 10:42:19 +0200 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2019-11-25 23:31:00 +0100 |
| commit | a5877a214b6bb2e16ffbbcfd7512ff5cdbf03906 (patch) | |
| tree | 7b1be339190ff4b82b9c5c830a06390266e811b2 | |
| parent | 441d80c4cfa713b8261947a2cb0e780537454e71 (diff) | |
nft: Eliminate pointless calls to nft_family_ops_lookup()
If nft_handle is available, use its 'ops' field instead of performing a
new lookup. For the same reason, there is no need to pass ops pointer to
__nft_print_header().
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | iptables/nft.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 36c3bc2d..22a4dc89 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -1336,12 +1336,10 @@ static const char *policy_name[NF_ACCEPT+1] = { int nft_chain_save(struct nft_handle *h, struct nftnl_chain_list *list) { + struct nft_family_ops *ops = h->ops; struct nftnl_chain_list_iter *iter; - struct nft_family_ops *ops; struct nftnl_chain *c; - ops = nft_family_ops_lookup(h->family); - iter = nftnl_chain_list_iter_create(list); if (iter == NULL) return 0; @@ -2165,7 +2163,6 @@ static int nft_rule_count(struct nft_handle *h, struct nftnl_chain *c) } static void __nft_print_header(struct nft_handle *h, - const struct nft_family_ops *ops, struct nftnl_chain *c, unsigned int format) { const char *chain_name = nftnl_chain_get_str(c, NFTNL_CHAIN_NAME); @@ -2181,14 +2178,14 @@ static void __nft_print_header(struct nft_handle *h, if (nftnl_chain_is_set(c, NFTNL_CHAIN_POLICY)) pname = policy_name[nftnl_chain_get_u32(c, NFTNL_CHAIN_POLICY)]; - ops->print_header(format, chain_name, pname, + h->ops->print_header(format, chain_name, pname, &ctrs, basechain, refs - entries, entries); } int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, int rulenum, unsigned int format) { - const struct nft_family_ops *ops; + const struct nft_family_ops *ops = h->ops; struct nftnl_chain_list *list; struct nftnl_chain_list_iter *iter; struct nftnl_chain *c; @@ -2197,8 +2194,6 @@ int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, nft_xt_builtin_init(h, table); nft_assert_table_compatible(h, table, chain); - ops = nft_family_ops_lookup(h->family); - list = nft_chain_list_get(h, table, chain); if (!list) return 0; @@ -2211,7 +2206,7 @@ int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, if (!rulenum) { if (ops->print_table_header) ops->print_table_header(table); - __nft_print_header(h, ops, c, format); + __nft_print_header(h, c, format); } __nft_rule_list(h, c, rulenum, format, ops->print_rule); return 1; @@ -2229,7 +2224,7 @@ int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, if (found) printf("\n"); - __nft_print_header(h, ops, c, format); + __nft_print_header(h, c, format); __nft_rule_list(h, c, rulenum, format, ops->print_rule); found = true; |