X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=main.c;h=7a8969fae7a5683d4b3a75011dc7f3464bb6891c;hp=116050ae060bcd2d9a8d3a22f22bb1263b5201b2;hb=294f209f64dca84d1c4dd801a1f7e615e39f0726;hpb=781916efb792394014515c8d3f37da8cc35ed65f

diff --git a/main.c b/main.c
index 116050a..7a8969f 100644
--- a/main.c
+++ b/main.c
@@ -31,7 +31,7 @@
 #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;
@@ -175,7 +175,7 @@ stop(bool complete)
 		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++)
@@ -244,7 +244,7 @@ start(void)
 	enum fw3_table table;
 	struct fw3_ipt_handle *handle;
 
-	if (!print_rules)
+	if (!print_family)
 	{
 		if (fw3_command_pipe(false, "ipset", "-exist", "-"))
 		{
@@ -258,7 +258,10 @@ start(void)
 		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.",
@@ -287,11 +290,12 @@ start(void)
 			fw3_print_zone_rules(handle, cfg_state, false);
 			fw3_print_default_tail_rules(handle, cfg_state, false);
 
-			if (!print_rules)
+			if (!print_family)
 				fw3_ipt_commit(handle);
 		}
 
-		//fw3_print_includes(cfg_state, family, false);
+		if (!print_family)
+			fw3_print_includes(cfg_state, family, false);
 
 		family_set(run_state, family, true);
 		family_set(cfg_state, family, true);
@@ -303,7 +307,7 @@ start(void)
 	{
 		fw3_set_defaults(cfg_state);
 
-		if (!print_rules)
+		if (!print_family)
 		{
 			fw3_run_includes(cfg_state, false);
 			fw3_hotplug_zones(cfg_state, true);
@@ -323,7 +327,7 @@ reload(void)
 	enum fw3_table table;
 	struct fw3_ipt_handle *handle;
 
-	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++)
@@ -381,7 +385,7 @@ start:
 			fw3_ipt_commit(handle);
 		}
 
-		//fw3_print_includes(cfg_state, family, true);
+		fw3_print_includes(cfg_state, family, true);
 
 		family_set(run_state, family, true);
 		family_set(cfg_state, family, true);
@@ -393,7 +397,7 @@ start:
 	{
 		fw3_set_defaults(cfg_state);
 
-		if (!print_rules)
+		if (!print_family)
 		{
 			fw3_run_includes(cfg_state, true);
 			fw3_hotplug_zones(cfg_state, true);
@@ -462,18 +466,17 @@ int main(int argc, char **argv)
 {
 	int ch, rv = 1;
 	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;
+			print_family = FW3_FAMILY_V4;
 			break;
 
 		case '6':
-			use_family = FW3_FAMILY_V6;
+			print_family = FW3_FAMILY_V6;
 			break;
 
 		case 'd':
@@ -502,15 +505,14 @@ int main(int argc, char **argv)
 
 	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)
+		if (print_family == FW3_FAMILY_ANY)
+			print_family = FW3_FAMILY_V4;
+		else if (print_family == FW3_FAMILY_V6 && defs->disable_ipv6)
 			warn("IPv6 rules globally disabled in configuration");
 
 		freopen("/dev/null", "w", stderr);
 
 		cfg_state->disable_ipsets = true;
-		print_rules = true;
 		fw3_pr_debug = true;
 
 		rv = start();