#include "ipsets.h"
#include "includes.h"
#include "ubus.h"
+#include "iptables.h"
static bool print_rules = false;
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));
int rv = 1;
enum fw3_family family;
enum fw3_table table;
+ struct fw3_ipt_handle *handle;
if (!complete && !run_state)
{
if (!complete && !family_running(family))
continue;
- if (!restore_pipe(family, true))
- 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(" * %sing %s %s table", complete ? "Flush" : "Clear",
fw3_flag_names[family], fw3_flag_names[table]);
- fw3_pr("*%s\n", fw3_flag_names[table]);
-
if (complete)
{
- fw3_flush_all(table);
+ fw3_flush_all(handle);
}
else if (run_state)
{
- /* pass 1 */
- fw3_flush_rules(run_state, family, table, false, false);
- fw3_flush_zones(run_state, family, table, false, false);
-
- /* pass 2 */
- fw3_flush_rules(run_state, family, table, false, true);
- fw3_flush_zones(run_state, family, table, false, true);
+ fw3_flush_rules(handle, run_state, false);
+ fw3_flush_zones(handle, run_state, false);
}
- fw3_pr("COMMIT\n");
+ fw3_ipt_commit(handle);
}
- fw3_command_close();
family_set(run_state, family, false);
family_set(cfg_state, family, false);
int rv = 1;
enum fw3_family family;
enum fw3_table table;
+ struct fw3_ipt_handle *handle;
if (!print_rules)
{
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_rules)
+ fw3_ipt_commit(handle);
}
- fw3_print_includes(cfg_state, family, false);
+ //fw3_print_includes(cfg_state, family, false);
- fw3_command_close();
family_set(run_state, family, true);
family_set(cfg_state, family, true);
int rv = 1;
enum fw3_family family;
enum fw3_table table;
+ struct fw3_ipt_handle *handle;
if (!print_rules && run_state)
fw3_hotplug_zones(run_state, false);
for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
{
- if (!restore_pipe(family, true))
- continue;
-
if (!family_running(family))
goto start;
if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
continue;
+ if (!(handle = fw3_ipt_open(family, table)))
+ continue;
+
info(" * Clearing %s %s table",
fw3_flag_names[family], fw3_flag_names[table]);
- fw3_pr("*%s\n", fw3_flag_names[table]);
-
if (run_state)
{
- /* pass 1 */
- fw3_flush_rules(run_state, family, table, true, false);
- fw3_flush_zones(run_state, family, table, true, false);
-
- /* pass 2 */
- fw3_flush_rules(run_state, family, table, true, true);
- fw3_flush_zones(run_state, family, table, true, true);
+ fw3_flush_rules(handle, run_state, true);
+ fw3_flush_zones(handle, run_state, true);
}
- fw3_pr("COMMIT\n");
+ fw3_ipt_commit(handle);
}
family_set(run_state, family, false);
start:
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);
+ //fw3_print_includes(cfg_state, family, true);
family_set(run_state, family, true);
family_set(cfg_state, family, true);
rv = 0;
-
-skip:
- fw3_command_close();
}
if (!rv)
cfg_state->disable_ipsets = true;
print_rules = true;
+ fw3_pr_debug = true;
rv = start();
}