Cosmetic output changes

diff --git a/defaults.c b/defaults.c
index fc24d0b5294bb041431457f697aa5f45c5f8d849..7c04f1084eea60e7278c9169db37a22516a42906 100644 (file)
--- a/defaults.c
+++ b/defaults.c
@@ -318,8 +318,6 @@ set_default(const char *name, bool set)
 void
 fw3_set_defaults(struct fw3_state *state)
 {
-       info("Setting sysctl values");
-
        set_default("ecn",            state->defaults.tcp_ecn);
        set_default("syncookies",     state->defaults.tcp_syncookies);
        set_default("window_scaling", state->defaults.tcp_window_scaling);

diff --git a/ipsets.c b/ipsets.c
index a987790e4b5bede54321743f7660f4063cb9c2da..2c397b0853be025bff5532201573dbba9785166f 100644 (file)
--- a/ipsets.c
+++ b/ipsets.c
@@ -296,7 +296,7 @@ create_ipset(struct fw3_ipset *ipset, struct fw3_state *state)
        if (ipset->external && *ipset->external)
                return;
 
-       info("Creating ipset %s", ipset->name);
+       info(" * Creating ipset %s", ipset->name);
 
        first = true;
        fw3_pr("create %s %s", ipset->name, methods[ipset->method]);
@@ -384,7 +384,7 @@ fw3_destroy_ipsets(struct fw3_state *state, enum fw3_family family)
 
                if (fw3_no_family(s))
                {
-                       info("Deleting ipset %s", s->name);
+                       info(" * Deleting ipset %s", s->name);
 
                        fw3_pr("flush %s\n", s->name);
                        fw3_pr("destroy %s\n", s->name);

diff --git a/main.c b/main.c
index 3654c1503842929c50cafe8f84f97f404176c49a..47951e64349593071a2f3d6067c51cb1a3517a69 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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]);
 
@@ -234,7 +232,7 @@ stop(struct fw3_state *state, bool complete, bool reload)
 
        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);
@@ -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);