/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ * Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#include "zones.h"
#include "rules.h"
#include "redirects.h"
+#include "snats.h"
#include "forwards.h"
#include "ipsets.h"
#include "includes.h"
#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;
fw3_load_zones(state, p);
fw3_load_rules(state, p);
fw3_load_redirects(state, p);
+ fw3_load_snats(state, p);
fw3_load_forwards(state, p);
fw3_load_includes(state, p);
list_for_each_safe(cur, tmp, &state->redirects)
fw3_free_redirect((struct fw3_redirect *)cur);
+ list_for_each_safe(cur, tmp, &state->snats)
+ fw3_free_snat((struct fw3_snat *)cur);
+
list_for_each_safe(cur, tmp, &state->forwards)
fw3_free_forward((struct fw3_forward *)cur);
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));
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++)
}
fw3_ipt_commit(handle);
+ fw3_ipt_close(handle);
}
family_set(run_state, family, false);
}
if (run_state)
- {
- if (fw3_command_pipe(false, "ipset", "-exist", "-"))
- {
- fw3_destroy_ipsets(run_state);
- fw3_command_close();
- }
- }
+ fw3_destroy_ipsets(run_state);
if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
{
int rv = 1;
enum fw3_family family;
enum fw3_table table;
+ struct fw3_ipt_handle *handle;
- if (!print_rules)
- {
- if (fw3_command_pipe(false, "ipset", "-exist", "-"))
- {
- fw3_create_ipsets(cfg_state);
- fw3_command_close();
- }
- }
+ if (!print_family)
+ fw3_create_ipsets(cfg_state);
for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
{
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.",
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_snats(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_ipt_close(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);
{
fw3_set_defaults(cfg_state);
- if (!print_rules)
+ if (!print_family)
{
fw3_run_includes(cfg_state, false);
fw3_hotplug_zones(cfg_state, true);
enum fw3_table table;
struct fw3_ipt_handle *handle;
- if (!print_rules && run_state)
- fw3_hotplug_zones(run_state, false);
+ if (!run_state)
+ return start();
+
+ fw3_hotplug_zones(run_state, false);
for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
{
info(" * Clearing %s %s table",
fw3_flag_names[family], fw3_flag_names[table]);
- if (run_state)
- {
- fw3_flush_rules(handle, run_state, true);
- fw3_flush_zones(handle, run_state, true);
- }
-
+ fw3_flush_rules(handle, run_state, true);
+ fw3_flush_zones(handle, run_state, true);
fw3_ipt_commit(handle);
+ fw3_ipt_close(handle);
}
family_set(run_state, family, false);
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_snats(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_ipt_close(handle);
}
fw3_print_includes(cfg_state, family, true);
family_set(cfg_state, family, true);
rv = 0;
-
-skip:
- fw3_command_close();
}
if (!rv)
{
fw3_set_defaults(cfg_state);
-
- if (!print_rules)
- {
- fw3_run_includes(cfg_state, true);
- fw3_hotplug_zones(cfg_state, true);
- fw3_write_statefile(cfg_state);
- }
+ fw3_run_includes(cfg_state, true);
+ fw3_hotplug_zones(cfg_state, true);
+ fw3_write_statefile(cfg_state);
}
return rv;
int main(int argc, char **argv)
{
int ch, rv = 1;
+ enum fw3_family family = FW3_FAMILY_ANY;
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;
+ family = FW3_FAMILY_V4;
break;
case '6':
- use_family = FW3_FAMILY_V6;
+ family = FW3_FAMILY_V6;
break;
case 'd':
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)
- warn("IPv6 rules globally disabled in configuration");
+ if (family == FW3_FAMILY_ANY)
+ {
+ family = FW3_FAMILY_V4;
+ }
+ else if (family == FW3_FAMILY_V6)
+ {
+ if (defs->disable_ipv6)
+ warn("IPv6 rules globally disabled in configuration");
+#ifdef DISABLE_IPV6
+ else
+ warn("IPv6 support is not compiled in");
+#endif
+ }
freopen("/dev/null", "w", stderr);
cfg_state->disable_ipsets = true;
- print_rules = true;
+ print_family = family;
+ fw3_pr_debug = true;
rv = start();
}
projects / project / firewall3.git / blobdiff