Add common fw3_address_to_string() helper function

[project/firewall3.git] / zones.c

diff --git a/zones.c b/zones.c
index a9a559e..55f2e6c 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -94,6 +94,9 @@ const struct fw3_option fw3_zone_opts[] = {
        FW3_OPT("log",                 bool,     zone,     log),
        FW3_OPT("log_limit",           limit,    zone,     log_limit),
 
+       FW3_OPT("__flags_v4",          int,      zone,     flags[0]),
+       FW3_OPT("__flags_v6",          int,      zone,     flags[1]),
+
        { }
 };
 
@@ -152,9 +155,6 @@ fw3_alloc_zone(void)
        INIT_LIST_HEAD(&zone->masq_src);
        INIT_LIST_HEAD(&zone->masq_dest);
 
-       INIT_LIST_HEAD(&zone->running_networks);
-       INIT_LIST_HEAD(&zone->running_devices);
-
        zone->enabled = true;
        zone->custom_chains = true;
        zone->log_limit.rate = 10;
@@ -273,7 +273,6 @@ print_zone_chain(struct fw3_state *state, enum fw3_family family,
        if (c || r)
        {
                info("   * Zone '%s'", zone->name);
-               fw3_set_running(zone, &state->running_zones);
 
                set(zone->flags, family, table);
        }
@@ -488,8 +487,7 @@ fw3_print_zone_chains(struct fw3_state *state, enum fw3_family family,
        struct fw3_zone *zone;
 
        list_for_each_entry(zone, &state->zones, list)
-               if (!hasbit(zone->flags[0], FW3_FLAG_DELETED))
-                       print_zone_chain(state, family, table, reload, zone);
+               print_zone_chain(state, family, table, reload, zone);
 }
 
 void
@@ -499,8 +497,7 @@ fw3_print_zone_rules(struct fw3_state *state, enum fw3_family family,
        struct fw3_zone *zone;
 
        list_for_each_entry(zone, &state->zones, list)
-               if (!hasbit(zone->flags[0], FW3_FLAG_DELETED))
-                       print_zone_rule(state, family, table, reload, zone);
+               print_zone_rule(state, family, table, reload, zone);
 }
 
 void
@@ -514,7 +511,7 @@ fw3_flush_zones(struct fw3_state *state, enum fw3_family family,
        if (reload)
                delbit(custom_mask, FW3_FLAG_CUSTOM_CHAINS);
 
-       list_for_each_entry_safe(z, tmp, &state->running_zones, running_list)
+       list_for_each_entry_safe(z, tmp, &state->zones, list)
        {
                if (!has(z->flags, family, table))
                        continue;
@@ -535,7 +532,7 @@ fw3_hotplug_zones(struct fw3_state *state, bool add)
 
        if (add)
        {
-               list_for_each_entry(z, &state->running_zones, running_list)
+               list_for_each_entry(z, &state->zones, list)
                {
                        if (!hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
                        {
@@ -548,11 +545,11 @@ fw3_hotplug_zones(struct fw3_state *state, bool add)
        }
        else
        {
-               list_for_each_entry(z, &state->running_zones, running_list)
+               list_for_each_entry(z, &state->zones, list)
                {
                        if (hasbit(z->flags[0], FW3_FLAG_HOTPLUG))
                        {
-                               list_for_each_entry(d, &z->running_devices, list)
+                               list_for_each_entry(d, &z->devices, list)
                                        fw3_hotplug(add, z, d);
 
                                delbit(z->flags[0], FW3_FLAG_HOTPLUG);
@@ -562,7 +559,7 @@ fw3_hotplug_zones(struct fw3_state *state, bool add)
 }
 
 struct fw3_zone *
-fw3_lookup_zone(struct fw3_state *state, const char *name, bool running)
+fw3_lookup_zone(struct fw3_state *state, const char *name)
 {
        struct fw3_zone *z;
 
@@ -574,10 +571,7 @@ fw3_lookup_zone(struct fw3_state *state, const char *name, bool running)
                if (strcmp(z->name, name))
                        continue;
 
-               if (!running || z->running_list.next)
-                       return z;
-
-               break;
+               return z;
        }
 
        return NULL;
@@ -588,13 +582,13 @@ fw3_free_zone(struct fw3_zone *zone)
 {
        struct fw3_device *dev, *tmp;
 
-       list_for_each_entry_safe(dev, tmp, &zone->running_devices, list)
+       list_for_each_entry_safe(dev, tmp, &zone->devices, list)
        {
                list_del(&dev->list);
                free(dev);
        }
 
-       list_for_each_entry_safe(dev, tmp, &zone->running_networks, list)
+       list_for_each_entry_safe(dev, tmp, &zone->networks, list)
        {
                list_del(&dev->list);
                free(dev);