Cosmetic output changes

[project/firewall3.git] / main.c

diff --git a/main.c b/main.c
index cd821fc..47951e6 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
@@ -186,15 +186,13 @@ stop(struct fw3_state *state, bool complete, bool reload)
                if (!family_used(family) || !restore_pipe(family, true))
                        continue;
 
-               info("Removing %s rules ...", fw3_flag_names[family]);
-
                for (table = FW3_TABLE_FILTER; table <= FW3_TABLE_RAW; table++)
                {
                        if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
                                continue;
 
-                       info(" * %sing %s table",
-                            complete ? "Flush" : "Clear", fw3_flag_names[table]);
+                       info(" * %sing %s %s table", complete ? "Flush" : "Clear",
+                            fw3_flag_names[family], fw3_flag_names[table]);
 
                        fw3_pr("*%s\n", fw3_flag_names[table]);
 
@@ -219,20 +217,22 @@ 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 ...");
+               info(" * Flushing conntrack table ...");
 
                fwrite("f\n", 2, 1, ct);
                fclose(ct);
@@ -253,8 +253,6 @@ start(struct fw3_state *state, bool reload)
 
        if (!print_rules && !reload)
        {
-               fw3_set_defaults(state);
-
                if (fw3_command_pipe(false, "ipset", "-exist", "-"))
                {
                        fw3_create_ipsets(state);
@@ -279,14 +277,13 @@ start(struct fw3_state *state, bool reload)
                if (!family_loaded(state, family) || !restore_pipe(family, false))
                        continue;
 
-               info("Constructing %s rules ...", fw3_flag_names[family]);
-
                for (table = FW3_TABLE_FILTER; table <= FW3_TABLE_RAW; table++)
                {
                        if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
                                continue;
 
-                       info(" * Populating %s table", fw3_flag_names[table]);
+                       info(" * Populating %s %s table",
+                            fw3_flag_names[family], fw3_flag_names[table]);
 
                        fw3_pr("*%s\n", fw3_flag_names[table]);
                        fw3_print_default_chains(table, family, state);
@@ -309,11 +306,16 @@ start(struct fw3_state *state, bool reload)
                rv = 0;
        }
 
-       if (!reload && !print_rules)
-               fw3_run_includes(state);
+       if (!rv)
+       {
+               fw3_set_defaults(state);
 
-       if (!rv && !print_rules)
-               fw3_write_statefile(state);
+               if (!reload && !print_rules)
+                       fw3_run_includes(state);
+
+               if (!print_rules)
+                       fw3_write_statefile(state);
+       }
 
        return rv;
 }