From 63dc7a0d86a1b86b10c5e04dd910497b9d8fcfaf Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 20 Dec 2018 16:09:13 +0100 Subject: nft: Drop nft_chain_list_find() Replace the function by nftnl_chain_list_lookup_byname() as provided by libnftnl. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- iptables/nft.c | 31 ++----------------------------- iptables/nft.h | 2 -- 2 files changed, 2 insertions(+), 31 deletions(-) (limited to 'iptables') diff --git a/iptables/nft.c b/iptables/nft.c index 842ed2b8..883fb3db 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -697,7 +697,7 @@ static void nft_chain_builtin_init(struct nft_handle *h, /* Initialize built-in chains if they don't exist yet */ for (i=0; i < NF_INET_NUMHOOKS && table->chains[i].name != NULL; i++) { - c = nft_chain_list_find(list, table->chains[i].name); + c = nftnl_chain_list_lookup_byname(list, table->chains[i].name); if (c != NULL) continue; @@ -1699,33 +1699,6 @@ err: return ret == 0 ? 1 : 0; } -struct nftnl_chain * -nft_chain_list_find(struct nftnl_chain_list *list, const char *chain) -{ - struct nftnl_chain_list_iter *iter; - struct nftnl_chain *c; - - iter = nftnl_chain_list_iter_create(list); - if (iter == NULL) - return NULL; - - c = nftnl_chain_list_iter_next(iter); - while (c != NULL) { - const char *chain_name = - nftnl_chain_get_str(c, NFTNL_CHAIN_NAME); - - if (strcmp(chain, chain_name) != 0) - goto next; - - nftnl_chain_list_iter_destroy(iter); - return c; -next: - c = nftnl_chain_list_iter_next(iter); - } - nftnl_chain_list_iter_destroy(iter); - return NULL; -} - static struct nftnl_chain * nft_chain_find(struct nft_handle *h, const char *table, const char *chain) { @@ -1735,7 +1708,7 @@ nft_chain_find(struct nft_handle *h, const char *table, const char *chain) if (list == NULL) return NULL; - return nft_chain_list_find(list, chain); + return nftnl_chain_list_lookup_byname(list, chain); } bool nft_chain_exists(struct nft_handle *h, diff --git a/iptables/nft.h b/iptables/nft.h index 6568257f..dfdffd69 100644 --- a/iptables/nft.h +++ b/iptables/nft.h @@ -83,8 +83,6 @@ struct nftnl_chain; int nft_chain_set(struct nft_handle *h, const char *table, const char *chain, const char *policy, const struct xt_counters *counters); struct nftnl_chain_list *nft_chain_list_get(struct nft_handle *h, const char *table); -struct nftnl_chain *nft_chain_list_find(struct nftnl_chain_list *list, - const char *chain); int nft_chain_save(struct nft_handle *h, struct nftnl_chain_list *list); int nft_chain_user_add(struct nft_handle *h, const char *chain, const char *table); int nft_chain_user_del(struct nft_handle *h, const char *chain, const char *table, bool verbose); -- cgit v1.2.3