Further fixes for zone reloads

diff --git a/defaults.c b/defaults.c
index c02535906c2d6450567087c6d571b5c70f672888..ec95ec918e7e116bfdf0e5338690e5c06795d1bc 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -416,8 +416,7 @@ fw3_flush_rules(struct fw3_ipt_handle *handle, struct fw3_state *state,
                if (c->table != handle->table)
                        continue;
 
-               if (c->flag &&
-                   !hasbit(defs->flags[handle->family == FW3_FAMILY_V6], c->flag))
+               if (c->flag && !has(defs->flags, handle->family, c->flag))
                        continue;
 
                fw3_ipt_delete_rules(handle, c->format);

diff --git a/zones.c b/zones.c
index 979d150e56080719c67da43ef2029fc158c86c80..3d3812ccdf7845aee795233f7c58616024cd2691 100644 (file)
--- a/zones.c
+++ b/zones.c
@@ -574,7 +574,7 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
                for (c = zone_chains; c->format; c++)
                {
                        /* don't touch user chains on selective stop */
-                       if (reload && hasbit(c->flag, FW3_FLAG_CUSTOM_CHAINS))
+                       if (reload && c->flag == FW3_FLAG_CUSTOM_CHAINS)
                                continue;
 
                        if (!fw3_is_family(c, handle->family))
@@ -583,6 +583,9 @@ fw3_flush_zones(struct fw3_ipt_handle *handle, struct fw3_state *state,
                        if (c->table != handle->table)
                                continue;
 
+                       if (c->flag && !has(z->flags, handle->family, c->flag))
+                               continue;
+
                        snprintf(chain, sizeof(chain), c->format, z->name);
                        fw3_ipt_delete_rules(handle, chain);
                        fw3_ipt_delete_chain(handle, chain);