From d7988a8aaedbf22cf1d34268615034e3082613ce Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 22 May 2013 12:09:49 +0200 Subject: [PATCH] Further fixes for zone reloads --- defaults.c | 3 +-- zones.c | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults.c b/defaults.c index c025359..ec95ec9 100644 --- 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 979d150..3d3812c 100644 --- 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); -- 2.25.1