static bool
family_running(struct fw3_state *state, enum fw3_family family)
{
- return hasbit(state->running_defaults.flags, family);
+ return hasbit(state->defaults.running_flags, family);
}
static bool
{
/* pass 1 */
fw3_flush_rules(table, family, false, state, policy);
- fw3_flush_zones(table, family, false, state);
+ fw3_flush_zones(table, family, false, reload, state);
/* pass 2 */
fw3_flush_rules(table, family, true, state, policy);
- fw3_flush_zones(table, family, true, state);
+ fw3_flush_zones(table, family, true, reload, state);
}
fw3_pr("COMMIT\n");
fw3_command_close();
if (!reload)
+ {
+ if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+ {
+ fw3_destroy_ipsets(state, family);
+ fw3_command_close();
+ }
+
family_set(state, family, false);
+ }
rv = 0;
}
- if (!reload && fw3_command_pipe(false, "ipset", "-exist", "-"))
- {
- fw3_destroy_ipsets(state);
- fw3_command_close();
- }
-
if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
{
info("Flushing conntrack table ...");
if (!print_rules && !reload)
{
- fw3_set_defaults(state);
-
if (fw3_command_pipe(false, "ipset", "-exist", "-"))
{
fw3_create_ipsets(state);
rv = 0;
}
- if (!reload && !print_rules)
- fw3_run_includes(state);
+ if (!rv)
+ {
+ fw3_set_defaults(state);
+
+ if (!reload && !print_rules)
+ fw3_run_includes(state);
- if (!rv && !print_rules)
- fw3_write_statefile(state);
+ if (!print_rules)
+ fw3_write_statefile(state);
+ }
return rv;
}