remove now unsed fw3_free_list() helper

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index bc983a6..ab094bb 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -19,7 +19,7 @@
 #include "rules.h"
 
 
-static struct fw3_option rule_opts[] = {
+const struct fw3_option fw3_rule_opts[] = {
        FW3_OPT("name",                string,   rule,     name),
        FW3_OPT("family",              family,   rule,     family),
 
@@ -44,6 +44,8 @@ static struct fw3_option rule_opts[] = {
        FW3_OPT("limit_burst",         int,      rule,     limit.burst),
 
        FW3_OPT("target",              target,   rule,     target),
+
+       { }
 };
 
 
@@ -81,7 +83,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
 
                INIT_LIST_HEAD(&rule->icmp_type);
 
-               fw3_parse_options(rule, rule_opts, ARRAY_SIZE(rule_opts), s);
+               fw3_parse_options(rule, fw3_rule_opts, s);
 
                if (rule->src.invert || rule->dest.invert)
                {
@@ -90,14 +92,14 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                        continue;
                }
                else if (rule->src.set && !rule->src.any &&
-                        !(rule->_src = fw3_lookup_zone(state, rule->src.name)))
+                        !(rule->_src = fw3_lookup_zone(state, rule->src.name, false)))
                {
                        warn_elem(e, "refers to not existing zone '%s'", rule->src.name);
                        fw3_free_rule(rule);
                        continue;
                }
                else if (rule->dest.set && !rule->dest.any &&
-                        !(rule->_dest = fw3_lookup_zone(state, rule->dest.name)))
+                        !(rule->_dest = fw3_lookup_zone(state, rule->dest.name, false)))
                {
                        warn_elem(e, "refers to not existing zone '%s'", rule->dest.name);
                        fw3_free_rule(rule);
@@ -110,7 +112,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                        continue;
                }
                else if (rule->ipset.set && !rule->ipset.any &&
-                        !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name)))
+                        !(rule->_ipset = fw3_lookup_ipset(state, rule->ipset.name, false)))
                {
                        warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
                        fw3_free_rule(rule);
@@ -331,20 +333,3 @@ fw3_print_rules(enum fw3_table table, enum fw3_family family,
        list_for_each_entry(rule, &state->rules, list)
                expand_rule(table, family, rule, num++);
 }
-
-void
-fw3_free_rule(struct fw3_rule *rule)
-{
-       fw3_free_list(&rule->proto);
-
-       fw3_free_list(&rule->ip_src);
-       fw3_free_list(&rule->mac_src);
-       fw3_free_list(&rule->port_dest);
-
-       fw3_free_list(&rule->ip_dest);
-       fw3_free_list(&rule->port_dest);
-
-       fw3_free_list(&rule->icmp_type);
-
-       free(rule);
-}