X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=main.c;h=c1f6505be173fd251110df27a56bca67655095b1;hp=79324a4431340ca333b2ba88c38eb51263df8e02;hb=62863ea95d3c2c7dd0b56ac0f1dee5a4590ca70c;hpb=c4b9c253df7cb1347dc5cf63846fb52d641e8ca6

diff --git a/main.c b/main.c
index 79324a4..c1f6505 100644
--- a/main.c
+++ b/main.c
@@ -26,11 +26,12 @@
 #include "redirects.h"
 #include "forwards.h"
 #include "ipsets.h"
+#include "includes.h"
 #include "ubus.h"
 
 
 static bool print_rules = false;
-static bool skip_family[FW3_FAMILY_V6 + 1] = { false };
+static enum fw3_family use_family = FW3_FAMILY_ANY;
 
 
 static struct fw3_state *
@@ -39,6 +40,9 @@ 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)
@@ -62,18 +66,18 @@ build_state(void)
 		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);
 
-	if (state->defaults.disable_ipv6 && !skip_family[FW3_FAMILY_V6])
-	{
-		warn("IPv6 rules globally disabled in configuration");
-		skip_family[FW3_FAMILY_V6] = true;
-	}
+	state->statefile = fw3_read_statefile(state);
 
 	return state;
 }
@@ -95,6 +99,12 @@ free_state(struct fw3_state *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);
@@ -106,121 +116,201 @@ free_state(struct fw3_state *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;
 	}
 
 	return true;
 }
 
+static bool
+family_running(struct fw3_state *state, enum fw3_family family)
+{
+	return has(state->defaults.flags, family, family);
+}
+
+static bool
+family_used(enum fw3_family family)
+{
+	return (use_family == FW3_FAMILY_ANY) || (use_family == family);
+}
+
+static void
+family_set(struct fw3_state *state, enum fw3_family family, bool set)
+{
+	if (set)
+		set(state->defaults.flags, family, family);
+	else
+		del(state->defaults.flags, family, family);
+}
+
 static int
-stop(struct fw3_state *state, bool complete)
+stop(struct fw3_state *state, bool complete, bool reload)
 {
+	FILE *ct;
+
+	int rv = 1;
 	enum fw3_family family;
 	enum fw3_table table;
 
-	const char *tables[] = {
-		"filter",
-		"nat",
-		"mangle",
-		"raw",
-	};
+	if (!complete && !state->statefile)
+	{
+		if (!reload)
+			warn("The firewall appears to be stopped. "
+				 "Use the 'flush' command to forcefully purge all rules.");
+
+		return rv;
+	}
 
 	for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
 	{
-		if (skip_family[family] || !restore_pipe(family, true))
+		if (!complete && !family_running(state, family))
 			continue;
 
-		info("Removing IPv%d rules ...", family == FW3_FAMILY_V4 ? 4 : 6);
+		if (!family_used(family) || !restore_pipe(family, true))
+			continue;
 
 		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]);
+			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);
+			}
+			else
+			{
+				/* pass 1 */
+				fw3_flush_rules(table, family, false, reload, state);
+				fw3_flush_zones(table, family, false, reload, state);
+
+				/* pass 2 */
+				fw3_flush_rules(table, family, true, reload, state);
+				fw3_flush_zones(table, family, true, reload, state);
+			}
 
-			fw3_pr("*%s\n", tables[table]);
-			fw3_print_flush_rules(table, family, state, complete);
 			fw3_pr("COMMIT\n");
 		}
 
 		fw3_command_close();
+
+		if (!reload)
+		{
+			if (fw3_command_pipe(false, "ipset", "-exist", "-"))
+			{
+				fw3_destroy_ipsets(state, family);
+				fw3_command_close();
+			}
+
+			family_set(state, family, false);
+		}
+
+		rv = 0;
 	}
 
-	return 0;
-}
+	if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
+	{
+		info(" * Flushing conntrack table ...");
 
-static void
-destroy_ipsets(struct fw3_state *state)
-{
-	if (!fw3_command_pipe(false, "ipset", "-exist", "-"))
-		return;
+		fwrite("f\n", 2, 1, ct);
+		fclose(ct);
+	}
+
+	if (!rv)
+		fw3_write_statefile(state);
 
-	fw3_destroy_ipsets(state);
-	fw3_command_close();
+	return rv;
 }
 
 static int
-start(struct fw3_state *state)
+start(struct fw3_state *state, bool reload)
 {
+	int rv = 1;
 	enum fw3_family family;
 	enum fw3_table table;
 
-	const char *tables[] = {
-		"filter",
-		"nat",
-		"mangle",
-		"raw",
-	};
-
-	if (!print_rules && 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 (skip_family[family] || !restore_pipe(family, false))
+		if (!family_used(family))
 			continue;
 
-		info("Constructing IPv%d rules ...", family == FW3_FAMILY_V4 ? 4 : 6);
+		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_flag_names[family], FW3_STATEFILE);
+
+			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, tables[table]))
+			if (!fw3_has_table(family == FW3_FAMILY_V6, fw3_flag_names[table]))
 				continue;
 
-			info(" * Populating %s table", tables[table]);
+			info(" * Populating %s %s table",
+			     fw3_flag_names[family], fw3_flag_names[table]);
 
-			fw3_pr("*%s\n", tables[table]);
-			fw3_print_default_chains(table, family, state);
-			fw3_print_zone_chains(table, family, state);
-			fw3_print_default_rules(table, family, state);
+			fw3_pr("*%s\n", fw3_flag_names[table]);
+			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_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;
 	}
 
-	return 0;
+	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
@@ -268,7 +358,7 @@ lookup_device(struct fw3_state *state, const char *dev)
 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");
 
@@ -280,19 +370,22 @@ int main(int argc, char **argv)
 {
 	int ch, rv = 1;
 	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)
 		{
 		case '4':
-			skip_family[FW3_FAMILY_V4] = false;
-			skip_family[FW3_FAMILY_V6] = true;
+			use_family = FW3_FAMILY_V4;
 			break;
 
 		case '6':
-			skip_family[FW3_FAMILY_V4] = true;
-			skip_family[FW3_FAMILY_V6] = false;
+			use_family = FW3_FAMILY_V6;
+			break;
+
+		case 'd':
+			fw3_pr_debug = true;
 			break;
 
 		case 'q':
@@ -305,10 +398,8 @@ int main(int argc, char **argv)
 		}
 	}
 
-	if (!fw3_ubus_connect())
-		error("Failed to connect to ubus");
-
 	state = build_state();
+	defs = &state->defaults;
 
 	if (!fw3_lock())
 		goto out;
@@ -319,67 +410,45 @@ int main(int argc, char **argv)
 		goto out;
 	}
 
+	if (use_family == FW3_FAMILY_V6 && defs->disable_ipv6)
+		warn("IPv6 rules globally disabled in configuration");
+
 	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;
 		print_rules = true;
 
-		if (!skip_family[FW3_FAMILY_V4] && !skip_family[FW3_FAMILY_V6])
-			skip_family[FW3_FAMILY_V6] = true;
-
-		rv = start(state);
+		rv = start(state, false);
 	}
 	else if (!strcmp(argv[optind], "start"))
 	{
-		if (fw3_has_state())
-		{
-			warn("The firewall appears to be started already. "
-				 "If it is indeed empty, remove the %s file and retry.",
-				 FW3_STATEFILE);
-
-			goto out;
-		}
-
-		rv = start(state);
-		fw3_write_state(state);
+		rv = start(state, false);
 	}
 	else if (!strcmp(argv[optind], "stop"))
 	{
-		if (!fw3_has_state())
-		{
-			warn("The firewall appears to be stopped. "
-				 "Use the 'flush' command to forcefully purge all rules.");
-
-			goto out;
-		}
-
-		rv = stop(state, false);
-
-		destroy_ipsets(state);
-
-		fw3_remove_state();
+		rv = stop(state, false, false);
 	}
 	else if (!strcmp(argv[optind], "flush"))
 	{
-		rv = stop(state, true);
-
-		destroy_ipsets(state);
-
-		if (fw3_has_state())
-			fw3_remove_state();
+		rv = stop(state, true, false);
 	}
 	else if (!strcmp(argv[optind], "restart"))
 	{
-		if (fw3_has_state())
-		{
-			stop(state, false);
-			fw3_remove_state();
-		}
+		stop(state, true, false);
+		free_state(state);
 
-		rv = start(state);
-		fw3_write_state(state);
+		state = build_state();
+		rv = start(state, false);
+	}
+	else if (!strcmp(argv[optind], "reload"))
+	{
+		rv = stop(state, false, true);
+		rv = start(state, !rv);
 	}
 	else if (!strcmp(argv[optind], "network") && (optind + 1) < argc)
 	{