#include "redirects.h"
#include "forwards.h"
#include "ipsets.h"
+#include "includes.h"
#include "ubus.h"
static bool print_rules = false;
static enum fw3_family use_family = FW3_FAMILY_ANY;
-static const char *families[] = {
- "(bug)",
- "IPv4",
- "IPv6",
-};
-
-static const char *tables[] = {
- "filter",
- "nat",
- "mangle",
- "raw",
-};
-
static struct fw3_state *
build_state(void)
struct fw3_state *state = NULL;
struct uci_package *p = NULL;
+ if (!fw3_ubus_connect())
+ error("Failed to connect to ubus");
+
state = malloc(sizeof(*state));
if (!state)
state->disable_ipsets = true;
}
+ INIT_LIST_HEAD(&state->running_zones);
+ INIT_LIST_HEAD(&state->running_ipsets);
+
fw3_load_defaults(state, p);
fw3_load_ipsets(state, p);
fw3_load_zones(state, p);
fw3_load_rules(state, p);
fw3_load_redirects(state, p);
fw3_load_forwards(state, p);
+ fw3_load_includes(state, p);
+
+ state->statefile = fw3_read_statefile(state);
return state;
}
list_for_each_safe(cur, tmp, &state->forwards)
fw3_free_forward((struct fw3_forward *)cur);
+ list_for_each_safe(cur, tmp, &state->ipsets)
+ fw3_free_ipset((struct fw3_ipset *)cur);
+
+ list_for_each_safe(cur, tmp, &state->includes)
+ fw3_free_include((struct fw3_include *)cur);
+
uci_free_context(state->uci);
free(state);
static bool
restore_pipe(enum fw3_family family, bool silent)
{
- const char *cmd[] = {
- "(bug)",
- "iptables-restore",
- "ip6tables-restore",
- };
+ 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[family], "--lenient", "--noflush"))
+ if (!fw3_command_pipe(silent, cmd, "--lenient", "--noflush"))
{
- warn("Unable to execute %s", cmd[family]);
+ warn("Unable to execute %s", cmd);
return false;
}
}
static bool
-family_running(struct list_head *statefile, enum fw3_family family)
+family_running(struct fw3_state *state, enum fw3_family family)
{
- struct fw3_statefile_entry *e;
-
- if (statefile)
- {
- list_for_each_entry(e, statefile, list)
- {
- if (e->type != FW3_TYPE_DEFAULTS)
- continue;
-
- return hasbit(e->flags[0], family);
- }
- }
-
- return false;
+ return hasbit(state->defaults.running_flags, family);
}
static bool
}
static int
-stop(struct fw3_state *state, bool complete, bool restart)
+stop(struct fw3_state *state, bool complete, bool reload)
{
+ FILE *ct;
+
int rv = 1;
enum fw3_family family;
enum fw3_table table;
+ enum fw3_target policy = reload ? FW3_TARGET_DROP : FW3_TARGET_ACCEPT;
- struct list_head *statefile = fw3_read_statefile();
-
- if (!complete && !statefile)
+ if (!complete && !state->statefile)
{
- if (!restart)
+ if (!reload)
warn("The firewall appears to be stopped. "
"Use the 'flush' command to forcefully purge all rules.");
for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
{
- if (!complete && !family_running(statefile, family))
+ if (!complete && !family_running(state, family))
continue;
if (!family_used(family) || !restore_pipe(family, true))
continue;
- info("Removing %s rules ...", families[family]);
+ 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, tables[table]))
+ if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
continue;
info(" * %sing %s table",
- complete ? "Flush" : "Clear", tables[table]);
+ complete ? "Flush" : "Clear", fw3_flag_names[table]);
- fw3_pr("*%s\n", tables[table]);
+ fw3_pr("*%s\n", fw3_flag_names[table]);
if (complete)
{
else
{
/* pass 1 */
- fw3_flush_rules(table, family, false, statefile);
- fw3_flush_zones(table, family, false, statefile);
+ fw3_flush_rules(table, family, false, state, policy);
+ fw3_flush_zones(table, family, false, reload, state);
/* pass 2 */
- fw3_flush_rules(table, family, true, statefile);
- fw3_flush_zones(table, family, true, statefile);
+ fw3_flush_rules(table, family, true, state, policy);
+ fw3_flush_zones(table, family, true, reload, state);
}
fw3_pr("COMMIT\n");
fw3_command_close();
- if (!restart)
+ if (!reload)
+ {
+ if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+ {
+ fw3_destroy_ipsets(state, family);
+ fw3_command_close();
+ }
+
family_set(state, family, false);
+ }
rv = 0;
}
- if (!restart &&
- !family_loaded(state, FW3_FAMILY_V4) &&
- !family_loaded(state, FW3_FAMILY_V6) &&
- fw3_command_pipe(false, "ipset", "-exist", "-"))
+ if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
{
- fw3_destroy_ipsets(statefile);
- fw3_command_close();
- }
+ info("Flushing conntrack table ...");
- fw3_free_statefile(statefile);
+ fwrite("f\n", 2, 1, ct);
+ fclose(ct);
+ }
if (!rv)
fw3_write_statefile(state);
}
static int
-start(struct fw3_state *state, bool restart)
+start(struct fw3_state *state, bool reload)
{
int rv = 1;
enum fw3_family family;
enum fw3_table table;
- struct list_head *statefile = fw3_read_statefile();
-
- if (!print_rules && !restart &&
- fw3_command_pipe(false, "ipset", "-exist", "-"))
+ if (!print_rules && !reload)
{
- fw3_create_ipsets(state);
- fw3_command_close();
+ fw3_set_defaults(state);
+
+ if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+ {
+ fw3_create_ipsets(state);
+ fw3_command_close();
+ }
}
for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
if (!family_used(family))
continue;
- if (!family_loaded(state, family) || !restore_pipe(family, false))
- continue;
-
- if (!restart && family_running(statefile, family))
+ if (!print_rules && !reload && family_running(state, family))
{
warn("The %s firewall appears to be started already. "
"If it is indeed empty, remove the %s file and retry.",
- families[family], FW3_STATEFILE);
+ fw3_flag_names[family], FW3_STATEFILE);
continue;
}
- info("Constructing %s rules ...", families[family]);
+ 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, tables[table]))
+ if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
continue;
- info(" * Populating %s table", tables[table]);
+ info(" * Populating %s table", fw3_flag_names[table]);
- fw3_pr("*%s\n", tables[table]);
+ fw3_pr("*%s\n", fw3_flag_names[table]);
fw3_print_default_chains(table, family, state);
fw3_print_zone_chains(table, family, state);
fw3_print_default_head_rules(table, family, state);
fw3_pr("COMMIT\n");
}
+ if (!reload)
+ fw3_print_includes(family, state);
+
fw3_command_close();
family_set(state, family, true);
rv = 0;
}
- fw3_free_statefile(statefile);
+ if (!reload && !print_rules)
+ fw3_run_includes(state);
- if (!rv)
+ if (!rv && !print_rules)
fw3_write_statefile(state);
return rv;
static int
usage(void)
{
- fprintf(stderr, "fw3 [-4] [-6] [-q] {start|stop|flush|restart|print}\n");
+ fprintf(stderr, "fw3 [-4] [-6] [-q] {start|stop|flush|reload|restart|print}\n");
fprintf(stderr, "fw3 [-q] network {net}\n");
fprintf(stderr, "fw3 [-q] device {dev}\n");
struct fw3_state *state = NULL;
struct fw3_defaults *defs = NULL;
- while ((ch = getopt(argc, argv, "46qh")) != -1)
+ while ((ch = getopt(argc, argv, "46dqh")) != -1)
{
switch (ch)
{
use_family = FW3_FAMILY_V6;
break;
+ case 'd':
+ fw3_pr_debug = true;
+ break;
+
case 'q':
freopen("/dev/null", "w", stderr);
break;
}
}
- if (!fw3_ubus_connect())
- error("Failed to connect to ubus");
-
state = build_state();
defs = &state->defaults;
if (!strcmp(argv[optind], "print"))
{
+ if (use_family == FW3_FAMILY_ANY)
+ use_family = FW3_FAMILY_V4;
+
freopen("/dev/null", "w", stderr);
state->disable_ipsets = true;
}
else if (!strcmp(argv[optind], "restart"))
{
+ stop(state, true, false);
+ free_state(state);
+
+ state = build_state();
+ rv = start(state, false);
+ }
+ else if (!strcmp(argv[optind], "reload"))
+ {
rv = stop(state, false, true);
rv = start(state, !rv);
}
projects / project / firewall3.git / blobdiff