Reorganize chain layout for raw/NOTRACK rules to fix support for custom rules with...

[project/firewall3.git] / zones.c

diff --git a/zones.c b/zones.c
index dbf682f..04784c7 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -39,6 +39,8 @@ static const struct fw3_chain_spec zone_chains[] = {
        C(V4,  NAT,    SNAT,          "zone_%s_postrouting"),
        C(V4,  NAT,    DNAT,          "zone_%s_prerouting"),
 
+       C(ANY, RAW,    NOTRACK,       "zone_%s_notrack"),
+
        C(ANY, FILTER, CUSTOM_CHAINS, "input_%s_rule"),
        C(ANY, FILTER, CUSTOM_CHAINS, "output_%s_rule"),
        C(ANY, FILTER, CUSTOM_CHAINS, "forwarding_%s_rule"),
@@ -222,12 +224,12 @@ fw3_load_zones(struct fw3_state *state, struct uci_package *p)
                }
 
                setbit(zone->flags[0], fw3_to_src_target(zone->policy_input));
+               setbit(zone->flags[0], fw3_to_src_target(zone->policy_forward));
                setbit(zone->flags[0], zone->policy_output);
-               setbit(zone->flags[0], zone->policy_forward);
 
                setbit(zone->flags[1], fw3_to_src_target(zone->policy_input));
+               setbit(zone->flags[1], fw3_to_src_target(zone->policy_forward));
                setbit(zone->flags[1], zone->policy_output);
-               setbit(zone->flags[1], zone->policy_forward);
 
                list_add_tail(&zone->list, &state->zones);
        }
@@ -317,7 +319,6 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                                         bool reload, struct fw3_zone *zone,
                      struct fw3_device *dev, struct fw3_address *sub)
 {
-       bool disable_notrack = state->defaults.drop_invalid;
        struct fw3_protocol tcp = { .protocol = 6 };
        struct fw3_ipt_rule *r;
        enum fw3_flag t;
@@ -422,13 +423,12 @@ print_interface_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
        }
        else if (handle->table == FW3_TABLE_RAW)
        {
-               if (!zone->conntrack && !disable_notrack)
+               if (has(zone->flags, handle->family, FW3_FLAG_NOTRACK))
                {
                        r = fw3_ipt_rule_create(handle, NULL, dev, NULL, sub, NULL);
-                       fw3_ipt_rule_target(r, "CT");
-                       fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
+                       fw3_ipt_rule_target(r, "zone_%s_notrack", zone->name);
                        fw3_ipt_rule_extra(r, zone->extra_src);
-                       fw3_ipt_rule_append(r, "notrack");
+                       fw3_ipt_rule_append(r, "delegate_notrack");
                }
        }
 }
@@ -457,6 +457,7 @@ static void
 print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                 bool reload, struct fw3_zone *zone)
 {
+       bool disable_notrack = state->defaults.drop_invalid;
        struct fw3_address *msrc;
        struct fw3_address *mdest;
        struct fw3_ipt_rule *r;
@@ -476,7 +477,7 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                fw3_ipt_rule_append(r, "zone_%s_input", zone->name);
 
                r = fw3_ipt_rule_new(handle);
-               fw3_ipt_rule_target(r, "zone_%s_dest_%s", zone->name,
+               fw3_ipt_rule_target(r, "zone_%s_src_%s", zone->name,
                                     fw3_flag_names[zone->policy_forward]);
                fw3_ipt_rule_append(r, "zone_%s_forward", zone->name);
 
@@ -539,6 +540,15 @@ print_zone_rule(struct fw3_ipt_handle *handle, struct fw3_state *state,
                break;
 
        case FW3_TABLE_RAW:
+               if (!zone->conntrack && !disable_notrack)
+               {
+                       r = fw3_ipt_rule_new(handle);
+                       fw3_ipt_rule_target(r, "CT");
+                       fw3_ipt_rule_addarg(r, false, "--notrack", NULL);
+                       fw3_ipt_rule_append(r, "zone_%s_notrack", zone->name);
+               }
+               break;
+
        case FW3_TABLE_MANGLE:
                break;
        }
@@ -595,7 +605,13 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
                                continue;
 
                        snprintf(chain, sizeof(chain), c->format, z->name);
-                       fw3_ipt_delete_rules(handle, chain);
+                       fw3_ipt_flush_chain(handle, chain);
+
+                       /* keep certain basic chains that do not depend on any settings to
+                          avoid purging unrelated user rules pointing to them */
+                       if (reload && !c->flag)
+                               continue;
+
                        fw3_ipt_delete_chain(handle, chain);
                }
 
@@ -687,23 +703,3 @@ fw3_resolve_zone_addresses(struct fw3_zone *zone)
 
        return all;
 }
-
-void
-fw3_free_zone(struct fw3_zone *zone)
-{
-       struct fw3_device *dev, *tmp;
-
-       list_for_each_entry_safe(dev, tmp, &zone->devices, list)
-       {
-               list_del(&dev->list);
-               free(dev);
-       }
-
-       list_for_each_entry_safe(dev, tmp, &zone->networks, list)
-       {
-               list_del(&dev->list);
-               free(dev);
-       }
-
-       fw3_free_object(zone, fw3_zone_opts);
-}