nft: Simplify nftnl_rule_list_chain_save()

Since there are per table chain caches, The chain list passed to that
function is comprised of chains belonging to the right table only.
Therefore the table name check can safely be skipped.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/iptables/nft.c b/iptables/nft.c
index 7b6fb2b10686d077b568ed53a45cf826d0bd1352..9d20eb0eac2db4049d5701dae0535b32fe5884be 100644 (file)
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -2381,8 +2381,7 @@ list_save(struct nftnl_rule *r, unsigned int num, unsigned int format)
 
 static int
 nftnl_rule_list_chain_save(struct nft_handle *h, const char *chain,
-                        const char *table, struct nftnl_chain_list *list,
-                        int counters)
+                          struct nftnl_chain_list *list, int counters)
 {
        struct nftnl_chain_list_iter *iter;
        struct nftnl_chain *c;
@@ -2393,15 +2392,12 @@ nftnl_rule_list_chain_save(struct nft_handle *h, const char *chain,
 
        c = nftnl_chain_list_iter_next(iter);
        while (c != NULL) {
-               const char *chain_table =
-                       nftnl_chain_get_str(c, NFTNL_CHAIN_TABLE);
                const char *chain_name =
                        nftnl_chain_get_str(c, NFTNL_CHAIN_NAME);
                uint32_t policy =
                        nftnl_chain_get_u32(c, NFTNL_CHAIN_POLICY);
 
-               if (strcmp(table, chain_table) != 0 ||
-                   (chain && strcmp(chain, chain_name) != 0))
+               if (chain && strcmp(chain, chain_name) != 0)
                        goto next;
 
                /* this is a base chain */
@@ -2458,7 +2454,7 @@ int nft_rule_list_save(struct nft_handle *h, const char *chain,
 
        /* Dump policies and custom chains first */
        if (!rulenum)
-               nftnl_rule_list_chain_save(h, chain, table, list, counters);
+               nftnl_rule_list_chain_save(h, chain, list, counters);
 
        /* Now dump out rules in this table */
        iter = nftnl_chain_list_iter_create(list);