For ingress rules, only jump into zone_name_src_ACTION chains if the target is not...

[project/firewall3.git] / zones.c

diff --git a/zones.c b/zones.c
index 4c17c68..9f1a68d 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -222,12 +222,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);
        }
@@ -476,7 +476,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);
 
@@ -643,22 +643,47 @@ fw3_lookup_zone(struct fw3_state *state, const char *name)
        return NULL;
 }
 
-void
-fw3_free_zone(struct fw3_zone *zone)
+struct list_head *
+fw3_resolve_zone_addresses(struct fw3_zone *zone)
 {
-       struct fw3_device *dev, *tmp;
+       struct fw3_device *net;
+       struct fw3_address *addr, *tmp;
+       struct list_head *addrs, *all;
 
-       list_for_each_entry_safe(dev, tmp, &zone->devices, list)
+       all = malloc(sizeof(*all));
+
+       if (!all)
+               return NULL;
+
+       memset(all, 0, sizeof(*all));
+       INIT_LIST_HEAD(all);
+
+       list_for_each_entry(net, &zone->networks, list)
        {
-               list_del(&dev->list);
-               free(dev);
+               addrs = fw3_ubus_address(net->name);
+
+               if (!addrs)
+                       continue;
+
+               list_for_each_entry_safe(addr, tmp, addrs, list)
+               {
+                       list_del(&addr->list);
+                       list_add_tail(&addr->list, all);
+               }
+
+               free(addrs);
        }
 
-       list_for_each_entry_safe(dev, tmp, &zone->networks, list)
+       list_for_each_entry(addr, &zone->subnets, list)
        {
-               list_del(&dev->list);
-               free(dev);
+               tmp = malloc(sizeof(*tmp));
+
+               if (!tmp)
+                       continue;
+
+               memcpy(tmp, addr, sizeof(*tmp));
+               list_add_tail(&tmp->list, all);
        }
 
-       fw3_free_object(zone, fw3_zone_opts);
+       return all;
 }