Simplify ipset external checks and optionally initialize ispet name from external...

[project/firewall3.git] / redirects.c

diff --git a/redirects.c b/redirects.c
index 45d04c8..3c0ffad 100644 (file)
--- a/redirects.c
+++ b/redirects.c
@@ -177,7 +177,7 @@ fw3_load_redirects(struct fw3_state *state, struct uci_package *p)
                        continue;
                }
                else if (redir->ipset.set && !redir->ipset.any &&
-                        !(redir->_ipset = fw3_lookup_ipset(state, redir->ipset.name, false)))
+                        !(redir->_ipset = fw3_lookup_ipset(state, redir->ipset.name)))
                {
                        warn_elem(e, "refers to unknown ipset '%s'", redir->ipset.name);
                        fw3_free_redirect(redir);
@@ -372,6 +372,14 @@ print_redirect(struct fw3_state *state, enum fw3_family family,
                        return;
                }
 
+               if (!fw3_check_ipset(redir->_ipset))
+               {
+                       info("     ! Skipping due to missing ipset '%s'",
+                            redir->_ipset->external ?
+                                       redir->_ipset->external : redir->_ipset->name);
+                       return;
+               }
+
                set(redir->_ipset->flags, family, family);
        }