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 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;
if (!complete && !state->statefile)
{
- if (!restart)
+ if (!reload)
warn("The firewall appears to be stopped. "
"Use the 'flush' command to forcefully purge all rules.");
else
{
/* pass 1 */
- fw3_flush_rules(table, family, false, state);
+ fw3_flush_rules(table, family, false, state, policy);
fw3_flush_zones(table, family, false, state);
/* pass 2 */
- fw3_flush_rules(table, family, true, state);
+ fw3_flush_rules(table, family, true, state, policy);
fw3_flush_zones(table, family, true, state);
}
fw3_command_close();
- if (!restart)
+ if (!reload)
family_set(state, family, false);
rv = 0;
}
- if (!restart && fw3_command_pipe(false, "ipset", "-exist", "-"))
+ if (!reload && fw3_command_pipe(false, "ipset", "-exist", "-"))
{
fw3_destroy_ipsets(state);
fw3_command_close();
}
+ if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
+ {
+ info("Flushing conntrack table ...");
+
+ 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;
- 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 (!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.",
fw3_pr("COMMIT\n");
}
+ if (!reload)
+ fw3_print_includes(family, state);
+
fw3_command_close();
family_set(state, family, true);
rv = 0;
}
+ if (!reload && !print_rules)
+ fw3_run_includes(state);
+
if (!rv && !print_rules)
fw3_write_statefile(state);
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);
}