X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=main.c;h=7a8969fae7a5683d4b3a75011dc7f3464bb6891c;hp=09de78260f1fdb78cd72ae741506cdc3d468e286;hb=294f209f64dca84d1c4dd801a1f7e615e39f0726;hpb=b6109157659a7d3f389797cfc6f91c90641ba33e diff --git a/main.c b/main.c index 09de782..7a8969f 100644 --- a/main.c +++ b/main.c @@ -31,7 +31,7 @@ #include "iptables.h" -static bool print_rules = false; +static enum fw3_family print_family = FW3_FAMILY_ANY; static struct fw3_state *run_state = NULL; static struct fw3_state *cfg_state = NULL; @@ -140,25 +140,6 @@ free_state(struct fw3_state *state) static bool -restore_pipe(enum fw3_family family, bool silent) -{ - const char *cmd; - - cmd = (family == FW3_FAMILY_V4) ? "iptables-restore" : "ip6tables-restore"; - - if (print_rules) - return fw3_stdout_pipe(); - - if (!fw3_command_pipe(silent, cmd, "--lenient", "--noflush")) - { - warn("Unable to execute %s", cmd); - return false; - } - - return true; -} - -static bool family_running(enum fw3_family family) { return (run_state && has(run_state->defaults.flags, family, family)); @@ -194,7 +175,7 @@ stop(bool complete) return rv; } - if (!print_rules && run_state) + if (!print_family && run_state) fw3_hotplug_zones(run_state, false); for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++) @@ -261,8 +242,9 @@ start(void) int rv = 1; enum fw3_family family; enum fw3_table table; + struct fw3_ipt_handle *handle; - if (!print_rules) + if (!print_family) { if (fw3_command_pipe(false, "ipset", "-exist", "-")) { @@ -276,7 +258,10 @@ start(void) if (family == FW3_FAMILY_V6 && cfg_state->defaults.disable_ipv6) continue; - if (!print_rules && family_running(family)) + if (print_family && family != print_family) + continue; + + if (!print_family && family_running(family)) { warn("The %s firewall appears to be started already. " "If it is indeed empty, remove the %s file and retry.", @@ -285,32 +270,33 @@ start(void) continue; } - if (!restore_pipe(family, false)) - continue; - for (table = FW3_TABLE_FILTER; table <= FW3_TABLE_RAW; table++) { if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table])) continue; + if (!(handle = fw3_ipt_open(family, table))) + continue; + 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(cfg_state, family, table, false); - fw3_print_zone_chains(cfg_state, family, table, false); - fw3_print_default_head_rules(cfg_state, family, table, false); - fw3_print_rules(cfg_state, family, table); - fw3_print_redirects(cfg_state, family, table); - fw3_print_forwards(cfg_state, family, table); - fw3_print_zone_rules(cfg_state, family, table, false); - fw3_print_default_tail_rules(cfg_state, family, table, false); - fw3_pr("COMMIT\n"); + fw3_print_default_chains(handle, cfg_state, false); + fw3_print_zone_chains(handle, cfg_state, false); + fw3_print_default_head_rules(handle, cfg_state, false); + fw3_print_rules(handle, cfg_state); + fw3_print_redirects(handle, cfg_state); + fw3_print_forwards(handle, cfg_state); + fw3_print_zone_rules(handle, cfg_state, false); + fw3_print_default_tail_rules(handle, cfg_state, false); + + if (!print_family) + fw3_ipt_commit(handle); } - fw3_print_includes(cfg_state, family, false); + if (!print_family) + fw3_print_includes(cfg_state, family, false); - fw3_command_close(); family_set(run_state, family, true); family_set(cfg_state, family, true); @@ -321,7 +307,7 @@ start(void) { fw3_set_defaults(cfg_state); - if (!print_rules) + if (!print_family) { fw3_run_includes(cfg_state, false); fw3_hotplug_zones(cfg_state, true); @@ -341,7 +327,7 @@ reload(void) enum fw3_table table; struct fw3_ipt_handle *handle; - if (!print_rules && run_state) + if (!print_family && run_state) fw3_hotplug_zones(run_state, false); for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++) @@ -373,30 +359,30 @@ reload(void) family_set(cfg_state, family, false); start: - if (!restore_pipe(family, true)) - continue; - if (family == FW3_FAMILY_V6 && cfg_state->defaults.disable_ipv6) - goto skip; + continue; for (table = FW3_TABLE_FILTER; table <= FW3_TABLE_RAW; table++) { if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table])) continue; + if (!(handle = fw3_ipt_open(family, table))) + continue; + 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(cfg_state, family, table, true); - fw3_print_zone_chains(cfg_state, family, table, true); - fw3_print_default_head_rules(cfg_state, family, table, true); - fw3_print_rules(cfg_state, family, table); - fw3_print_redirects(cfg_state, family, table); - fw3_print_forwards(cfg_state, family, table); - fw3_print_zone_rules(cfg_state, family, table, true); - fw3_print_default_tail_rules(cfg_state, family, table, true); - fw3_pr("COMMIT\n"); + fw3_print_default_chains(handle, cfg_state, true); + fw3_print_zone_chains(handle, cfg_state, true); + fw3_print_default_head_rules(handle, cfg_state, true); + fw3_print_rules(handle, cfg_state); + fw3_print_redirects(handle, cfg_state); + fw3_print_forwards(handle, cfg_state); + fw3_print_zone_rules(handle, cfg_state, true); + fw3_print_default_tail_rules(handle, cfg_state, true); + + fw3_ipt_commit(handle); } fw3_print_includes(cfg_state, family, true); @@ -405,16 +391,13 @@ start: family_set(cfg_state, family, true); rv = 0; - -skip: - fw3_command_close(); } if (!rv) { fw3_set_defaults(cfg_state); - if (!print_rules) + if (!print_family) { fw3_run_includes(cfg_state, true); fw3_hotplug_zones(cfg_state, true); @@ -483,18 +466,17 @@ int main(int argc, char **argv) { int ch, rv = 1; struct fw3_defaults *defs = NULL; - enum fw3_family use_family = FW3_FAMILY_ANY; while ((ch = getopt(argc, argv, "46dqh")) != -1) { switch (ch) { case '4': - use_family = FW3_FAMILY_V4; + print_family = FW3_FAMILY_V4; break; case '6': - use_family = FW3_FAMILY_V6; + print_family = FW3_FAMILY_V6; break; case 'd': @@ -523,15 +505,15 @@ int main(int argc, char **argv) if (!strcmp(argv[optind], "print")) { - if (use_family == FW3_FAMILY_ANY) - use_family = FW3_FAMILY_V4; - else if (use_family == FW3_FAMILY_V6 && defs->disable_ipv6) + if (print_family == FW3_FAMILY_ANY) + print_family = FW3_FAMILY_V4; + else if (print_family == FW3_FAMILY_V6 && defs->disable_ipv6) warn("IPv6 rules globally disabled in configuration"); freopen("/dev/null", "w", stderr); cfg_state->disable_ipsets = true; - print_rules = true; + fw3_pr_debug = true; rv = start(); }