X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=main.c;h=bf0830b867cf37ed719313c9a2ae1c20ad63c67a;hb=6907da00bbf0a5c6778f3ca8c9646bdc04119705;hp=7a8969fae7a5683d4b3a75011dc7f3464bb6891c;hpb=294f209f64dca84d1c4dd801a1f7e615e39f0726;p=project%2Ffirewall3.git

diff --git a/main.c b/main.c
index 7a8969f..bf0830b 100644
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -24,6 +24,7 @@
 #include "zones.h"
 #include "rules.h"
 #include "redirects.h"
+#include "snats.h"
 #include "forwards.h"
 #include "ipsets.h"
 #include "includes.h"
@@ -102,6 +103,7 @@ build_state(bool runtime)
 	fw3_load_zones(state, p);
 	fw3_load_rules(state, p);
 	fw3_load_redirects(state, p);
+	fw3_load_snats(state, p);
 	fw3_load_forwards(state, p);
 	fw3_load_includes(state, p);
 
@@ -122,6 +124,9 @@ free_state(struct fw3_state *state)
 	list_for_each_safe(cur, tmp, &state->redirects)
 		fw3_free_redirect((struct fw3_redirect *)cur);
 
+	list_for_each_safe(cur, tmp, &state->snats)
+		fw3_free_snat((struct fw3_snat *)cur);
+
 	list_for_each_safe(cur, tmp, &state->forwards)
 		fw3_free_forward((struct fw3_forward *)cur);
 
@@ -205,6 +210,7 @@ stop(bool complete)
 			}
 
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		family_set(run_state, family, false);
@@ -214,13 +220,7 @@ stop(bool complete)
 	}
 
 	if (run_state)
-	{
-		if (fw3_command_pipe(false, "ipset", "-exist", "-"))
-		{
-			fw3_destroy_ipsets(run_state);
-			fw3_command_close();
-		}
-	}
+		fw3_destroy_ipsets(run_state);
 
 	if (complete && (ct = fopen("/proc/net/nf_conntrack", "w")) != NULL)
 	{
@@ -245,13 +245,7 @@ start(void)
 	struct fw3_ipt_handle *handle;
 
 	if (!print_family)
-	{
-		if (fw3_command_pipe(false, "ipset", "-exist", "-"))
-		{
-			fw3_create_ipsets(cfg_state);
-			fw3_command_close();
-		}
-	}
+		fw3_create_ipsets(cfg_state);
 
 	for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
 	{
@@ -286,12 +280,15 @@ start(void)
 			fw3_print_default_head_rules(handle, cfg_state, false);
 			fw3_print_rules(handle, cfg_state);
 			fw3_print_redirects(handle, cfg_state);
+			fw3_print_snats(handle, cfg_state);
 			fw3_print_forwards(handle, cfg_state);
 			fw3_print_zone_rules(handle, cfg_state, false);
 			fw3_print_default_tail_rules(handle, cfg_state, false);
 
 			if (!print_family)
 				fw3_ipt_commit(handle);
+
+			fw3_ipt_close(handle);
 		}
 
 		if (!print_family)
@@ -327,8 +324,10 @@ reload(void)
 	enum fw3_table table;
 	struct fw3_ipt_handle *handle;
 
-	if (!print_family && run_state)
-		fw3_hotplug_zones(run_state, false);
+	if (!run_state)
+		return start();
+
+	fw3_hotplug_zones(run_state, false);
 
 	for (family = FW3_FAMILY_V4; family <= FW3_FAMILY_V6; family++)
 	{
@@ -346,13 +345,10 @@ reload(void)
 			info(" * Clearing %s %s table",
 			     fw3_flag_names[family], fw3_flag_names[table]);
 
-			if (run_state)
-			{
-				fw3_flush_rules(handle, run_state, true);
-				fw3_flush_zones(handle, run_state, true);
-			}
-
+			fw3_flush_rules(handle, run_state, true);
+			fw3_flush_zones(handle, run_state, true);
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		family_set(run_state, family, false);
@@ -378,11 +374,13 @@ start:
 			fw3_print_default_head_rules(handle, cfg_state, true);
 			fw3_print_rules(handle, cfg_state);
 			fw3_print_redirects(handle, cfg_state);
+			fw3_print_snats(handle, cfg_state);
 			fw3_print_forwards(handle, cfg_state);
 			fw3_print_zone_rules(handle, cfg_state, true);
 			fw3_print_default_tail_rules(handle, cfg_state, true);
 
 			fw3_ipt_commit(handle);
+			fw3_ipt_close(handle);
 		}
 
 		fw3_print_includes(cfg_state, family, true);
@@ -396,13 +394,9 @@ start:
 	if (!rv)
 	{
 		fw3_set_defaults(cfg_state);
-
-		if (!print_family)
-		{
-			fw3_run_includes(cfg_state, true);
-			fw3_hotplug_zones(cfg_state, true);
-			fw3_write_statefile(cfg_state);
-		}
+		fw3_run_includes(cfg_state, true);
+		fw3_hotplug_zones(cfg_state, true);
+		fw3_write_statefile(cfg_state);
 	}
 
 	return rv;
@@ -465,6 +459,7 @@ usage(void)
 int main(int argc, char **argv)
 {
 	int ch, rv = 1;
+	enum fw3_family family = FW3_FAMILY_ANY;
 	struct fw3_defaults *defs = NULL;
 
 	while ((ch = getopt(argc, argv, "46dqh")) != -1)
@@ -472,11 +467,11 @@ int main(int argc, char **argv)
 		switch (ch)
 		{
 		case '4':
-			print_family = FW3_FAMILY_V4;
+			family = FW3_FAMILY_V4;
 			break;
 
 		case '6':
-			print_family = FW3_FAMILY_V6;
+			family = FW3_FAMILY_V6;
 			break;
 
 		case 'd':
@@ -505,14 +500,24 @@ int main(int argc, char **argv)
 
 	if (!strcmp(argv[optind], "print"))
 	{
-		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");
+		if (family == FW3_FAMILY_ANY)
+		{
+			family = FW3_FAMILY_V4;
+		}
+		else if (family == FW3_FAMILY_V6)
+		{
+			if (defs->disable_ipv6)
+				warn("IPv6 rules globally disabled in configuration");
+#ifdef DISABLE_IPV6
+			else
+				warn("IPv6 support is not compiled in");
+#endif
+		}
 
 		freopen("/dev/null", "w", stderr);
 
 		cfg_state->disable_ipsets = true;
+		print_family = family;
 		fw3_pr_debug = true;
 
 		rv = start();