Introduce fw3_no_family() helper macro and use it

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index 79d3b0b..09baca9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -135,7 +135,7 @@ restore_pipe(enum fw3_family family, bool silent)
 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
@@ -206,11 +206,11 @@ stop(struct fw3_state *state, bool complete, bool reload)
                        {
                                /* 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");
@@ -219,17 +219,19 @@ stop(struct fw3_state *state, bool complete, bool reload)
                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 ...");