From 026109dbece39ad27c43ebc31a17a22e5b581987 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Wed, 2 Oct 2019 21:13:47 +0200 Subject: nft-cache: Support partial rule cache per chain Accept an additional chain name pointer in __nft_build_cache() and pass it along to fetch only that specific chain and its rules. Enhance nft_build_cache() to take an optional nftnl_chain pointer to fetch rules for. Enhance nft_chain_list_get() to take an optional chain name. If cache level doesn't include chains already, it will fetch only the specified chain from kernel (if existing) and add that to table's chain list which is returned. This keeps operations for all chains of a table or a specific one within the same code path in nft.c. Signed-off-by: Phil Sutter Acked-by: Pablo Neira Ayuso --- iptables/xtables-restore.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'iptables/xtables-restore.c') diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index 7641955d..4f6d324b 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -63,7 +63,7 @@ static struct nftnl_chain_list *get_chain_list(struct nft_handle *h, { struct nftnl_chain_list *chain_list; - chain_list = nft_chain_list_get(h, table); + chain_list = nft_chain_list_get(h, table, NULL); if (chain_list == NULL) xtables_error(OTHER_PROBLEM, "cannot retrieve chain list\n"); @@ -100,7 +100,7 @@ void xtables_restore_parse(struct nft_handle *h, if (!h->noflush) nft_fake_cache(h); else - nft_build_cache(h); + nft_build_cache(h, NULL); /* Grab standard input. */ while (fgets(buffer, sizeof(buffer), p->in)) { -- cgit v1.2.3