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)
static bool
family_running(struct fw3_state *state, enum fw3_family family)
{
- return hasbit(state->running_defaults.flags, family);
+ return has(state->defaults.flags, family, family);
}
static bool
return (use_family == FW3_FAMILY_ANY) || (use_family == family);
}
-static bool
-family_loaded(struct fw3_state *state, enum fw3_family family)
-{
- return hasbit(state->defaults.flags, family);
-}
-
static void
family_set(struct fw3_state *state, enum fw3_family family, bool set)
{
if (set)
- setbit(state->defaults.flags, family);
+ set(state->defaults.flags, family, family);
else
- delbit(state->defaults.flags, family);
+ del(state->defaults.flags, family, family);
}
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;
if (!complete && !state->statefile)
{
- if (!restart)
+ if (!reload)
warn("The firewall appears to be stopped. "
"Use the 'flush' command to forcefully purge all rules.");
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]);
else
{
/* pass 1 */
- fw3_flush_rules(table, family, false, state);
- fw3_flush_zones(table, family, false, state);
+ fw3_flush_rules(table, family, false, reload, state);
+ fw3_flush_zones(table, family, false, reload, state);
/* pass 2 */
- fw3_flush_rules(table, family, true, state);
- fw3_flush_zones(table, family, true, state);
+ fw3_flush_rules(table, family, true, reload, state);
+ 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 && fw3_command_pipe(false, "ipset", "-exist", "-"))
+ if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
{
- fw3_destroy_ipsets(state);
- fw3_command_close();
+ info(" * Flushing conntrack table ...");
+
+ fwrite("f\n", 2, 1, ct);
+ fclose(ct);
}
if (!rv)
}
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;
- if (!print_rules && !restart &&
- fw3_command_pipe(false, "ipset", "-exist", "-"))
+ if (!print_rules && !reload)
{
- fw3_create_ipsets(state);
- fw3_command_close();
+ 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 (!print_rules && !restart && family_running(state, 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.",
continue;
}
- if (!family_loaded(state, family) || !restore_pipe(family, false))
+ if (!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);
- fw3_print_zone_chains(table, family, state);
- fw3_print_default_head_rules(table, family, state);
+ fw3_print_default_chains(table, family, reload, state);
+ fw3_print_zone_chains(table, family, reload, state);
+ fw3_print_default_head_rules(table, family, reload, state);
fw3_print_rules(table, family, state);
fw3_print_redirects(table, family, state);
fw3_print_forwards(table, family, state);
- fw3_print_zone_rules(table, family, state);
- fw3_print_default_tail_rules(table, family, state);
+ fw3_print_zone_rules(table, family, reload, state);
+ fw3_print_default_tail_rules(table, family, reload, state);
fw3_pr("COMMIT\n");
}
+ if (!reload)
+ fw3_print_includes(family, state);
+
fw3_command_close();
family_set(state, family, true);
rv = 0;
}
- if (!rv && !print_rules)
- fw3_write_statefile(state);
+ if (!rv)
+ {
+ fw3_set_defaults(state);
+
+ if (!reload && !print_rules)
+ fw3_run_includes(state);
+
+ if (!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;
}
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