rework runtime state tracking

[project/firewall3.git] / rules.c

diff --git a/rules.c b/rules.c
index 3ad2a6a..1979340 100644 (file)
--- a/rules.c
+++ b/rules.c
@@ -90,14 +90,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,9 +110,9 @@ 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 not declared ipset '%s'", rule->ipset.name);
+                       warn_elem(e, "refers to unknown ipset '%s'", rule->ipset.name);
                        fw3_free_rule(rule);
                        continue;
                }
@@ -142,7 +142,7 @@ fw3_load_rules(struct fw3_state *state, struct uci_package *p)
                }
 
                if (rule->_dest)
-                       rule->_dest->has_dest_target[rule->target] = true;
+                       setbit(rule->_dest->dst_flags, rule->target);
 
                list_add_tail(&rule->list, &state->rules);
                continue;
@@ -190,30 +190,24 @@ print_chain(struct fw3_rule *rule)
 
 static void print_target(struct fw3_rule *rule)
 {
-       char target[256];
+       const char *target;
 
        switch(rule->target)
        {
        case FW3_TARGET_ACCEPT:
-               sprintf(target, "ACCEPT");
-               break;
-
        case FW3_TARGET_DROP:
-               sprintf(target, "DROP");
-               break;
-
        case FW3_TARGET_NOTRACK:
-               sprintf(target, "NOTRACK");
+               target = fw3_flag_names[rule->target];
                break;
 
        default:
-               sprintf(target, "REJECT");
+               target = fw3_flag_names[FW3_TARGET_REJECT];
                break;
        }
 
        if (rule->dest.set && !rule->dest.any)
                fw3_pr(" -j zone_%s_dest_%s\n", rule->dest.name, target);
-       else if (!strcmp(target, "REJECT"))
+       else if (rule->target == FW3_TARGET_REJECT)
                fw3_pr(" -j reject\n");
        else
                fw3_pr(" -j %s\n", target);
@@ -227,10 +221,16 @@ print_rule(enum fw3_table table, enum fw3_family family,
            struct fw3_mac *mac, struct fw3_icmptype *icmptype)
 {
        if (!fw3_is_family(sip, family) || !fw3_is_family(dip, family))
+       {
+               info("     ! Skipping due to different family of ip address");
                return;
+       }
 
        if (proto->protocol == 58 && family == FW3_FAMILY_V4)
+       {
+               info("     ! Skipping due to different family of protocol");
                return;
+       }
 
        print_chain(rule);
        fw3_format_ipset(rule->_ipset, rule->ipset.invert);
@@ -276,6 +276,24 @@ expand_rule(enum fw3_table table, enum fw3_family family,
        else
                info("   * Rule #%u", num);
 
+       if (!fw3_is_family(rule->_src, family) ||
+           !fw3_is_family(rule->_dest, family))
+       {
+               info("     ! Skipping due to different family of zone");
+               return;
+       }
+
+       if (rule->_ipset)
+       {
+               if (!fw3_is_family(rule->_ipset, family))
+               {
+                       info("     ! Skipping due to different family in ipset");
+                       return;
+               }
+
+               setbit(rule->_ipset->flags, family);
+       }
+
        list_for_each_entry(proto, &rule->proto, list)
        {
                /* icmp / ipv6-icmp */