From e791a6a39a4f06b33fedaefe03a42354f3a85b6d Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 10 Mar 2013 20:41:20 +0100 Subject: [PATCH] Cosmetic output changes --- defaults.c | 2 -- ipsets.c | 4 ++-- main.c | 13 +++++-------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/defaults.c b/defaults.c index fc24d0b..7c04f10 100644 --- 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 a987790..2c397b0 100644 --- 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 3654c15..47951e6 100644 --- 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); -- 2.11.0